From 6198e24f021e6601a7e49e734139bd44948a1d14 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Tue, 26 Jan 2021 09:21:02 -0500 Subject: [PATCH 001/664] oksh: add shellPath for use as user shells This allows the user shell to be set to pkgs.oksh instead of needing a string like "${pkgs.oksh}/bin/oksh". --- pkgs/shells/oksh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 8c2998ab54cc..e0165fb3022f 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siraben ]; platforms = platforms.all; }; + + passthru = { + shellPath = "/bin/oksh"; + }; } From 31f5b45f09063a81fc79789d3b939cbff12ee70c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 20:38:32 +0000 Subject: [PATCH 002/664] s2n-tls: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 2d3ebc6cb414..b54fd0b74a71 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h"; + sha256 = "sha256-V/ZtO6t+Jxu/HmAEVzjkXuGWbZFwkGLsab1UCSG2tdk="; }; nativeBuildInputs = [ cmake ]; From fc1fc531f25da7b546609ab1c46ca219b10d7b44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Mar 2021 09:52:50 +0000 Subject: [PATCH 003/664] python38Packages.google-auth-httplib2: 0.0.4 -> 0.1.0 --- .../python-modules/google-auth-httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index bb7836ef85d1..ceaec714176f 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.0.4"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd"; + sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"; }; propagatedBuildInputs = [ From 7eedec57e8f6ce7baceb7086d5e2f24c9c6b414b Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Apr 2021 18:46:13 +0200 Subject: [PATCH 004/664] maintainers: add erdnaxe --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2bf9f5f49ed..e2c00b8690de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2927,6 +2927,16 @@ githubId = 147284; name = "Jason Felice"; }; + erdnaxe = { + email = "erdnaxe@crans.org"; + github = "erdnaxe"; + githubId = 2663216; + name = "Alexandre Iooss"; + keys = [{ + longkeyid = "rsa4096/0x6C79278F3FCDCC02"; + fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; + }]; + }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; From d8b5ed331d62890285d3ce5a81d336269cdcb394 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Fri, 23 Apr 2021 10:42:08 +0200 Subject: [PATCH 005/664] doc/using: convert to markdown --- doc/manual.xml | 6 +- doc/using/configuration.chapter.md | 356 +++++++++++++++++++++++ doc/using/configuration.xml | 451 ----------------------------- doc/using/overlays.chapter.md | 149 ++++++++++ doc/using/overlays.xml | 279 ------------------ doc/using/overrides.chapter.md | 104 +++++++ doc/using/overrides.xml | 145 ---------- 7 files changed, 612 insertions(+), 878 deletions(-) create mode 100644 doc/using/configuration.chapter.md delete mode 100644 doc/using/configuration.xml create mode 100644 doc/using/overlays.chapter.md delete mode 100644 doc/using/overlays.xml create mode 100644 doc/using/overrides.chapter.md delete mode 100644 doc/using/overrides.xml diff --git a/doc/manual.xml b/doc/manual.xml index 6ea4addc361a..b43021d85ca5 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -8,9 +8,9 @@ Using Nixpkgs - - - + + + diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md new file mode 100644 index 000000000000..e4d401368796 --- /dev/null +++ b/doc/using/configuration.chapter.md @@ -0,0 +1,356 @@ +# Global configuration {#chap-packageconfig} + +Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true: + +- The package is thought to be broken, and has had its `meta.broken` set to `true`. + +- The package isn't intended to run on the given system, as none of its `meta.platforms` match the given system. + +- The package's `meta.license` is set to a license which is considered to be unfree. + +- The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's `meta.knownVulnerabilities`. + +Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. `nix-env -qa` will (attempt to) hide any packages that would be refused. + +Each of these criteria can be altered in the nixpkgs configuration. + +The nixpkgs configuration for a NixOS system is set in the `configuration.nix`, as in the following example: + +```nix +{ + nixpkgs.config = { + allowUnfree = true; + }; +} +``` + +However, this does not allow unfree software for individual users. Their configurations are managed separately. + +A user's nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example: + +```nix +{ + allowUnfree = true; +} +``` + +Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software. + +## Installing broken packages {#sec-allow-broken} + +There are two ways to try compiling a package which has been marked as broken. + +- For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + + ```shellSession + $ export NIXPKGS_ALLOW_BROKEN=1 + ``` + +- For permanently allowing broken packages to be built, you may add `allowBroken = true;` to your user's configuration file, like this: + + ```nix + { + allowBroken = true; + } + ``` + + +## Installing packages on unsupported systems {#sec-allow-unsupported-system} + +There are also two ways to try compiling a package which has been marked as unsupported for the given system. + +- For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: + + ```shellSession + $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 + ``` + +- For permanently allowing unsupported packages to be built, you may add `allowUnsupportedSystem = true;` to your user's configuration file, like this: + + ```nix + { + allowUnsupportedSystem = true; + } + ``` + +The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program *ought* to work on a certain platform, but doesn't, the platform should be included in `meta.platforms`, but marked as broken with e.g. `meta.broken = !hostPlatform.isWindows`. Of course, this begs the question of what \"ought\" means exactly. That is left to the package maintainer. + +## Installing unfree packages {#sec-allow-unfree} + +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: + + ```shellSession + $ export NIXPKGS_ALLOW_UNFREE=1 + ``` + +- It is possible to permanently allow individual unfree packages, while still blocking unfree packages by default using the `allowUnfreePredicate` configuration option in the user configuration file. + + This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false: + + ```nix + { + allowUnfreePredicate = (pkg: false); + } + ``` + + For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code: + + ```nix + { + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "roon-server" + "vscode" + ]; + } + ``` + +- It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using `allowlistedLicenses` and `blocklistedLicenses`, respectively. + + The following example configuration allowlists the licenses `amd` and `wtfpl`: + + ```nix + { + allowlistedLicenses = with lib.licenses; [ amd wtfpl ]; + } + ``` + + The following example configuration blocklists the `gpl3Only` and `agpl3Only` licenses: + + ```nix + { + blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; + } + ``` + + Note that `allowlistedLicenses` only applies to unfree licenses unless `allowUnfree` is enabled. It is not a generic allowlist for all types of licenses. `blocklistedLicenses` applies to all licenses. + +A complete list of licenses can be found in the file `lib/licenses.nix` of the nixpkgs tree. + +## Installing insecure packages {#sec-allow-insecure} + +There are several ways to tweak how Nix handles a package which has been marked as insecure. + +- To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: + + ```shellSession + $ export NIXPKGS_ALLOW_INSECURE=1 + ``` + +- It is possible to permanently allow individual insecure packages, while still blocking other insecure packages by default using the `permittedInsecurePackages` configuration option in the user configuration file. + + The following example configuration permits the installation of the hypothetically insecure package `hello`, version `1.2.3`: + + ```nix + { + permittedInsecurePackages = [ + "hello-1.2.3" + ]; + } + ``` + +- It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the `allowInsecurePredicate` configuration option. + + The `allowInsecurePredicate` option is a function which accepts a package and returns a boolean, much like `allowUnfreePredicate`. + + The following configuration example only allows insecure packages with very short names: + + ```nix + { + allowInsecurePredicate = pkg: builtins.stringLength (lib.getName pkg) <= 5; + } + ``` + + Note that `permittedInsecurePackages` is only checked if `allowInsecurePredicate` is not specified. + +## Modify packages via `packageOverrides` {#sec-modify-via-packageOverrides} + +You can define a function called `packageOverrides` in your local `~/.config/nixpkgs/config.nix` to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages. + +```nix +{ + packageOverrides = pkgs: rec { + foo = pkgs.foo.override { ... }; + }; +} +``` + +## Declarative Package Management {#sec-declarative-package-management} + +### Build an environment {#sec-building-environment} + +Using `packageOverrides`, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have `aspell`, `bc`, `ffmpeg`, `coreutils`, `gdb`, `nixUnstable`, `emscripten`, `jq`, `nox`, and `silver-searcher`, we could use the following in `~/.config/nixpkgs/config.nix`: + +```nix +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + }; + }; +} +``` + +To install it into our environment, you can just run `nix-env -iA nixpkgs.myPackages`. If you want to load the packages to be built from a working copy of `nixpkgs` you just run `nix-env -f. -iA myPackages`. To explore what's been installed, just look through `~/.nix-profile/`. You can see that a lot of stuff has been installed. Some of this stuff is useful some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + +```nix +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ "/share" "/bin" ]; + }; + }; +} +``` + +`pathsToLink` tells Nixpkgs to only link the paths listed which gets rid of the extra stuff in the profile. `/bin` and `/share` are good defaults for a user environment, getting rid of the clutter. If you are running on Nix on MacOS, you may want to add another path as well, `/Applications`, that makes GUI apps available. + +### Getting documentation {#sec-getting-documentation} + +After building that new environment, look through `~/.nix-profile` to make sure everything is there that we wanted. Discerning readers will note that some files are missing. Look inside `~/.nix-profile/share/man/man1/` to verify this. There are no man pages for any of the Nix tools! This is because some packages like Nix have multiple outputs for things like documentation (see section 4). Let's make Nix install those as well. + +```nix +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} +``` + +This provides us with some useful documentation for using our packages. However, if we actually want those manpages to be detected by man, we need to set up our environment. This can also be managed within Nix expressions. + +```nix +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' + export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin + export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' + mkdir -p $out/etc/profile.d + cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} +``` + +For this to work fully, you must also have this script sourced when you are logged in. Try adding something like this to your `~/.profile` file: + +```shellSession +#!/bin/sh +if [ -d $HOME/.nix-profile/etc/profile.d ]; then + for i in $HOME/.nix-profile/etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi + done +fi +``` + +Now just run `source $HOME/.profile` and you can starting loading man pages from your environment. + +### GNU info setup {#sec-gnu-info-setup} + +Configuring GNU info is a little bit trickier than man pages. To work correctly, info needs a database to be generated. This can be done with some small modifications to our environment scripts. + +```nix +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' + export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin + export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man + export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' + mkdir -p $out/etc/profile.d + cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + texinfoInteractive + ]; + pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" "info" ]; + postBuild = '' + if [ -x $out/bin/install-info -a -w $out/share/info ]; then + shopt -s nullglob + for i in $out/share/info/*.info $out/share/info/*.info.gz; do + $out/bin/install-info $i $out/share/info/dir + done + fi + ''; + }; + }; +} +``` + +`postBuild` tells Nixpkgs to run a command after building the environment. In this case, `install-info` adds the installed info pages to `dir` which is GNU info's default root node. Note that `texinfoInteractive` is added to the environment to give the `install-info` command. diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml deleted file mode 100644 index 3ef39733458c..000000000000 --- a/doc/using/configuration.xml +++ /dev/null @@ -1,451 +0,0 @@ - - Global configuration - - Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true: - - - - - The package is thought to be broken, and has had its meta.broken set to true. - - - - - The package isn't intended to run on the given system, as none of its meta.platforms match the given system. - - - - - The package's meta.license is set to a license which is considered to be unfree. - - - - - The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's meta.knownVulnerabilities. - - - - - Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. nix-env -qa will (attempt to) hide any packages that would be refused. - - - Each of these criteria can be altered in the nixpkgs configuration. - - - The nixpkgs configuration for a NixOS system is set in the configuration.nix, as in the following example: - -{ - nixpkgs.config = { - allowUnfree = true; - }; -} - - However, this does not allow unfree software for individual users. Their configurations are managed separately. - - - A user's nixpkgs configuration is stored in a user-specific configuration file located at ~/.config/nixpkgs/config.nix. For example: - -{ - allowUnfree = true; -} - - - - Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software. - -
- Installing broken packages - - - There are two ways to try compiling a package which has been marked as broken. - - - - - - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_BROKEN=1 - - - - - For permanently allowing broken packages to be built, you may add allowBroken = true; to your user's configuration file, like this: - -{ - allowBroken = true; -} - - - - -
-
- Installing packages on unsupported systems - - - There are also two ways to try compiling a package which has been marked as unsupported for the given system. - - - - - - For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 - - - - - For permanently allowing unsupported packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: - -{ - allowUnsupportedSystem = true; -} - - - - - - - The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program ought to work on a certain platform, but doesn't, the platform should be included in meta.platforms, but marked as broken with e.g. meta.broken = !hostPlatform.isWindows. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer. - -
-
- Installing unfree packages - - - 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: -$ export NIXPKGS_ALLOW_UNFREE=1 - - - - - It is possible to permanently allow individual unfree packages, while still blocking unfree packages by default using the allowUnfreePredicate configuration option in the user configuration file. - - - This option is a function which accepts a package as a parameter, and returns a boolean. The following example configuration accepts a package and always returns false: - -{ - allowUnfreePredicate = (pkg: false); -} - - - - For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code: - -{ - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "roon-server" - "vscode" - ]; -} - - - - - - It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using allowlistedLicenses and blocklistedLicenses, respectively. - - - The following example configuration allowlists the licenses amd and wtfpl: - -{ - allowlistedLicenses = with lib.licenses; [ amd wtfpl ]; -} - - - - The following example configuration blocklists the gpl3Only and agpl3Only licenses: - -{ - blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; -} - - - - Note that allowlistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic allowlist for all types of licenses. blocklistedLicenses applies to all licenses. - - - - - - A complete list of licenses can be found in the file lib/licenses.nix of the nixpkgs tree. - -
-
- Installing insecure packages - - - There are several ways to tweak how Nix handles a package which has been marked as insecure. - - - - - - To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_INSECURE=1 - - - - - It is possible to permanently allow individual insecure packages, while still blocking other insecure packages by default using the permittedInsecurePackages configuration option in the user configuration file. - - - The following example configuration permits the installation of the hypothetically insecure package hello, version 1.2.3: - -{ - permittedInsecurePackages = [ - "hello-1.2.3" - ]; -} - - - - - - It is also possible to create a custom policy around which insecure packages to allow and deny, by overriding the allowInsecurePredicate configuration option. - - - The allowInsecurePredicate option is a function which accepts a package and returns a boolean, much like allowUnfreePredicate. - - - The following configuration example only allows insecure packages with very short names: - -{ - allowInsecurePredicate = pkg: builtins.stringLength (lib.getName pkg) <= 5; -} - - - - Note that permittedInsecurePackages is only checked if allowInsecurePredicate is not specified. - - - -
- -
- Modify packages via <literal>packageOverrides</literal> - - - You can define a function called packageOverrides in your local ~/.config/nixpkgs/config.nix to override Nix packages. It must be a function that takes pkgs as an argument and returns a modified set of packages. - -{ - packageOverrides = pkgs: rec { - foo = pkgs.foo.override { ... }; - }; -} - - -
-
- Declarative Package Management - -
- Build an environment - - - Using packageOverrides, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have aspell, bc, ffmpeg, coreutils, gdb, nixUnstable, emscripten, jq, nox, and silver-searcher, we could use the following in ~/.config/nixpkgs/config.nix: - - - -{ - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - gdb - ffmpeg - nixUnstable - emscripten - jq - nox - silver-searcher - ]; - }; - }; -} - - - - To install it into our environment, you can just run nix-env -iA nixpkgs.myPackages. If you want to load the packages to be built from a working copy of nixpkgs you just run nix-env -f. -iA myPackages. To explore what's been installed, just look through ~/.nix-profile/. You can see that a lot of stuff has been installed. Some of this stuff is useful some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: - - - -{ - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - gdb - ffmpeg - nixUnstable - emscripten - jq - nox - silver-searcher - ]; - pathsToLink = [ "/share" "/bin" ]; - }; - }; -} - - - - pathsToLink tells Nixpkgs to only link the paths listed which gets rid of the extra stuff in the profile. /bin and /share are good defaults for a user environment, getting rid of the clutter. If you are running on Nix on MacOS, you may want to add another path as well, /Applications, that makes GUI apps available. - -
- -
- Getting documentation - - - After building that new environment, look through ~/.nix-profile to make sure everything is there that we wanted. Discerning readers will note that some files are missing. Look inside ~/.nix-profile/share/man/man1/ to verify this. There are no man pages for any of the Nix tools! This is because some packages like Nix have multiple outputs for things like documentation (see section 4). Let's make Nix install those as well. - - - -{ - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - ffmpeg - nixUnstable - emscripten - jq - nox - silver-searcher - ]; - pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; - extraOutputsToInstall = [ "man" "doc" ]; - }; - }; -} - - - - This provides us with some useful documentation for using our packages. However, if we actually want those manpages to be detected by man, we need to set up our environment. This can also be managed within Nix expressions. - - - -{ - packageOverrides = pkgs: with pkgs; rec { - myProfile = writeText "my-profile" '' - export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin - export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man - ''; - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - (runCommand "profile" {} '' - mkdir -p $out/etc/profile.d - cp ${myProfile} $out/etc/profile.d/my-profile.sh - '') - aspell - bc - coreutils - ffmpeg - man - nixUnstable - emscripten - jq - nox - silver-searcher - ]; - pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; - extraOutputsToInstall = [ "man" "doc" ]; - }; - }; -} - - - - For this to work fully, you must also have this script sourced when you are logged in. Try adding something like this to your ~/.profile file: - - - -#!/bin/sh -if [ -d $HOME/.nix-profile/etc/profile.d ]; then - for i in $HOME/.nix-profile/etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done -fi - - - - Now just run source $HOME/.profile and you can starting loading man pages from your environment. - -
- -
- GNU info setup - - - Configuring GNU info is a little bit trickier than man pages. To work correctly, info needs a database to be generated. This can be done with some small modifications to our environment scripts. - - - -{ - packageOverrides = pkgs: with pkgs; rec { - myProfile = writeText "my-profile" '' - export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin - export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man - export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info - ''; - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - (runCommand "profile" {} '' - mkdir -p $out/etc/profile.d - cp ${myProfile} $out/etc/profile.d/my-profile.sh - '') - aspell - bc - coreutils - ffmpeg - man - nixUnstable - emscripten - jq - nox - silver-searcher - texinfoInteractive - ]; - pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ]; - extraOutputsToInstall = [ "man" "doc" "info" ]; - postBuild = '' - if [ -x $out/bin/install-info -a -w $out/share/info ]; then - shopt -s nullglob - for i in $out/share/info/*.info $out/share/info/*.info.gz; do - $out/bin/install-info $i $out/share/info/dir - done - fi - ''; - }; - }; -} - - - - postBuild tells Nixpkgs to run a command after building the environment. In this case, install-info adds the installed info pages to dir which is GNU info's default root node. Note that texinfoInteractive is added to the environment to give the install-info command. - -
-
- diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md new file mode 100644 index 000000000000..935583a91e24 --- /dev/null +++ b/doc/using/overlays.chapter.md @@ -0,0 +1,149 @@ +# Overlays {#chap-overlays} + +This chapter describes how to extend and change Nixpkgs using overlays. Overlays are used to add layers in the fixed-point used by Nixpkgs to compose the set of all packages. + +Nixpkgs can be configured with a list of overlays, which are applied in order. This means that the order of the overlays can be significant if multiple layers override the same package. + +## Installing overlays {#sec-overlays-install} + +The list of overlays can be set either explicitly in a Nix expression, or through `` or user configuration files. + +### Set overlays in NixOS or Nix expressions {#sec-overlays-argument} + +On a NixOS system the value of the `nixpkgs.overlays` option, if present, is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for non-NixOS operations (e.g. `nix-env`), which are [looked up](#sec-overlays-lookup) independently. + +The list of overlays can be passed explicitly when importing nixpkgs, for example `import { overlays = [ overlay1 overlay2 ]; }`. + +NOTE: DO NOT USE THIS in nixpkgs. Further overlays can be added by calling the `pkgs.extend` or `pkgs.appendOverlays`, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do. + +### Install overlays via configuration lookup {#sec-overlays-lookup} + +The list of overlays is determined as follows. + +1. First, if an [`overlays` argument](#sec-overlays-argument) to the Nixpkgs function itself is given, then that is used and no path lookup will be performed. + +2. Otherwise, if the Nix path entry `` exists, we look for overlays at that path, as described below. + + See the section on `NIX_PATH` in the Nix manual for more details on how to set a value for `.` + +3. If one of `~/.config/nixpkgs/overlays.nix` and `~/.config/nixpkgs/overlays/` exists, then we look for overlays at that path, as described below. It is an error if both exist. + +If we are looking for overlays at a path, then there are two cases: + +- If the path is a file, then the file is imported as a Nix expression and used as the list of overlays. + +- If the path is a directory, then we take the content of the directory, order it lexicographically, and attempt to interpret each as an overlay by: + + - Importing the file, if it is a `.nix` file. + + - Importing a top-level `default.nix` file, if it is a directory. + +Because overlays that are set in NixOS configuration do not affect non-NixOS operations such as `nix-env`, the `overlays.nix` option provides a convenient way to use the same overlays for a NixOS system configuration and user configuration: the same file can be used as `overlays.nix` and imported as the value of `nixpkgs.overlays`. + +## Defining overlays {#sec-overlays-definition} + +Overlays are Nix functions which accept two arguments, conventionally called `self` and `super`, and return a set of packages. For example, the following is a valid overlay. + +```nix +self: super: + +{ + boost = super.boost.override { + python = self.python3; + }; + rr = super.callPackage ./pkgs/rr { + stdenv = self.stdenv_32bit; + }; +} +``` + +The first argument (`self`) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of `rr` in the example above come from `self`, as well as the overridden dependencies used in the `boost` override. + +The second argument (`super`) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of `boost` in the above example, comes from `super`, as well as the `callPackage` function. + +The value returned by this function should be a set similar to `pkgs/top-level/all-packages.nix`, containing overridden and/or new packages. + +Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in . Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. + +## Using overlays to configure alternatives {#sec-overlays-alternatives} + +Certain software packages have different implementations of the same interface. Other distributions have functionality to switch between these. For example, Debian provides [DebianAlternatives](https://wiki.debian.org/DebianAlternatives). Nixpkgs has what we call `alternatives`, which are configured through overlays. + +### BLAS/LAPACK {#sec-overlays-alternatives-blas-lapack} + +In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear algebra interfaces. They are: + +- [OpenBLAS](https://www.openblas.net/) + + The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default. + +- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS) + + The Nixpkgs attribute is `lapack-reference`. + +- [Intel MKL](https://software.intel.com/en-us/mkl) (only works on the x86_64 architecture, unfree) + + The Nixpkgs attribute is `mkl`. + +- [BLIS](https://github.com/flame/blis) + + BLIS, available through the attribute `blis`, is a framework for linear algebra kernels. In addition, it implements the BLAS interface. + +- [AMD BLIS/LIBFLAME](https://developer.amd.com/amd-aocl/blas-library/) (optimized for modern AMD x86_64 CPUs) + + The AMD fork of the BLIS library, with attribute `amd-blis`, extends BLIS with optimizations for modern AMD CPUs. The changes are usually submitted to the upstream BLIS project after some time. However, AMD BLIS typically provides some performance improvements on AMD Zen CPUs. The complementary AMD LIBFLAME library, with attribute `amd-libflame`, provides a LAPACK implementation. + +Introduced in [PR #83888](https://github.com/NixOS/nixpkgs/pull/83888), we are able to override the `blas` and `lapack` packages to use different implementations, through the `blasProvider` and `lapackProvider` argument. This can be used to select a different provider. BLAS providers will have symlinks in `$out/lib/libblas.so.3` and `$out/lib/libcblas.so.3` to their respective BLAS libraries. Likewise, LAPACK providers will have symlinks in `$out/lib/liblapack.so.3` and `$out/lib/liblapacke.so.3` to their respective LAPACK libraries. For example, Intel MKL is both a BLAS and LAPACK provider. An overlay can be created to use Intel MKL that looks like: + +```nix +self: super: + +{ + blas = super.blas.override { + blasProvider = self.mkl; + }; + + lapack = super.lapack.override { + lapackProvider = self.mkl; + }; +} +``` + +This overlay uses Intel's MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime using `LD_LIBRARY_PATH` of `libblas.so.3` and `liblapack.so.3`. For instance: + +```shellSession +$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave +``` + +Intel MKL requires an `openmp` implementation when running with multiple processors. By default, `mkl` will use Intel's `iomp` implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with `LD_PRELOAD`. Note that `mkl` is only available on `x86_64-linux` and `x86_64-darwin`. Moreover, Hydra is not building and distributing pre-compiled binaries using it. + +For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: + +```nix +{ stdenv, blas, lapack, ... }: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation { + ... +} +``` + +### Switching the MPI implementation {#sec-overlays-alternatives-mpi} + +All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Passing_Interface) support use the generic attribute `mpi` as an input. At the moment Nixpkgs natively provides two different MPI implementations: + +- [Open MPI](https://www.open-mpi.org/) (default), attribute name + `openmpi` + +- [MPICH](https://www.mpich.org/), attribute name `mpich` + +To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay: + +```nix +self: super: + +{ + mpi = self.mpich; +} +``` diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml deleted file mode 100644 index 8f12aad2adad..000000000000 --- a/doc/using/overlays.xml +++ /dev/null @@ -1,279 +0,0 @@ - - Overlays - - This chapter describes how to extend and change Nixpkgs using overlays. Overlays are used to add layers in the fixed-point used by Nixpkgs to compose the set of all packages. - - - Nixpkgs can be configured with a list of overlays, which are applied in order. This means that the order of the overlays can be significant if multiple layers override the same package. - - -
- Installing overlays - - - The list of overlays can be set either explicitly in a Nix expression, or through <nixpkgs-overlays> or user configuration files. - - -
- Set overlays in NixOS or Nix expressions - - - On a NixOS system the value of the nixpkgs.overlays option, if present, is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for non-NixOS operations (e.g. nix-env), which are looked up independently. - - - - The list of overlays can be passed explicitly when importing nixpkgs, for example import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }. - - - - NOTE: DO NOT USE THIS in nixpkgs. Further overlays can be added by calling the pkgs.extend or pkgs.appendOverlays, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do. - -
- -
- Install overlays via configuration lookup - - - The list of overlays is determined as follows. - - - - - - - First, if an overlays argument to the Nixpkgs function itself is given, then that is used and no path lookup will be performed. - - - - - Otherwise, if the Nix path entry <nixpkgs-overlays> exists, we look for overlays at that path, as described below. - - - See the section on NIX_PATH in the Nix manual for more details on how to set a value for <nixpkgs-overlays>. - - - - - If one of ~/.config/nixpkgs/overlays.nix and ~/.config/nixpkgs/overlays/ exists, then we look for overlays at that path, as described below. It is an error if both exist. - - - - - - - If we are looking for overlays at a path, then there are two cases: - - - - If the path is a file, then the file is imported as a Nix expression and used as the list of overlays. - - - - - If the path is a directory, then we take the content of the directory, order it lexicographically, and attempt to interpret each as an overlay by: - - - - Importing the file, if it is a .nix file. - - - - - Importing a top-level default.nix file, if it is a directory. - - - - - - - - - - Because overlays that are set in NixOS configuration do not affect non-NixOS operations such as nix-env, the overlays.nix option provides a convenient way to use the same overlays for a NixOS system configuration and user configuration: the same file can be used as overlays.nix and imported as the value of nixpkgs.overlays. - - - -
-
- -
- Defining overlays - - - Overlays are Nix functions which accept two arguments, conventionally called self and super, and return a set of packages. For example, the following is a valid overlay. - - - -self: super: - -{ - boost = super.boost.override { - python = self.python3; - }; - rr = super.callPackage ./pkgs/rr { - stdenv = self.stdenv_32bit; - }; -} - - - - The first argument (self) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of rr in the example above come from self, as well as the overridden dependencies used in the boost override. - - - - The second argument (super) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of boost in the above example, comes from super, as well as the callPackage function. - - - - The value returned by this function should be a set similar to pkgs/top-level/all-packages.nix, containing overridden and/or new packages. - - - - Overlays are similar to other methods for customizing Nixpkgs, in particular the packageOverrides attribute described in . Indeed, packageOverrides acts as an overlay with only the super argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute. - -
-
- Using overlays to configure alternatives - - - Certain software packages have different implementations of the same interface. Other distributions have functionality to switch between these. For example, Debian provides DebianAlternatives. Nixpkgs has what we call alternatives, which are configured through overlays. - - -
- BLAS/LAPACK - - - In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear algebra interfaces. They are: - - - - - - OpenBLAS - - - The Nixpkgs attribute is openblas for ILP64 (integer width = 64 bits) and openblasCompat for LP64 (integer width = 32 bits). openblasCompat is the default. - - - - - LAPACK reference (also provides BLAS) - - - The Nixpkgs attribute is lapack-reference. - - - - - Intel MKL (only works on the x86_64 architecture, unfree) - - - The Nixpkgs attribute is mkl. - - - - - BLIS - - - BLIS, available through the attribute blis, is a framework for linear algebra kernels. In addition, it implements the BLAS interface. - - - - - AMD BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs) - - - The AMD fork of the BLIS library, with attribute amd-blis, extends BLIS with optimizations for modern AMD CPUs. The changes are usually submitted to the upstream BLIS project after some time. However, AMD BLIS typically provides some performance improvements on AMD Zen CPUs. The complementary AMD LIBFLAME library, with attribute amd-libflame, provides a LAPACK implementation. - - - - - - Introduced in PR #83888, we are able to override the blas and lapack packages to use different implementations, through the blasProvider and lapackProvider argument. This can be used to select a different provider. BLAS providers will have symlinks in $out/lib/libblas.so.3 and $out/lib/libcblas.so.3 to their respective BLAS libraries. Likewise, LAPACK providers will have symlinks in $out/lib/liblapack.so.3 and $out/lib/liblapacke.so.3 to their respective LAPACK libraries. For example, Intel MKL is both a BLAS and LAPACK provider. An overlay can be created to use Intel MKL that looks like: - - - -self: super: - -{ - blas = super.blas.override { - blasProvider = self.mkl; - }; - - lapack = super.lapack.override { - lapackProvider = self.mkl; - }; -} - - - - This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime using LD_LIBRARY_PATH of libblas.so.3 and liblapack.so.3. For instance: - - - -$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave - - - - Intel MKL requires an openmp implementation when running with multiple processors. By default, mkl will use Intel’s iomp implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with LD_PRELOAD. Note that mkl is only available on x86_64-linux and x86_64-darwin. Moreover, Hydra is not building and distributing pre-compiled binaries using it. - - - - For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following: - - - -{ stdenv, blas, lapack, ... }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation { - ... -} - -
- -
- Switching the MPI implementation - - - All programs that are built with MPI support use the generic attribute mpi as an input. At the moment Nixpkgs natively provides two different MPI implementations: - - - - Open MPI (default), attribute name openmpi - - - - - MPICH, attribute name mpich - - - - - - - To provide MPI enabled applications that use MPICH, instead of the default Open MPI, simply use the following overlay: - - - -self: super: - -{ - mpi = self.mpich; -} - -
-
- diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md new file mode 100644 index 000000000000..c1ab710e061b --- /dev/null +++ b/doc/using/overrides.chapter.md @@ -0,0 +1,104 @@ +# Overriding {#chap-overrides} + +Sometimes one wants to override parts of `nixpkgs`, e.g. derivation attributes, the results of derivations. + +These functions are used to make changes to packages, returning only single packages. [Overlays](#chap-overlays), on the other hand, can be used to combine the overridden packages across the entire package set of Nixpkgs. + +## <pkg>.override {#sec-pkg-override} + +The function `override` is usually available for all the derivations in the nixpkgs expression (`pkgs`). + +It is used to override the arguments passed to a function. + +Example usages: + +```nix +pkgs.foo.override { arg1 = val1; arg2 = val2; ... } +``` + + + +```nix +import pkgs.path { overlays = [ (self: super: { + foo = super.foo.override { barSupport = true ; }; + })]}; +``` + +```nix +mypkg = pkgs.callPackage ./mypkg.nix { + mydep = pkgs.mydep.override { ... }; + } +``` + +In the first example, `pkgs.foo` is the result of a function call with some default arguments, usually a derivation. Using `pkgs.foo.override` will call the same function with the given new arguments. + +## <pkg>.overrideAttrs {#sec-pkg-overrideAttrs} + +The function `overrideAttrs` allows overriding the attribute set passed to a `stdenv.mkDerivation` call, producing a new derivation based on the original one. This function is available on all derivations produced by the `stdenv.mkDerivation` function, which is most packages in the nixpkgs expression `pkgs`. + +Example usage: + +```nix +helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + separateDebugInfo = true; +}); +``` + +In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package. + +The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. + +::: note +Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). +::: + +## <pkg>.overrideDerivation {#sec-pkg-overrideDerivation} + +::: warning +You should prefer `overrideAttrs` in almost all cases, see its documentation for the reasons why. `overrideDerivation` is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as `overrideAttrs`. +::: + +::: warning +Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`. +::: + +The function `overrideDerivation` creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the `makeOverridable` function. Most standard derivation-producing functions, such as `stdenv.mkDerivation`, are defined using this function, which means most packages in the nixpkgs expression, `pkgs`, have this function. + +Example usage: + +```nix +mySed = pkgs.gnused.overrideDerivation (oldAttrs: { + name = "sed-4.2.2-pre"; + src = fetchurl { + url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; + sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; + }; + patches = []; +}); +``` + +In the above example, the `name`, `src`, and `patches` of the derivation will be overridden, while all other attributes will be retained from the original derivation. + +The argument `oldAttrs` is used to refer to the attribute set of the original derivation. + +::: note +A package's attributes are evaluated *before* being modified by the `overrideDerivation` function. For example, the `name` attribute reference in `url = "mirror://gnu/hello/${name}.tar.gz";` is filled-in *before* the `overrideDerivation` function modifies the attribute set. This means that overriding the `name` attribute, in this example, *will not* change the value of the `url` attribute. Instead, we need to override both the `name` *and* `url` attributes. +::: + +## lib.makeOverridable {#sec-lib-makeOverridable} + +The function `lib.makeOverridable` is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set. + +Example usage: + +```nix +f = { a, b }: { result = a+b; }; +c = lib.makeOverridable f { a = 1; b = 2; }; +``` + +The variable `c` is the value of the `f` function applied with some default arguments. Hence the value of `c.result` is `3`, in this example. + +The variable `c` however also has some additional functions, like +[c.override](#sec-pkg-override) which can be used to override the +default arguments. In this example the value of +`(c.override { a = 4; }).result` is 6. diff --git a/doc/using/overrides.xml b/doc/using/overrides.xml deleted file mode 100644 index c9d36ddb2d7b..000000000000 --- a/doc/using/overrides.xml +++ /dev/null @@ -1,145 +0,0 @@ - - Overriding - - Sometimes one wants to override parts of nixpkgs, e.g. derivation attributes, the results of derivations. - - - These functions are used to make changes to packages, returning only single packages. Overlays, on the other hand, can be used to combine the overridden packages across the entire package set of Nixpkgs. - -
- <pkg>.override - - - The function override is usually available for all the derivations in the nixpkgs expression (pkgs). - - - - It is used to override the arguments passed to a function. - - - - Example usages: -pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - - -import pkgs.path { overlays = [ (self: super: { - foo = super.foo.override { barSupport = true ; }; - })]}; - - -mypkg = pkgs.callPackage ./mypkg.nix { - mydep = pkgs.mydep.override { ... }; - } - - - - - In the first example, pkgs.foo is the result of a function call with some default arguments, usually a derivation. Using pkgs.foo.override will call the same function with the given new arguments. - -
-
- <pkg>.overrideAttrs - - - The function overrideAttrs allows overriding the attribute set passed to a stdenv.mkDerivation call, producing a new derivation based on the original one. This function is available on all derivations produced by the stdenv.mkDerivation function, which is most packages in the nixpkgs expression pkgs. - - - - Example usage: - -helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { - separateDebugInfo = true; -}); - - - - - In the above example, the separateDebugInfo attribute is overridden to be true, thus building debug info for helloWithDebug, while all other attributes will be retained from the original hello package. - - - - The argument oldAttrs is conventionally used to refer to the attr set originally passed to stdenv.mkDerivation. - - - - - Note that separateDebugInfo is processed only by the stdenv.mkDerivation function, not the generated, raw Nix derivation. Thus, using overrideDerivation will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that overrideAttrs should be preferred in (almost) all cases to overrideDerivation, i.e. to allow using stdenv.mkDerivation to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. buildInputs vs nativeBuildInputs), and it involves less typing). - - -
-
- <pkg>.overrideDerivation - - - - You should prefer overrideAttrs in almost all cases, see its documentation for the reasons why. overrideDerivation is not deprecated and will continue to work, but is less nice to use and does not have as many abilities as overrideAttrs. - - - - - - Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in ~/.config/nixpkgs/config.nix. - - - - - The function overrideDerivation creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the makeOverridable function. Most standard derivation-producing functions, such as stdenv.mkDerivation, are defined using this function, which means most packages in the nixpkgs expression, pkgs, have this function. - - - - Example usage: - -mySed = pkgs.gnused.overrideDerivation (oldAttrs: { - name = "sed-4.2.2-pre"; - src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; - }; - patches = []; -}); - - - - - In the above example, the name, src, and patches of the derivation will be overridden, while all other attributes will be retained from the original derivation. - - - - The argument oldAttrs is used to refer to the attribute set of the original derivation. - - - - - A package's attributes are evaluated *before* being modified by the overrideDerivation function. For example, the name attribute reference in url = "mirror://gnu/hello/${name}.tar.gz"; is filled-in *before* the overrideDerivation function modifies the attribute set. This means that overriding the name attribute, in this example, *will not* change the value of the url attribute. Instead, we need to override both the name *and* url attributes. - - -
-
- lib.makeOverridable - - - The function lib.makeOverridable is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set. - - - - Example usage: - -f = { a, b }: { result = a+b; }; -c = lib.makeOverridable f { a = 1; b = 2; }; - - - - - The variable c is the value of the f function applied with some default arguments. Hence the value of c.result is 3, in this example. - - - - The variable c however also has some additional functions, like c.override which can be used to override the default arguments. In this example the value of (c.override { a = 4; }).result is 6. - -
- From c30fe2412047927ea761bdca20d42f7fc398745c Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Sat, 24 Apr 2021 11:12:46 +0200 Subject: [PATCH 006/664] docs/using: shellSession -> ShellSession Co-authored-by: Jan Tojnar --- doc/using/configuration.chapter.md | 10 +++++----- doc/using/overlays.chapter.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index e4d401368796..932b24237c02 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -42,7 +42,7 @@ There are two ways to try compiling a package which has been marked as broken. - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: - ```shellSession + ```ShellSession $ export NIXPKGS_ALLOW_BROKEN=1 ``` @@ -61,7 +61,7 @@ There are also two ways to try compiling a package which has been marked as unsu - For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: - ```shellSession + ```ShellSession $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 ``` @@ -81,7 +81,7 @@ There are several ways to tweak how Nix handles a package which has been marked - To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: - ```shellSession + ```ShellSession $ export NIXPKGS_ALLOW_UNFREE=1 ``` @@ -134,7 +134,7 @@ There are several ways to tweak how Nix handles a package which has been marked - To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: - ```shellSession + ```ShellSession $ export NIXPKGS_ALLOW_INSECURE=1 ``` @@ -294,7 +294,7 @@ This provides us with some useful documentation for using our packages. However For this to work fully, you must also have this script sourced when you are logged in. Try adding something like this to your `~/.profile` file: -```shellSession +```ShellSession #!/bin/sh if [ -d $HOME/.nix-profile/etc/profile.d ]; then for i in $HOME/.nix-profile/etc/profile.d/*.sh; do diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 935583a91e24..21efe467b847 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -111,7 +111,7 @@ self: super: This overlay uses Intel's MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime using `LD_LIBRARY_PATH` of `libblas.so.3` and `liblapack.so.3`. For instance: -```shellSession +```ShellSession $ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave ``` From 0418760037f2aef5e67beccbb1fe58b0fe4d7370 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 25 Dec 2020 15:05:53 -0700 Subject: [PATCH 007/664] ovftool: init at 4.4.1 --- pkgs/tools/virtualization/ovftool/default.nix | 230 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 232 insertions(+) create mode 100644 pkgs/tools/virtualization/ovftool/default.nix diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix new file mode 100644 index 000000000000..cc4af17b47d0 --- /dev/null +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -0,0 +1,230 @@ +{ lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {} +, requireFile, buildFHSUserEnv, patchelf, autoPatchelfHook, makeWrapper, nix, unzip +, glibc, c-ares, openssl_1_0_2, curl, expat, icu60, xercesc, zlib +}: + +let + version = "4.4.1-16812187"; + + # FHS environment required to unpack ovftool on x86. + ovftoolX86Unpacker = buildFHSUserEnv rec { + name = "ovftool-unpacker"; + targetPkgs = pkgs: [ pkgs.bash ]; + multiPkgs = targetPkgs; + runScript = "bash"; + }; + + # unpackPhase for i686 and x86_64 ovftool self-extracting bundles. + ovftoolX86UnpackPhase = '' + runHook preUnpack + + # This is a self-extracting shell script and needs a FHS environment to run. + # In reality, it could be doing anything, which is bad for reproducibility. + # Our postUnpack uses nix-hash to verify the hash to prevent problems. + # + # Note that the Arch PKGBUILD at + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool + # appears to use xvfb-run - this hasn't been proven necessary so far. + # + cp ${ovftoolSource} ./ovftool.bundle + chmod +x ./ovftool.bundle + ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool + rm ovftool.bundle + + local extracted=ovftool/vmware-ovftool/ + if [ -d "$extracted" ]; then + # Move the directory we care about to ovftool/ + mv "$extracted" . + rm -r ovftool + mv "$(basename -- "$extracted")" ovftool + echo "ovftool extracted successfully" >&2 + else + echo "Could not find $extracted - are you sure this is ovftool?" >&2 + rm -r ovftool + exit 1 + fi + + runHook postUnpack + ''; + + # unpackPhase for aarch64 .zip. + ovftoolAarch64UnpackPhase = '' + runHook preUnpack + + unzip ${ovftoolSource} + + local extracted=ovftool/ + if [ -d "$extracted" ]; then + echo "ovftool extracted successfully" >&2 + else + echo "Could not find $extracted - are you sure this is ovftool?" >&2 + exit 1 + fi + + runHook postUnpack + ''; + + # When the version is bumped, postUnpackHash will change + # for all these supported systems. Update it from the printed error on build. + # + # This is just a sanity check, since ovftool is a self-extracting bundle + # that could be doing absolutely anything on 2/3 of the supported platforms. + ovftoolSystems = { + "i686-linux" = { + filename = "VMware-ovftool-${version}-lin.i386.bundle"; + sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj"; + unpackPhase = ovftoolX86UnpackPhase; + postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n"; + }; + "x86_64-linux" = { + filename = "VMware-ovftool-${version}-lin.x86_64.bundle"; + sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc"; + unpackPhase = ovftoolX86UnpackPhase; + postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py"; + }; + "aarch64-linux" = { + filename = "VMware-ovftool-${version}-lin.aarch64.zip"; + sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy"; + unpackPhase = ovftoolAarch64UnpackPhase; + postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971"; + }; + }; + + ovftoolSystem = if builtins.hasAttr system ovftoolSystems then + ovftoolSystems.${system} + else throw "System '${system}' is unsupported by ovftool"; + + ovftoolSource = if builtins.hasAttr system ovftoolBundles then + ovftoolBundles.${system} + else + requireFile { + name = ovftoolSystem.filename; + url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441"; + sha256 = ovftoolSystem.sha256; + }; +in +stdenv.mkDerivation rec { + pname = "ovftool"; + inherit version; + + src = ovftoolSource; + + buildInputs = [ + glibc + + # This is insecure, but we don't really have a way around it + # since ovftool depends on it. In theory we could ship their OpenSSL + # build... but that makes the reliance on an insecure library less obvious. + openssl_1_0_2 + + c-ares + (curl.override { openssl = openssl_1_0_2; }) + expat + icu60 + xercesc + zlib + ]; + + nativeBuildInputs = [ nix patchelf autoPatchelfHook makeWrapper unzip ]; + + sourceRoot = "."; + + unpackPhase = ovftoolSystem.unpackPhase; + + postUnpackHash = ovftoolSystem.postUnpackHash; + + # Expects a directory named 'ovftool'. Validates the postUnpackHash in + # ovftoolSystem. + postUnpack = '' + if [ -d ovftool ]; then + # Ensure we're in the staging directory + cd ovftool + fi + + # Verify the hash with nix-hash before proceeding to ensure reproducibility. + local ovftool_hash + ovftool_hash="$(nix-hash --type sha256 --base32 .)" + if [ "$ovftool_hash" != "$postUnpackHash" ]; then + echo "Expected hash: $postUnpackHash" >&2 + echo "Actual hash: $ovftool_hash" >&2 + echo "Could not verify post-unpack hash!" >&2 + exit 1 + fi + ''; + + # Expects a directory named 'ovftool' containing the ovftool install. + # Based on https://aur.archlinux.org/packages/vmware-ovftool/ + # with the addition of a libexec directory and a Nix-style binary wrapper. + installPhase = '' + runHook preInstall + + if [ -d ovftool ]; then + # Ensure we're in the staging directory + cd ovftool + fi + + # libraries + install -m 755 -d "$out/lib/$pname" + + # These all appear to be VMWare proprietary except for libgoogleurl. + # The rest of the libraries that the installer extracts are omitted here, + # and provided in buildInputs. + # + # FIXME: can we replace libgoogleurl? Possibly from Chromium? + # + install -m 644 -t "$out/lib/$pname" \ + libgoogleurl.so.59 \ + libssoclient.so \ + libvim-types.so libvmacore.so libvmomi.so + + # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0 + ln -s "${openssl_1_0_2.out}/lib/libcrypto.so" \ + "$out/lib/$pname/libcrypto.so.1.0.2" + ln -s "${openssl_1_0_2.out}/lib/libssl.so" \ + "$out/lib/$pname/libssl.so.1.0.2" + + # libexec + install -m 755 -d "$out/libexec/$pname" + install -m 755 -t "$out/libexec/$pname" ovftool.bin + install -m 644 -t "$out/libexec/$pname" icudt44l.dat + + # libexec resources + for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do + install -m 755 -d "$out/libexec/$pname/$subdir" + install -m 644 -t "$out/libexec/$pname/$subdir" "$subdir"/*.* + done + + # EULA/OSS files + install -m 755 -d "$out/share/licenses/$pname" + install -m 644 -t "$out/share/licenses/$pname" \ + "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt" + + # documentation files + install -m 755 -d "$out/share/doc/$pname" + install -m 644 -t "$out/share/doc/$pname" "README.txt" + + # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by + # VMWare's wrapper script. We use C.UTF-8 instead. + install -m 755 -d "$out/bin" + makeWrapper "$out/libexec/$pname/ovftool.bin" "$out/bin/ovftool" \ + --set-default LC_CTYPE C.UTF-8 \ + --prefix LD_LIBRARY_PATH : "$out/lib" + + runHook postInstall + ''; + + preFixup = '' + addAutoPatchelfSearchPath "$out/lib" + ''; + + dontBuild = true; + dontPatch = true; + dontConfigure = true; + + meta = with lib; { + description = "VMWare tools for working with OVF, OVA, and VMX images"; + license = licenses.unfree; + maintainers = with maintainers; [ numinit ]; + platforms = builtins.attrNames ovftoolSystems; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d370bd80f83..9b226f8d445d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7339,6 +7339,8 @@ in otpw = callPackage ../os-specific/linux/otpw { }; + ovftool = callPackage ../tools/virtualization/ovftool { }; + overcommit = callPackage ../development/tools/overcommit { }; overmind = callPackage ../applications/misc/overmind { }; From 503b93754278a661391c868544085bcf3713fa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 1 May 2021 18:36:37 +0200 Subject: [PATCH 008/664] nixos/buildkite-agents: fix race-condition when installing secrets --- .../services/continuous-integration/buildkite-agents.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 3dd1c40aaa4b..b8982d757db9 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -238,8 +238,7 @@ in in optionalString (cfg.privateSshKeyPath != null) '' mkdir -m 0700 -p "${sshDir}" - cp -f "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa" - chmod 600 "${sshDir}"/id_rsa + install -m600 "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa" '' + '' cat > "${cfg.dataDir}/buildkite-agent.cfg" < Date: Tue, 11 May 2021 17:46:29 +0200 Subject: [PATCH 009/664] spot: init at 0.1.14 --- pkgs/applications/audio/spot/default.nix | 79 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/audio/spot/default.nix diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix new file mode 100644 index 000000000000..afe669f38622 --- /dev/null +++ b/pkgs/applications/audio/spot/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, gettext +, python3 +, desktop-file-utils +, rustPlatform +, pkg-config +, glib +, libhandy +, gtk3 +, openssl +, alsaLib +, libpulseaudio +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "spot"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "xou816"; + repo = "spot"; + rev = version; + sha256 = "eHhbm1amTx3ngqsP32uDEdrhrBeurMftg5SToTQGX9o="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-jY7pWoY9IJi5hHVRS1gQKb+Vmfc+wxHvoAwupOtXXQs="; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + python3 # for meson postinstall script + gtk3 # for gtk-update-icon-cache + glib # for glib-compile-schemas + desktop-file-utils + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libhandy + openssl + alsaLib + libpulseaudio + ]; + + postPatch = '' + chmod +x build-aux/cargo.sh + patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Native Spotify client for the GNOME desktop"; + homepage = "https://github.com/xou816/spot"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f45616b80035..e9d0f5127c85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23903,6 +23903,8 @@ in spectrwm = callPackage ../applications/window-managers/spectrwm { }; + spot = callPackage ../applications/audio/spot { }; + spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd { From c77d583fa4ce0e698971e0adc0179484553634e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Tue, 11 May 2021 23:39:38 +0200 Subject: [PATCH 010/664] gcstar: 1.7.2 -> 1.7.3 --- pkgs/applications/misc/gcstar/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index f77bf04c2c89..0ab40b034503 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gcstar"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitLab { owner = "Kerenoc"; repo = "GCstar"; rev = "v${version}"; - sha256 = "1vqfff33sssvlvsva1dflggmwl00j5p64sn1669f9wrbvjkxgpv4"; + sha256 = "1hah8ijh9mvcgbh36y3d3s6y79mzz27w24f2i29qllv7cayf6129"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { DateCalc DateTimeFormatStrptime Glib - Gtk2 + Gtk3 + Gtk3SimpleList GD GDGraph GDText From 8320e5f33237b46f5f415c22f520a51eec335d83 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:32:43 +0200 Subject: [PATCH 011/664] terraform-providers.aws: 3.27.0 -> 3.39.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f941b83eb702..f98d346217fa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.27.0", - "sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd", - "vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s", - "version": "3.27.0" + "rev": "v3.39.0", + "sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg", + "vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb", + "version": "3.39.0" }, "azuread": { "owner": "hashicorp", From 4bcdd851a8411900029cae636f00f0992434c859 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:34:53 +0200 Subject: [PATCH 012/664] terraform-providers.cloudinit: 1.0.0 -> 2.2.0 --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f98d346217fa..01cecd6b66dc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -176,9 +176,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", - "rev": "v1.0.0", - "sha256": "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx", - "version": "1.0.0" + "rev": "v2.2.0", + "sha256": "0yv52hz60whmqfwv2a6f9f1fpszcyzs78hhz3lq4imz9dv5bd29z", + "vendorSha256": null, + "version": "2.2.0" }, "cloudscale": { "owner": "terraform-providers", From e197d81df4a2ec3b344e528f2f0cd6f3e6b863de Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:36:26 +0200 Subject: [PATCH 013/664] terraform-providers.external: 2.0.0 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 01cecd6b66dc..fd37baa67111 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -311,10 +311,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", - "rev": "v2.0.0", - "sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a", + "rev": "v2.1.0", + "sha256": "0xc3mj0d4yrr1952c5ywrx19ny1k2475grka9v2w7szdy6p2rkk5", "vendorSha256": null, - "version": "2.0.0" + "version": "2.1.0" }, "fastly": { "owner": "terraform-providers", From e6730b6aaf45843dfd0708aec0fe95fa2bed0801 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:44:36 +0200 Subject: [PATCH 014/664] terraform-providers.helm: 2.0.2 -> 2.1.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd37baa67111..d4957b267978 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -402,10 +402,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.0.2", - "sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb", + "rev": "v2.1.2", + "sha256": "1385r9wk6mpb9fj53bkq586v8lw2310dim3kgj3pkrc1fssvwj0z", "vendorSha256": null, - "version": "2.0.2" + "version": "2.1.2" }, "heroku": { "owner": "terraform-providers", From f6718c11b707d48fb4d67c4aa6b9ac77c0ba19fc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:37:39 +0200 Subject: [PATCH 015/664] terraform-providers.null: 3.0.0 -> 3.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d4957b267978..0a58777eb162 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -663,10 +663,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", - "rev": "v3.0.0", - "sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r", + "rev": "v3.1.0", + "sha256": "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12", "vendorSha256": null, - "version": "3.0.0" + "version": "3.1.0" }, "nutanix": { "owner": "terraform-providers", From 39a55d73d45d8202016c0a9105518a1c1fbff09d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:40:57 +0200 Subject: [PATCH 016/664] terraform-providers.local: 2.0.0 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0a58777eb162..0df2d41bed51 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -556,10 +556,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.0.0", - "sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5", + "rev": "v2.1.0", + "sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2", "vendorSha256": null, - "version": "2.0.0" + "version": "2.1.0" }, "logentries": { "owner": "terraform-providers", From 744c2ac836c7cc2da58fc83157046793c4de5336 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:49:38 +0200 Subject: [PATCH 017/664] terraform-providers.kubectl: init at 1.10.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0df2d41bed51..930f59cae477 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -513,6 +513,15 @@ "sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc", "version": "1.0.0" }, + "kubectl": { + "owner": "gavinbunney", + "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", + "repo": "terraform-provider-kubectl", + "rev": "v1.10.0", + "sha256": "1w8g47dh77i7bhvxwysn7ldrcxl999sivxc7ws71ly5mnsljhhz0", + "vendorSha256": "1qrw2mg8ik2n6xlrnbcrgs9zhr9mwh1niv47kzhbp3mxvj5vdskk", + "version": "1.10.0" + }, "kubernetes": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", From db1aa813077de48e822824702345f78d6f06a46b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:51:54 +0200 Subject: [PATCH 018/664] terraform-providers.kubernetes: 2.0.2 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 930f59cae477..a40464e92a79 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -526,10 +526,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.0.2", - "sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf", + "rev": "v2.1.0", + "sha256": "02ygydgi3fa8z6qd04hgcilbbwns8f21agaqxly2pf9j23fzi37g", "vendorSha256": null, - "version": "2.0.2" + "version": "2.1.0" }, "kubernetes-alpha": { "owner": "hashicorp", From fe75c8ce4cf8d6be3d5306e917cb7e87d7372027 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:53:23 +0200 Subject: [PATCH 019/664] terraform-providers.kubernetes-alpha: 0.3.2 -> 0.3.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a40464e92a79..acf2619a8864 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -535,10 +535,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha", "repo": "terraform-provider-kubernetes-alpha", - "rev": "v0.3.2", - "sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb", + "rev": "v0.3.3", + "sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl", "vendorSha256": null, - "version": "0.3.2" + "version": "0.3.3" }, "launchdarkly": { "owner": "terraform-providers", From 743ee177bb08f3211f2e987be2fea84bc61ad36c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 12 May 2021 16:54:43 +0200 Subject: [PATCH 020/664] terraform-providers.random: 3.0.0 -> 3.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index acf2619a8864..067ccf307af9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -849,10 +849,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.0.0", - "sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9", + "rev": "v3.1.0", + "sha256": "1677mia6bbydqa8w50f1y85rynpv9lhg9ar5s6japsr5g78lrcqf", "vendorSha256": null, - "version": "3.0.0" + "version": "3.1.0" }, "rightscale": { "owner": "terraform-providers", From 9f73d45e2ed02f32058f46de2cebc5b57c2617b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 16:54:31 +0200 Subject: [PATCH 021/664] python3Packages.pycares: 3.1.1 -> 4.0.0 --- .../python-modules/pycares/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 9b3ec94babcf..b01b82eb9673 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,35 +1,38 @@ { lib , buildPythonPackage -, fetchPypi -, python , c-ares , cffi +, fetchPypi +, idna }: buildPythonPackage rec { pname = "pycares"; - version = "3.1.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "18dfd4fd300f570d6c4536c1d987b7b7673b2a9d14346592c5d6ed716df0d104"; + sha256 = "sha256-0BVPxXU7CIdY++ybwTfhsku4T8DGoJclyLrCWjQjEc0="; }; - buildInputs = [ c-ares ]; + buildInputs = [ + c-ares + ]; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + idna + ]; - checkPhase = '' - ${python.interpreter} tests/tests.py - ''; - - # requires network access + # Requires network access doCheck = false; - meta = with lib; { - homepage = "https://github.com/saghul/pycares"; - description = "Interface for c-ares"; - license = licenses.mit; - }; + pythonImportsCheck = [ "pycares" ]; + meta = with lib; { + description = "Python interface for c-ares"; + homepage = "https://github.com/saghul/pycares"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } From 9b3a2e66b141733fe7cb5372f64d30b66445cccd Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 16 May 2021 16:42:44 +0200 Subject: [PATCH 022/664] vapoursynth: improve plugin dependency resolution Some python packages (e.g. functools32) are conditionally disabled for certain interpreter versions by having them return null instead of a derivation. `getRecursivePropagatedBuildInputs` fails if such a package is part of the dependency tree. This commit makes it only recurse into derivations and ignore everything else. This also deduplicates the final plugin list to improve startup time. --- pkgs/development/libraries/vapoursynth/plugin-interface.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 55b2b03c893e..95df3c97747f 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -8,10 +8,11 @@ plugins: let getRecursivePropagatedBuildInputs = pkgs: lib.flatten (map - (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + (pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs; + in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs)) pkgs); - deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins)); pluginsEnv = buildEnv { name = "vapoursynth-plugins-env"; From aa80302844d6f5fef4d373a8d0514e36aceeba5e Mon Sep 17 00:00:00 2001 From: olebedev Date: Tue, 18 May 2021 10:06:53 +1000 Subject: [PATCH 023/664] maintainers: add olebedev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2da788a56af1..e6114df7a257 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7421,6 +7421,12 @@ githubId = 20923; name = "Erik Timan"; }; + olebedev = { + email = "ole6edev@gmail.com"; + github = "olebedev"; + githubId = 848535; + name = "Oleg Lebedev"; + }; olejorgenb = { email = "olejorgenb@yahoo.no"; github = "olejorgenb"; From 2be7ad54b45aa86b8358480e596a7fb328732577 Mon Sep 17 00:00:00 2001 From: olebedev Date: Tue, 18 May 2021 10:07:10 +1000 Subject: [PATCH 024/664] bkyml: init at 1.4.3 --- pkgs/tools/misc/bkyml/default.nix | 45 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/misc/bkyml/default.nix diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/tools/misc/bkyml/default.nix new file mode 100644 index 000000000000..aea83e7c99ff --- /dev/null +++ b/pkgs/tools/misc/bkyml/default.nix @@ -0,0 +1,45 @@ +{ lib +, python3 +}: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "bkyml"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "01kpx35572mp4xl2fjyvfk39jfgfjcyzymbifk76891kaqkjb7r9"; + }; + + # The pyscaffold is not a runtime dependency but just a python project bootstrapping tool. Thus, + # instead of implement this package in nix we remove a dependency on it and fix up the version + # of the package, that has been affected by the pyscaffold package dependency removal. + postPatch = '' + substituteInPlace setup.py \ + --replace "['pyscaffold>=3.0a0,<3.1a0'] + " "" \ + --replace "use_pyscaffold=True" "" + substituteInPlace src/bkyml/skeleton.py --replace \ + "from bkyml import __version__" \ + "__version__ = \"${version}\"" + ''; + + # Don't run tests because they are broken when run within + # buildPythonApplication for reasons I don't quite understand. + doCheck = false; + + pythonImportsCheck = [ "bkyml" ]; + + propagatedBuildInputs = [ + ruamel_yaml + setuptools + ]; + + meta = with lib; { + homepage = "https://github.com/joscha/bkyml"; + description = "A CLI tool to generate a pipeline.yaml file for Buildkite on the fly."; + license = licenses.mit; + maintainers = with maintainers; [ olebedev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b141f19069e..d03e40d7d002 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1228,6 +1228,8 @@ in bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; + bkyml = callPackage ../tools/misc/bkyml { }; + blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; bmap-tools = callPackage ../tools/misc/bmap-tools { }; From 36f7a012b798b90ac05b1d31bd7c468d01a6b327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 12:46:34 +0200 Subject: [PATCH 025/664] capture: use ffmpeg instead of ffmpeg_3 --- pkgs/tools/misc/capture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index d858e0fbc461..d8b2fe676518 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}: +{ lib, stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation { pname = "capture-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}' + --prefix PATH : '${lib.makeBinPath [ slop ffmpeg ]}' ''; meta = with lib; { From 5f6f35497dee97d94c075c3dfdbcccc0d4c076cf Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 19 May 2021 08:28:09 +0200 Subject: [PATCH 026/664] sanoid: 2.0.3 -> 2.1.0 Signed-off-by: Michael Adler --- pkgs/tools/backup/sanoid/default.nix | 35 +++++++--------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix index a60683a27e19..3a59dcc06408 100644 --- a/pkgs/tools/backup/sanoid/default.nix +++ b/pkgs/tools/backup/sanoid/default.nix @@ -1,46 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs +{ lib, stdenv, fetchFromGitHub, makeWrapper, zfs , perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: with lib; stdenv.mkDerivation rec { pname = "sanoid"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jimsalterjrs"; repo = pname; rev = "v${version}"; - sha256 = "1wmymzqg503nmhw8hrblfs67is1l3ljbk2fjvrqwyb01b7mbn80x"; + sha256 = "12g5cjx34ys6ix6ivahsbr3bbbi1fmjwdfdk382z6q71w3pyxxzf"; }; - patches = [ - # Make sanoid look for programs in PATH - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/dc2371775afe08af799d3097d47b48182d1716eb.patch"; - sha256 = "16hlwcbcb8h3ar1ywd2bzr3h3whgbcfk6walmp8z6j74wbx81aav"; - }) - # Make findoid look for programs in PATH - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/44bcd21f269e17765acd1ad0d45161902a205c7b.patch"; - sha256 = "0zqyl8q5sfscqcc07acw68ysnlnh3nb57cigjfwbccsm0zwlwham"; - }) - # Add --cache-dir option - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/a1f5e4c0c006e16a5047a16fc65c9b3663adb81e.patch"; - sha256 = "1bb4g2zxrbvf7fvcgzzxsr1cvxzrxg5dzh89sx3h7qlrd6grqhdy"; - }) - # Add --run-dir option - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/59a07f92b4920952cc9137b03c1533656f48b121.patch"; - sha256 = "11v4jhc36v839gppzvhvzp5jd22904k8xqdhhpx6ghl75yyh4f4s"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ]; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/etc/sanoid" cp sanoid.defaults.conf "$out/etc/sanoid/sanoid.defaults.conf" @@ -63,12 +42,14 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/findoid" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}" + + runHook postInstall ''; meta = { description = "A policy-driven snapshot management tool for ZFS filesystems"; homepage = "https://github.com/jimsalterjrs/sanoid"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; }; From 9a0a33f6b1ca2ae2c70e0c01722e3c359d667578 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:35 +0200 Subject: [PATCH 027/664] linux: 5.10.37 -> 5.10.38 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f150ab1cb0ac..cce8d1d92646 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.37"; + version = "5.10.38"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; + sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 701282a87a96bc14d1996b43c057394b4dc70510 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:40 +0200 Subject: [PATCH 028/664] linux: 5.11.21 -> 5.11.22 --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 2988984e34c8..e6a8aef650b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.21"; + version = "5.11.22"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; + sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; From a76a720665423d32db1edaf44915287c5860d536 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:45 +0200 Subject: [PATCH 029/664] linux: 5.12.4 -> 5.12.5 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 39366147ae50..8efecb53ea1c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.4"; + version = "5.12.5"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; + sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From ce48d2c5932b307c22b418a7cced203ffc438b15 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:50 +0200 Subject: [PATCH 030/664] linux: 5.4.119 -> 5.4.120 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8d6a063e643a..fd3cd525c203 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.119"; + version = "5.4.120"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; + sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From ae0c2693863dee99ba23ba707e8aca04ac37f716 Mon Sep 17 00:00:00 2001 From: Leo Gaskin Date: Wed, 19 May 2021 19:35:24 +0200 Subject: [PATCH 031/664] netdata: Enable ACLK-NG by default --- pkgs/tools/system/netdata/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d1fa401d4e06..3d09a5b1add1 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib , nixosTests +, curl, libcap, libuuid, lm_sensors, zlib, json_c , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -22,11 +22,12 @@ in stdenv.mkDerivation rec { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0x6vg2z7x83b127flbfqkgpakd5md7n2w39dvs8s16facdy2lvry"; + sha256 = "0735cxmljrp8zlkcq7hcxizy4j4xiv7vf782zkz5chn06n38mcik"; + fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ curl.dev zlib.dev ] + buildInputs = [ curl.dev zlib.dev json_c ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] @@ -70,6 +71,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + "--enable-cloud" + "--with-aclk-ng" ]; postFixup = '' From 649f8b67ac738deabdc9bd554a11365bc33d01aa Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Wed, 19 May 2021 10:31:07 -0700 Subject: [PATCH 032/664] jdk8: Remove default java.library.path This patch fixes https://github.com/NixOS/nixpkgs/issues/103493 for JDK8 only. I'm upstreaming only for JDK8 to get quorum on the approach and then adding the patches to the remaining versions. Improved JDK8 patch Improved JDK8 patch --- pkgs/development/compilers/openjdk/8.nix | 1 + .../openjdk/fix-library-path-jdk8.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index f10b7310df13..423c09d923a3 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -106,6 +106,7 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch + ./fix-library-path-jdk8.patch ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk8.patch ]; diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch new file mode 100644 index 000000000000..0664e745f57f --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch @@ -0,0 +1,37 @@ +diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp +index c477851c1b..ff5e28d95b 100644 +--- a/hotspot/src/os/linux/vm/os_linux.cpp ++++ b/hotspot/src/os/linux/vm/os_linux.cpp +@@ -368,13 +368,13 @@ void os::init_system_properties_values() { + // ... + // 7: The default directories, normally /lib and /usr/lib. + #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390)) +-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" ++#define DEFAULT_LIBPATH "" + #else +-#define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "" + #endif + + // Base path of extensions installed on the system. +-#define SYS_EXT_DIR "/usr/java/packages" ++#define SYS_EXT_DIR "" + #define EXTENSIONS_DIR "/lib/ext" + #define ENDORSED_DIR "/lib/endorsed" + +@@ -437,13 +437,13 @@ void os::init_system_properties_values() { + strlen(v) + 1 + + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1, + mtInternal); +- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch); ++ sprintf(ld_library_path, "%s%s", v); + Arguments::set_library_path(ld_library_path); + FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal); + } + + // 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); + + // Endorsed standards default directory. From f101bc6a93a09e239422141f8db97c44dc6409df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:28 +0200 Subject: [PATCH 033/664] python3Packages.archinfo: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 3a5db77cd476..47d3374bae81 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.6885"; + version = "9.0.7491"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0="; + sha256 = "sha256-5mKXpvMhdcIKgvQkmj//YigvsgozZofvv6CvMdW3BHo="; }; checkInputs = [ From 91d18ea9236a39bff185940bf10ebfe76b03b750 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:31 +0200 Subject: [PATCH 034/664] python3Packages.ailment: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 514194407929..fcc51360d0e4 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0="; + sha256 = "sha256-rxrj+5cz6zNsc+zgrOp8+/XY/RZG93PJQU59mMy5lDA="; }; propagatedBuildInputs = [ pyvex ]; From 30b87fde6561cc1be61966f34f946832ad6ec57c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:34 +0200 Subject: [PATCH 035/664] python3Packages.pyvex: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 618dfef4171c..de883fd3d898 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.6885"; + version = "9.0.7491"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E="; + sha256 = "sha256-tKfOkW1mLa4gCweF5bGVwnS7E+dRdc/PiuOfT7AgKNo="; }; propagatedBuildInputs = [ From 22736c8f684b36fcecfb25a54d0358b704f91a95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:37 +0200 Subject: [PATCH 036/664] python3Packages.claripy: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 4d8a79a8c991..6a301a780636 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE="; + sha256 = "sha256-M6Irec8p4l2WNrVeqUob3m2xF3JMtdp7I+LSi0iArZk="; }; # Use upstream z3 implementation From bbd8c0f9f8f2b6e475a7861656895bebe4c19b10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:40 +0200 Subject: [PATCH 037/664] python3Packages.cle: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 51d0c263d302..30193032ff49 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.6885"; + version = "9.0.7491"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80="; + sha256 = "sha256-P126IcUpq7b8u74YJFBXluGIIru+UOCnmHYmJBiK9Pc="; }; propagatedBuildInputs = [ From 421b5d89675e9e675b0e3a540c668cc867c4478f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:43 +0200 Subject: [PATCH 038/664] python3Packages.angr: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 5f545c96c9c0..0c7c68a55182 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8="; + sha256 = "sha256-d0EWPko3jWCexFNCWbofD6CjDIpjKb5mha2tRgtzL4M="; }; propagatedBuildInputs = [ From 30e5965f6bb904cb0e28ac6f02c36c6101ada49a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 20 May 2021 22:21:10 -0700 Subject: [PATCH 039/664] python3Packages.purl: 1.5 -> 1.6 --- pkgs/development/python-modules/purl/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 43fd5b71ca6c..aa85ea3965ab 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -1,22 +1,19 @@ { lib, buildPythonPackage, fetchFromGitHub -, nose -, six +, pytestCheckHook }: buildPythonPackage rec { pname = "purl"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "codeinthehole"; repo = "purl"; rev = version; - sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; + sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook]; meta = with lib; { description = "Immutable URL class for easy URL-building and manipulation"; From 4272dc1cfd76382a8f990ba80e3e2b8ab01841e6 Mon Sep 17 00:00:00 2001 From: Leo Gaskin Date: Fri, 21 May 2021 19:20:17 +0200 Subject: [PATCH 040/664] netdata: make cloud support optional and disable on darwin --- pkgs/tools/system/netdata/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 3d09a5b1add1..e00c2bfafb31 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib, json_c +, curl, libcap, libuuid, lm_sensors, zlib , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct +, withCloud ? (!stdenv.isDarwin), json_c , withSsl ? true, openssl , withDebug ? false }: @@ -27,13 +28,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ curl.dev zlib.dev json_c ] + buildInputs = [ curl.dev zlib.dev ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] ++ optionals withDBengine [ libuv lz4.dev judy ] ++ optionals withIpmi [ freeipmi ] ++ optionals withNetfilter [ libmnl libnetfilter_acct ] + ++ optionals withCloud [ json_c ] ++ optionals withSsl [ openssl.dev ]; patches = [ @@ -71,6 +73,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + ] ++ optionals withCloud [ "--enable-cloud" "--with-aclk-ng" ]; From a9b7300f6fac43011318554c0b942fa143b8a392 Mon Sep 17 00:00:00 2001 From: Matt Christ Date: Fri, 21 May 2021 12:59:30 -0500 Subject: [PATCH 041/664] brscan5: init at 1.2.6-0 --- maintainers/maintainer-list.nix | 6 + nixos/modules/module-list.nix | 1 + .../hardware/sane_extra_backends/brscan5.nix | 115 ++++++++++++++++++ .../sane_extra_backends/brscan5_etc_files.nix | 77 ++++++++++++ nixos/tests/brscan5.nix | 34 ++++++ .../sane/backends/brscan5/default.nix | 98 +++++++++++++++ pkgs/build-support/libredirect/libredirect.c | 81 +++++++++++- pkgs/build-support/libredirect/test.c | 6 + pkgs/top-level/all-packages.nix | 2 + 9 files changed, 418 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/services/hardware/sane_extra_backends/brscan5.nix create mode 100644 nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix create mode 100644 nixos/tests/brscan5.nix create mode 100644 pkgs/applications/graphics/sane/backends/brscan5/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cfd8a8918dbb..a71587832ebf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6238,6 +6238,12 @@ githubId = 11810057; name = "Matt Snider"; }; + mattchrist = { + email = "nixpkgs-matt@christ.systems"; + github = "mattchrist"; + githubId = 952712; + name = "Matt Christ"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dea0ca13565d..df415cc6b9a0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -398,6 +398,7 @@ ./services/hardware/ratbagd.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix + ./services/hardware/sane_extra_backends/brscan5.nix ./services/hardware/sane_extra_backends/dsseries.nix ./services/hardware/spacenavd.nix ./services/hardware/tcsd.nix diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix new file mode 100644 index 000000000000..f61b9b1494c7 --- /dev/null +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix @@ -0,0 +1,115 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.sane.brscan5; + + netDeviceList = attrValues cfg.netDevices; + + etcFiles = pkgs.callPackage ./brscan5_etc_files.nix { netDevices = netDeviceList; }; + + netDeviceOpts = { name, ... }: { + + options = { + + name = mkOption { + type = types.str; + description = '' + The friendly name you give to the network device. If undefined, + the name of attribute will be used. + ''; + + example = literalExample "office1"; + }; + + model = mkOption { + type = types.str; + description = '' + The model of the network device. + ''; + + example = literalExample "MFC-7860DW"; + }; + + ip = mkOption { + type = with types; nullOr str; + default = null; + description = '' + The ip address of the device. If undefined, you will have to + provide a nodename. + ''; + + example = literalExample "192.168.1.2"; + }; + + nodename = mkOption { + type = with types; nullOr str; + default = null; + description = '' + The node name of the device. If undefined, you will have to + provide an ip. + ''; + + example = literalExample "BRW0080927AFBCE"; + }; + + }; + + + config = + { name = mkDefault name; + }; + }; + +in + +{ + options = { + + hardware.sane.brscan5.enable = + mkEnableOption "Brother's brscan5 scan backend" // { + description = '' + When enabled, will automatically register the "brscan5" sane + backend and bring configuration files to their expected location. + ''; + }; + + hardware.sane.brscan5.netDevices = mkOption { + default = {}; + example = + { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; }; + office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; + }; + type = with types; attrsOf (submodule netDeviceOpts); + description = '' + The list of network devices that will be registered against the brscan5 + sane backend. + ''; + }; + }; + + config = mkIf (config.hardware.sane.enable && cfg.enable) { + + hardware.sane.extraBackends = [ + pkgs.brscan5 + ]; + + environment.etc."opt/brother/scanner/brscan5" = + { source = "${etcFiles}/etc/opt/brother/scanner/brscan5"; }; + environment.etc."opt/brother/scanner/models" = + { source = "${etcFiles}/etc/opt/brother/scanner/brscan5/models"; }; + environment.etc."sane.d/dll.d/brother5.conf".source = "${pkgs.brscan5}/etc/sane.d/dll.d/brother.conf"; + + assertions = [ + { assertion = all (x: !(null != x.ip && null != x.nodename)) netDeviceList; + message = '' + When describing a network device as part of the attribute list + `hardware.sane.brscan5.netDevices`, only one of its `ip` or `nodename` + attribute should be specified, not both! + ''; + } + ]; + + }; +} diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix new file mode 100644 index 000000000000..7ea384dcbce7 --- /dev/null +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, brscan5, netDevices ? [] }: + +/* + +Testing +------- +From nixpkgs repo + +No net devices: + +~~~ +nix-build -E 'let pkgs = import ./. {}; + brscan5-etc-files = pkgs.callPackage (import ./nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix) {}; + in brscan5-etc-files' +~~~ + +Two net devices: + +~~~ +nix-build -E 'let pkgs = import ./. {}; + brscan5-etc-files = pkgs.callPackage (import ./nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix) {}; + in brscan5-etc-files.override { + netDevices = [ + {name="a"; model="MFC-7860DW"; nodename="BRW0080927AFBCE";} + {name="b"; model="MFC-7860DW"; ip="192.168.1.2";} + ]; + }' +~~~ + +*/ + +let + + addNetDev = nd: '' + brsaneconfig5 -a \ + name="${nd.name}" \ + model="${nd.model}" \ + ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then + ''nodename="${nd.nodename}"'' else + ''ip="${nd.ip}"''}''; + addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs); +in + +stdenv.mkDerivation { + + name = "brscan5-etc-files"; + version = "1.2.6-0"; + src = "${brscan5}/opt/brother/scanner/brscan5"; + + nativeBuildInputs = [ brscan5 ]; + + dontConfigure = true; + + buildPhase = '' + TARGET_DIR="$out/etc/opt/brother/scanner/brscan5" + mkdir -p "$TARGET_DIR" + cp -rp "./models" "$TARGET_DIR" + cp -rp "./brscan5.ini" "$TARGET_DIR" + cp -rp "./brsanenetdevice.cfg" "$TARGET_DIR" + + export NIX_REDIRECTS="/etc/opt/brother/scanner/brscan5//brsanenetdevice.cfg=$TARGET_DIR/brsanenetdevice.cfg" + + printf '${addAllNetDev netDevices}\n' + + ${addAllNetDev netDevices} + ''; + + dontInstall = true; + + meta = with lib; { + description = "Brother brscan5 sane backend driver etc files"; + homepage = "https://www.brother.com"; + platforms = platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ mattchrist ]; + }; +} diff --git a/nixos/tests/brscan5.nix b/nixos/tests/brscan5.nix new file mode 100644 index 000000000000..af5333126b55 --- /dev/null +++ b/nixos/tests/brscan5.nix @@ -0,0 +1,34 @@ +# integration tests for brscan5 sane driver +# + +import ./make-test-python.nix ({ pkgs, ...} : { + name = "brscan5"; + meta = with pkgs.lib.maintainers; { + maintainers = [ mattchrist ]; + }; + + machine = { pkgs, ... }: + { + nixpkgs.config.allowUnfree = true; + hardware.sane = { + enable = true; + brscan5 = { + enable = true; + netDevices = { + "a" = { model="MFC-7860DW"; nodename="BRW0080927AFBCE"; }; + "b" = { model="MFC-7860DW"; ip="192.168.1.2"; }; + }; + }; + }; + }; + + testScript = '' + # sane loads libsane-brother5.so.1 successfully, and scanimage doesn't die + assert 'libsane-brother5.so.1", O_RDONLY|O_CLOEXEC) = 10' in machine.succeed('strace scanimage -L 2>&1') + + # module creates a config + cfg = machine.succeed('cat /etc/opt/brother/scanner/brscan5/brsanenetdevice.cfg') + assert 'DEVICE=a , "MFC-7860DW" , Unknown , NODENAME=BRW0080927AFBCE' in cfg + assert 'DEVICE=b , "MFC-7860DW" , Unknown , IP-ADDRESS=192.168.1.2' in cfg + ''; +}) diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix new file mode 100644 index 000000000000..e42c0980a1bc --- /dev/null +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -0,0 +1,98 @@ +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect }: +let + myPatchElf = file: with lib; '' + patchelf --set-interpreter \ + ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${file} + ''; + +in +stdenv.mkDerivation rec { + pname = "brscan5"; + version = "1.2.6-0"; + src = { + "i686-linux" = fetchurl { + url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb"; + sha256 = "102q745pc0168syggd4gym51qf3m3iqld3a4skfnbkm6yky4w4s8"; + }; + "x86_64-linux" = fetchurl { + url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb"; + sha256 = "1pwbzhpg5nzpw2rw936vf2cr334v8iny16y8fbb1zimgzmv427wx"; + }; + }."${stdenv.hostPlatform.system}"; + + unpackPhase = '' + ar x $src + tar xfv data.tar.xz + ''; + + nativeBuildInputs = [ makeWrapper patchelf coreutils ]; + buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ]; + dontBuild = true; + + postPatch = '' + ${myPatchElf "opt/brother/scanner/brscan5/brsaneconfig5"} + ${myPatchElf "opt/brother/scanner/brscan5/brscan_cnetconfig"} + ${myPatchElf "opt/brother/scanner/brscan5/brscan_gnetconfig"} + + for a in opt/brother/scanner/brscan5/*.so.* opt/brother/scanner/brscan5/brscan_[cg]netconfig; do + if ! test -L $a; then + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $a + fi + done + + # driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata. + # patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available + printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=84632 conv=notrunc + ''; + + installPhase = with lib; '' + runHook preInstall + PATH_TO_BRSCAN5="opt/brother/scanner/brscan5" + mkdir -p $out/$PATH_TO_BRSCAN5 + cp -rp $PATH_TO_BRSCAN5/* $out/$PATH_TO_BRSCAN5 + + + pushd $out/$PATH_TO_BRSCAN5 + ln -s libLxBsDeviceAccs.so.1.0.0 libLxBsDeviceAccs.so.1 + ln -s libLxBsNetDevAccs.so.1.0.0 libLxBsNetDevAccs.so.1 + ln -s libLxBsScanCoreApi.so.3.0.0 libLxBsScanCoreApi.so.3 + ln -s libLxBsUsbDevAccs.so.1.0.0 libLxBsUsbDevAccs.so.1 + ln -s libsane-brother5.so.1.0.7 libsane-brother5.so.1 + popd + + mkdir -p $out/lib/sane + for file in $out/$PATH_TO_BRSCAN5/*.so.* ; do + ln -s $file $out/lib/sane/ + done + + makeWrapper \ + "$out/$PATH_TO_BRSCAN5/brsaneconfig5" \ + "$out/bin/brsaneconfig5" \ + --suffix-each NIX_REDIRECT ":" "/etc/opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5 /opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5" \ + --set LD_PRELOAD ${libredirect}/lib/libredirect.so + + mkdir -p $out/etc/sane.d/dll.d + echo "brother5" > $out/etc/sane.d/dll.d/brother5.conf + + mkdir -p $out/etc/udev/rules.d + cp -p $PATH_TO_BRSCAN5/udev-rules/NN-brother-mfp-brscan5-1.0.2-2.rules \ + $out/etc/udev/rules.d/49-brother-mfp-brscan5-1.0.2-2.rules + + ETCDIR=$out/etc/opt/brother/scanner/brscan5 + mkdir -p $ETCDIR + cp -rp $PATH_TO_BRSCAN5/{models,brscan5.ini,brsanenetdevice.cfg} $ETCDIR/ + + runHook postInstall + ''; + + dontPatchELF = true; + + meta = { + description = "Brother brscan5 sane backend driver"; + homepage = "https://www.brother.com"; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ mattchrist ]; + }; +} diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index c8d6956a6bfe..dfa2978e9f44 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -9,6 +9,7 @@ #include #include #include +#include #define MAX_REDIRECTS 128 @@ -189,9 +190,85 @@ int posix_spawnp(pid_t * pid, const char * file, return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp); } -int execv(const char *path, char *const argv[]) +int execv(const char * path, char * const argv[]) { - int (*execv_real) (const char *path, char *const argv[]) = dlsym(RTLD_NEXT, "execv"); + int (*execv_real) (const char * path, char * const argv[]) = dlsym(RTLD_NEXT, "execv"); char buf[PATH_MAX]; return execv_real(rewrite(path, buf), argv); } + +int execvp(const char * path, char * const argv[]) +{ + int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp"); + char buf[PATH_MAX]; + return _execvp(rewrite(path, buf), argv); +} + +int execve(const char * path, char * const argv[], char * const envp[]) +{ + int (*_execve) (const char *, char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "execve"); + char buf[PATH_MAX]; + return _execve(rewrite(path, buf), argv, envp); +} + +DIR * opendir(const char * path) +{ + char buf[PATH_MAX]; + DIR * (*_opendir) (const char*) = dlsym(RTLD_NEXT, "opendir"); + + return _opendir(rewrite(path, buf)); +} + +#define SYSTEM_CMD_MAX 512 + +char *replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) { + char head[SYSTEM_CMD_MAX] = {0}; + strncpy(head, source, start_ptr - source); + + char tail[SYSTEM_CMD_MAX] = {0}; + if(suffix_ptr < source + strlen(source)) { + strcpy(tail, suffix_ptr); + } + + sprintf(buf, "%s%s%s", head, replace_string, tail); + return buf; +} + +char *replace_string(char * buf, char * from, char * to) { + int num_matches = 0; + char * matches[SYSTEM_CMD_MAX]; + int from_len = strlen(from); + for(int i=0; i #include #include +#include #include #include @@ -31,6 +32,10 @@ void test_execv(void) { assert(execv(TESTPATH, argv) == 0); } +void test_system(void) { + assert(system(TESTPATH) == 0); +} + int main(void) { FILE *testfp; @@ -50,6 +55,7 @@ int main(void) assert(stat(TESTPATH, &testsb) != -1); test_spawn(); + test_system(); test_execv(); /* If all goes well, this is never reached because test_execv() replaces diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c2bcba8812..ca0e4d439fc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30783,6 +30783,8 @@ in brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; + brscan5 = callPackage ../applications/graphics/sane/backends/brscan5 { }; + dsseries = callPackage ../applications/graphics/sane/backends/dsseries { }; sane-airscan = callPackage ../applications/graphics/sane/backends/airscan { }; From 0963e0baca6d2e7575d4866605899646f5cb1a98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 05:40:30 +0000 Subject: [PATCH 042/664] innernet: 1.2.0 -> 1.3.0 --- pkgs/tools/networking/innernet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 7a39c250ccf5..f260f1be5e04 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z4F5RYPVgFiiDBg6lxILjAh/a/rL7IJBqHIJ/tQyLnE="; + sha256 = "sha256-WqUkl9NZMMQJknASadLJz3CslrplGuXLrlv6fiwWFoI="; }; - cargoSha256 = "sha256-WSkN5aXMgfqZJAV1b3elF7kwf2f5OpcntKSf8620YcY="; + cargoSha256 = "sha256-mexiI9EHL2L4RNXCk133vriI5IGpdxLVy6xnBIqEH30="; nativeBuildInputs = with llvmPackages; [ llvm From a15204fcc02ab20abeb19fc6d71403c4b9f6fd85 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 21 May 2021 14:33:23 +0200 Subject: [PATCH 043/664] bazel_4: 4.0.0 -> 4.1.0 https://github.com/bazelbuild/bazel/releases/tag/4.1.0 other minor changes: - grep for /bin/ rather than /bin for blanket substitute - invoke {pre,post}{Build,Install} hooks --- .../build-managers/bazel/bazel_4/default.nix | 32 ++- .../bazel/bazel_4/src-deps.json | 213 ++++++++++++------ 2 files changed, 176 insertions(+), 69 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 7fc034220163..6cd378492e32 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.0.0"; + version = "4.1.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -52,8 +52,8 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v10.5.zip" - else srcs."java_tools_javac11_linux-v10.5.zip") + then srcs."java_tools_javac11_darwin-v10.6.zip" + else srcs."java_tools_javac11_linux-v10.6.zip") srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.19.0rc3.tar.gz" @@ -120,7 +120,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v10.6.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -128,12 +128,20 @@ let sourceRoot = "."; buildPhase = '' + runHook preBuild + mkdir $out; + + runHook postBuild ''; installPhase = '' + runHook preInstall + cp -Ra * $out/ touch $out/WORKSPACE + + runHook postInstall ''; }; @@ -318,7 +326,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; inherit sourceRoot; installPhase = '' + runHook preInstall + cp -r . "$out" + + runHook postInstall ''; }; # update the list of workspace dependencies @@ -430,7 +442,7 @@ stdenv.mkDerivation rec { --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. # We default to python3 where possible. See also `postFixup` where @@ -540,6 +552,8 @@ stdenv.mkDerivation rec { # Needed to build fish completion propagatedBuildInputs = [ python3.pkgs.absl-py ]; buildPhase = '' + runHook preBuild + # Increasing memory during compilation might be necessary. # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" @@ -567,9 +581,13 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ./output/bazel build src/tools/execlog:parser_deploy.jar cd - + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel @@ -632,6 +650,8 @@ stdenv.mkDerivation rec { # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} hello_test + + runHook postInstall ''; # Save paths to hardcoded dependencies so Nix can detect them. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json index 43ad41003152..3027183aef39 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -23,14 +23,6 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { - "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -159,11 +151,11 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", - "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "sha256": "cb0fd3eda612d4ae4be21108938800a19b015717a7627ea7f530e3469d207707", + "strip_prefix": "boringssl-88aeb757f1a415c71fb4cbf5af936ecae4bc8179", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", - "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz", + "https://github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz" ] }, "build_bazel_apple_support": { @@ -246,13 +238,13 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.32.0.patch" + "//third_party/grpc:grpc_1.33.1.patch" ], - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", - "strip_prefix": "grpc-1.32.0", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", + "strip_prefix": "grpc-1.33.1", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "com_google_absl": { @@ -364,11 +356,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", - "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "sha256": "466585f253471259ce17641348149f458270316e81ec6702fdd8bf0b1b681256", + "strip_prefix": "data-plane-api-9997e1137cdb59e622af13e57ca915a2f3c9f84f", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz" ] }, "futures": { @@ -428,25 +420,25 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools_javac11_darwin-v10.5.zip": { - "name": "java_tools_javac11_darwin-v10.5.zip", - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "java_tools_javac11_darwin-v10.6.zip": { + "name": "java_tools_javac11_darwin-v10.6.zip", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, - "java_tools_javac11_linux-v10.5.zip": { - "name": "java_tools_javac11_linux-v10.5.zip", - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "java_tools_javac11_linux-v10.6.zip": { + "name": "java_tools_javac11_linux-v10.6.zip", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, - "java_tools_javac11_windows-v10.5.zip": { - "name": "java_tools_javac11_windows-v10.5.zip", - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "java_tools_javac11_windows-v10.6.zip": { + "name": "java_tools_javac11_windows-v10.6.zip", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "java_tools_langtools_javac11": { @@ -673,6 +665,16 @@ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" ] }, + "openjdk11_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_aarch64_archive", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "openjdk11_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk11_darwin_archive", @@ -727,6 +729,16 @@ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" ] }, + "openjdk15_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_aarch64_archive", + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "openjdk15_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk15_darwin_archive", @@ -823,25 +835,50 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" ] }, - "openjdk_macos": { + "openjdk_macos_aarch64": { + "downloaded_file_path": "zulu-macos-aarch64.tar.gz", + "name": "openjdk_macos_aarch64", + "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz" + ] + }, + "openjdk_macos_aarch64_minimal": { + "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz", + "name": "openjdk_macos_aarch64_minimal", + "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz" + ] + }, + "openjdk_macos_aarch64_vanilla": { + "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz", + "name": "openjdk_macos_aarch64_vanilla", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, + "openjdk_macos_x86_64": { "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", + "name": "openjdk_macos_x86_64", "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" ] }, - "openjdk_macos_minimal": { + "openjdk_macos_x86_64_minimal": { "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", + "name": "openjdk_macos_x86_64_minimal", "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" ] }, - "openjdk_macos_vanilla": { + "openjdk_macos_x86_64_vanilla": { "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", + "name": "openjdk_macos_x86_64_vanilla", "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" @@ -873,11 +910,18 @@ }, "platforms": { "name": "platforms", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + ] + }, + "platforms-0.0.4.tar.gz": { + "name": "platforms-0.0.4.tar.gz", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" ] }, "remote_coverage_tools": { @@ -922,10 +966,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_darwin": { @@ -938,9 +982,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_linux": { @@ -953,9 +997,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_javac11_test_windows": { @@ -968,9 +1012,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remote_java_tools_linux": { @@ -993,10 +1037,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_windows": { @@ -1019,10 +1063,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remotejdk11_linux": { @@ -1152,6 +1196,24 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" ] }, + "remotejdk11_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "remotejdk11_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_macos_for_testing", @@ -1299,6 +1361,24 @@ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" ] }, + "remotejdk15_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "remotejdk15_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk15_macos_for_testing", @@ -1439,12 +1519,12 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "v1.32.0.tar.gz": { - "name": "v1.32.0.tar.gz", - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "v1.33.1.tar.gz": { + "name": "v1.33.1.tar.gz", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "v3.13.0.tar.gz": { @@ -1494,5 +1574,12 @@ "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" ] + }, + "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": { + "name": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] } } From 20366452e43c5fb5ae41d6642a61354e00f7049a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 12:22:01 +0200 Subject: [PATCH 044/664] python3Packages.pylitterbot: 2021.3.1 -> 2021.5.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 7aa5bebfaa0a..9390461a2fef 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.3.1"; + version = "2021.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-w2iyzCYoma8zQsXGIQnpgijDHNqmlvCnbeyF7PmLz9c="; + sha256 = "sha256-EiHdyjGYddtvciiwu2kpIBfUGvIJr38/8oJLFVzoRKE="; }; propagatedBuildInputs = [ From e4432f92967c2e355df532e892a0a5ab963d3cd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 12:59:55 +0200 Subject: [PATCH 045/664] python3Packages.motioneye-client: 0.3.6 -> 0.3.8 --- pkgs/development/python-modules/motioneye-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 19bb9a39c29c..44de5318787f 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.6"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "0j28rn7059km7q6z1kalp0pjcrd42wcm5mnbi94j93bvfld97w70"; + sha256 = "sha256-vTTjH4LhUcbh+/838wR0vnvml2y78Ro8SGwSZ6aApdQ="; }; nativeBuildInputs = [ From 95611d60026c8cdbe578fef7ce0e0915272167de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 13:14:10 +0200 Subject: [PATCH 046/664] python3Packages.snitun: 0.20 -> 0.21.0 --- pkgs/development/python-modules/snitun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 10eada9f0955..f93445a02b00 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.20"; + version = "0.21.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "1nscfwycclfbll709w1q46w6rl0r5c3b85rsc7zwc3ixd1k8aajp"; + sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg="; }; propagatedBuildInputs = [ attrs cryptography async-timeout ]; From 44f9b1c834571168962ce2ba1e9117d9d60f59fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 13:17:10 +0200 Subject: [PATCH 047/664] python3Packages.hass-nabucasa: 0.43.0 -> 0.43.1 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index a9f0d30ef44e..1abd9648e952 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.43.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-mfVSiquZrCtAza4q9Ocle22e4ZMoTgxguevuOlZEUm8="; + sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; }; postPatch = '' From 51f861a25c2d80c955dc3139da31a3aef2f9d03b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 11:50:52 +0000 Subject: [PATCH 048/664] cdogs-sdl: 0.11.1 -> 0.12.0 --- pkgs/games/cdogs-sdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 08af6bd74a80..30abb71a1296 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-POioDqmbWj+lYATp/3v14FoKZfR9GjLQyHq3nwDOywA="; + sha256 = "sha256-qbMR7otsC+uz+9mwgFaD2Z5fC6rj8ueYG3KwpPiqL98="; }; postPatch = '' From 4b1ac5a531a55904cbe20d20f0f37473fb29df79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:21:15 +0200 Subject: [PATCH 049/664] python3Packages.pyroute2-core: init at 0.6.1 --- .../python-modules/pyroute2-core/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-core/default.nix diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix new file mode 100644 index 000000000000..4ee37e4bfed1 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-core"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.core"; + inherit version; + sha256 = "04v10rzz844w2wfpy4pkh8fxn6dminjmfm1q7ngg5wvpk5r691rj"; + }; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.common" + "pr2modules.config" + "pr2modules.proxy" + ]; + + meta = with lib; { + description = "Core module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f331e80124b1..f427cbeadea9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6162,6 +6162,8 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From b91cfd8c3e3da88dfd49f7ee565aef52d88ba436 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:40:47 +0200 Subject: [PATCH 050/664] python3Packages.pyroute2-ethtool: init at 0.6.1 --- .../pyroute2-ethtool/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ethtool/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix new file mode 100644 index 000000000000..4e671b4e193f --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ethtool"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ethtool"; + inherit version; + sha256 = "1gd2vvdkjf6ppiql3znrlzc9xg8c4gsyg2jfm76c2xf329hi66n7"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ethtool" + ]; + + meta = with lib; { + description = "Ethtool module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f427cbeadea9..17b9200e8a87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6164,6 +6164,8 @@ in { pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; + pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From de9f169ecc89cf2c88c105b1a73080818911f0ec Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 14:35:14 +0200 Subject: [PATCH 051/664] bjumblr: 1.4.2 -> 1.6.6 --- pkgs/applications/audio/bjumblr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index 104c795c11e7..608839fc16ac 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "1.4.2"; + version = "1.6.6"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; + sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg"; }; nativeBuildInputs = [ pkg-config ]; From 2ef07d23b3c06852ae28eaeea22ac47e6b904f3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 21:47:48 +0200 Subject: [PATCH 052/664] python3Packages.pyroute2-ipdb: init at 0.6.1 --- .../python-modules/pyroute2-ipdb/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ipdb/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix new file mode 100644 index 000000000000..733988f20f50 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipdb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipdb"; + inherit version; + sha256 = "0wnzvy72pjipsdcfnwxpqp0jimg2l3w6gwd3r4b3mhvhackgsvs6"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipdb" + ]; + + meta = with lib; { + description = "Ipdb module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17b9200e8a87..0362cd20db71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6166,6 +6166,8 @@ in { pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; + pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From c64126b658a5243742c14761c443842358e6df09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:04:11 +0200 Subject: [PATCH 053/664] python3Packages.pyroute2-ipset: init at 0.6.1 --- .../python-modules/pyroute2-ipset/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ipset/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix new file mode 100644 index 000000000000..5ea6c7ce5d4d --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipset"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipset"; + inherit version; + sha256 = "1d5l9f028y7fjfbxpp5wls9ffdgrln24dlz8k4p11b5n445liakx"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipset" + ]; + + meta = with lib; { + description = "Ipset module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0362cd20db71..99557154c6b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6168,6 +6168,8 @@ in { pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; + pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From c48ebb385f55ae2e18b48c1e7a342e562ca1316a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:09:20 +0200 Subject: [PATCH 054/664] python3Packages.pyroute2-protocols: init at 0.6.1 --- .../pyroute2-protocols/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-protocols/default.nix diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix new file mode 100644 index 000000000000..389ca2ab44d0 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-protocols"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.protocols"; + inherit version; + sha256 = "16c22ygyxdn1mhnd2f34q9b2mqa27klk6di91w27ycb3aczmadlm"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.protocols" + ]; + + meta = with lib; { + description = "Protocols module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99557154c6b2..b5a2257ae504 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; From 1587fc4b6274117a4935313e17ff57214bbaa34c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:17:14 +0200 Subject: [PATCH 055/664] python3Packages.pyroute2-nftables: init at 0.6.1 --- .../pyroute2-nftables/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-nftables/default.nix diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix new file mode 100644 index 000000000000..594d57cba1bb --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nftables"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nftables"; + inherit version; + sha256 = "0g93jsjf77sxjxmgmd8pzy8daxnqnzp2fk9gbh9kxk1n1958p100"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nftables" + ]; + + meta = with lib; { + description = "Nftables module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5a2257ae504..01b036c34f80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; pyrr = callPackage ../development/python-modules/pyrr { }; From 3212db058d568ce295ed60d173a402688a315e50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:23:30 +0200 Subject: [PATCH 056/664] python3Packages.pyroute2-nslink: init at 0.6.1 --- .../pyroute2-nslink/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-nslink/default.nix diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix new file mode 100644 index 000000000000..e1076c1d0a05 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nslink"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nslink"; + inherit version; + sha256 = "0hjdi863imppirjrwr87xk2mfbw2djcsh7x94cq4xwps7bxmmkwk"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nslink" + ]; + + meta = with lib; { + description = "Nslink module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01b036c34f80..c6c9c86eb676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6172,6 +6172,8 @@ in { 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 { }; From db8f0958452fac36c9621ae8bdeecd9f9fb361d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 May 2021 22:55:26 +0200 Subject: [PATCH 057/664] python3Packages.pyroute2-ndb: init at 0.6.1 --- .../python-modules/pyroute2-ndb/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyroute2-ndb/default.nix diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix new file mode 100644 index 000000000000..7b34b3d341a3 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ndb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ndb"; + inherit version; + sha256 = "0lzvh0vva8i86h00add0b45s4f5dn6zbgysfvmzrxxasvda7fhlj"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ "pr2modules.ndb" ]; + + meta = with lib; { + description = "NDB module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6c9c86eb676..dd4c0f4eb2da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6170,6 +6170,8 @@ in { 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 { }; From b783a03b99def51169b896337c287f9a8213921e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:20:00 +0200 Subject: [PATCH 058/664] python3Packages.mitogen: init at 0.3.0rc1 --- .../python-modules/mitogen/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/mitogen/default.nix diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix new file mode 100644 index 000000000000..3268e8fae7ba --- /dev/null +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mitogen"; + version = "0.3.0rc1"; + + src = fetchFromGitHub { + owner = "mitogen-hq"; + repo = pname; + rev = "v${version}"; + sha256 = "0hxb41sshybxjyvyarl2axs0v6w53vqxafgfjrmpp5k20z5kapz4"; + }; + + # Tests require network access and Docker support + doCheck = false; + + pythonImportsCheck = [ "mitogen" ]; + + meta = with lib; { + description = "Python Library for writing distributed self-replicating programs"; + homepage = "https://github.com/mitogen-hq/mitogen"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd4c0f4eb2da..518ee88286ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4262,6 +4262,8 @@ in { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitogen = callPackage ../development/python-modules/mitogen { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; From 0e9f4948ef419c58bb717194ae440c08b5e5c59d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:22:44 +0200 Subject: [PATCH 059/664] python3Packages.pyroute2: 0.5.18 -> 0.6.1 --- .../python-modules/pyroute2/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 00ce008d6cc7..f18bc12caa6a 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,17 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, mitogen +, pyroute2-core +, pyroute2-ethtool +, pyroute2-ipdb +, pyroute2-ipset +, pyroute2-ndb +, pyroute2-nftables +, pyroute2-nslink }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.18"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; + sha256 = "sha256-nvG1PcuyQoZPrfMS4atsXsvpInjYt1bUIeX6Ol5DsO8="; }; + propagatedBuildInputs = [ + mitogen + pyroute2-core + pyroute2-ethtool + pyroute2-ipdb + pyroute2-ipset + pyroute2-ndb + pyroute2-nftables + pyroute2-nslink + ]; + # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; From cce46ce00712fbd7ee4c9e4db29a5028da6d22f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 00:37:01 +0200 Subject: [PATCH 060/664] python39Packages.aiodiscover: allow later pyroute2 releases --- pkgs/development/python-modules/aiodiscover/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 942482ba5ebb..8471afaded86 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -28,7 +28,9 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" \ + --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" ''; checkInputs = [ From 718e0e783577c6435aae1657644f6f2e0c9e6428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 02:00:19 +0000 Subject: [PATCH 061/664] logrotate: 3.18.0 -> 3.18.1 --- pkgs/tools/system/logrotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index b764202a58a6..3d5dac7faa8c 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.18.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "sha256-OFGXwaTabyuIgeC2ON68m83rzVxomk8QL6xwyrVV654="; + sha256 = "sha256-OJOV++rtN9ry+l0c0eanpu/Pwu8cOHfyEaDWp3FZjkw="; }; # Logrotate wants to access the 'mail' program; to be done. From 1244ddc7c66e0a87bd0f1c16ddf7c23c1d42d9f3 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Sat, 22 May 2021 21:35:48 -0700 Subject: [PATCH 062/664] python3Packages.jupyter_server: allow local networking --- pkgs/development/python-modules/jupyter_server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index e444b2ea3c0d..f90c521b553b 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -77,6 +77,8 @@ buildPythonPackage rec { "test_delete" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."; homepage = "https://github.com/jupyter-server/jupyter_server"; From 7c29b3e082255fe9dfaff1240232d037a2e34c25 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Sat, 22 May 2021 21:36:39 -0700 Subject: [PATCH 063/664] python3Packages.jupyterlab_server: allow darwin networking --- pkgs/development/python-modules/jupyterlab_server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index c110cc0590fe..d5d1318ed63c 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { "test_get_language_pack" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "JupyterLab Server"; homepage = "https://jupyter.org"; From f1096cd92c93f2d72d8daeaa87a3edc844b458eb Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Sat, 22 May 2021 21:38:40 -0700 Subject: [PATCH 064/664] python3Packages.nbclassic: allow darwin network tests --- pkgs/development/python-modules/nbclassic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 3644b4e48dd7..a6aa34a88ec8 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pytest-tornasync ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Jupyter lab environment notebook server extension."; license = with licenses; [ bsd3 ]; From 61e49ba58b487b49832028a1829f50fd2abcab06 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 16 May 2021 03:39:27 -0400 Subject: [PATCH 065/664] webkitgtk: fix on darwin --- .../libraries/webkitgtk/428774.patch | 86 +++++++++++++++++++ .../libraries/webkitgtk/default.nix | 36 ++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 123 insertions(+) create mode 100644 pkgs/development/libraries/webkitgtk/428774.patch diff --git a/pkgs/development/libraries/webkitgtk/428774.patch b/pkgs/development/libraries/webkitgtk/428774.patch new file mode 100644 index 000000000000..85da185dc4e4 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/428774.patch @@ -0,0 +1,86 @@ +diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp +--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500 ++++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400 +@@ -87,7 +87,7 @@ + if (!m_store.createSharedMemoryHandle(handle)) + return; + +-#if OS(DARWIN) || OS(WINDOWS) ++#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) + uint64_t dataSize = handle.size(); + #else + uint64_t dataSize = 0; +diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp +--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500 ++++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400 +@@ -26,8 +26,6 @@ + #include "config.h" + #include "IPCSemaphore.h" + +-#if !OS(DARWIN) +- + namespace IPC { + + Semaphore::Semaphore() = default; +@@ -46,5 +44,3 @@ + } + + } +- +-#endif +diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h +--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500 ++++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#if OS(DARWIN) ++#if PLATFORM(COCOA) + #include + #include + #endif +@@ -51,7 +51,7 @@ + void encode(Encoder&) const; + static Optional decode(Decoder&); + +-#if OS(DARWIN) ++#if PLATFORM(COCOA) + explicit Semaphore(MachSendRight&&); + + void signal(); +@@ -64,7 +64,7 @@ + #endif + + private: +-#if OS(DARWIN) ++#if PLATFORM(COCOA) + void destroy(); + MachSendRight m_sendRight; + semaphore_t m_semaphore { SEMAPHORE_NULL }; +Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig +diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h +--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500 ++++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400 +@@ -75,7 +75,7 @@ + + bool isNull() const; + +-#if OS(DARWIN) || OS(WINDOWS) ++#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) + size_t size() const { return m_size; } + #endif + +diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp +--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500 ++++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400 +@@ -119,7 +119,7 @@ + return; + + // FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object. +-#if OS(DARWIN) || OS(WINDOWS) ++#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS) + uint64_t dataSize = handle.size(); + #else + uint64_t dataSize = 0; +Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index f37ba500a227..40f51d6f48a3 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,7 @@ { lib, stdenv +, runCommandNoCC , fetchurl +, fetchpatch , perl , python3 , ruby @@ -34,6 +36,7 @@ , libidn , libedit , readline +, sdk , libGL , libGLU , mesa @@ -78,6 +81,32 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch + ] ++ lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff"; + sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA="; + excludes = [ "Source/WebKit/ChangeLog" ]; + }) + + # https://bugs.webkit.org/show_bug.cgi?id=225856 + (fetchpatch { + url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797"; + sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU="; + excludes = [ "Source/WebCore/ChangeLog" ]; + }) + + # https://bugs.webkit.org/show_bug.cgi?id=225850 + ./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774 + (fetchpatch { + url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776"; + sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ="; + excludes = [ "Source/WTF/ChangeLog" ]; + }) + (fetchpatch { + url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778"; + sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo="; + excludes = [ "Source/WebKit/ChangeLog" ]; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -96,6 +125,7 @@ stdenv.mkDerivation rec { gperf ninja perl + perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl pkg-config python3 ruby @@ -143,6 +173,12 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ libedit readline + # Pull a header that contains a definition of proc_pid_rusage(). + # (We pick just that one because using the other headers from `sdk` is not + # compatible with our C++ standard library) + (runCommandNoCC "${pname}_headers" {} '' + install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h + '') ] ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 040ec5fb4635..a37c57e1e39e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18144,6 +18144,7 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + inherit (darwin.apple_sdk) sdk; }; websocketpp = callPackage ../development/libraries/websocket++ { }; From ffa6f1573c1080e390bb6252f955b6cebbd20619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 May 2021 10:44:17 +0200 Subject: [PATCH 066/664] python3Packages.drf-jwt: 1.19.0 -> 1.19.1 https://github.com/Styria-Digital/django-rest-framework-jwt/blob/1.19.1/CHANGELOG.md --- pkgs/development/python-modules/drf-jwt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix index ad3edc59246d..2cf125c8df35 100644 --- a/pkgs/development/python-modules/drf-jwt/default.nix +++ b/pkgs/development/python-modules/drf-jwt/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pyjwt , djangorestframework -, pytestCheckHook }: buildPythonPackage rec { pname = "drf-jwt"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "Styria-Digital"; repo = "django-rest-framework-jwt"; rev = version; - sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7"; + sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g="; }; propagatedBuildInputs = [ From f7b33e03341c6d0e6495713dfaff969dbc1d002b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 May 2021 11:47:11 +0200 Subject: [PATCH 067/664] libreoffice-still: 7.0.4.2 -> 7.0.6.2 This will avoid false positives with CVE-2021-25631 [0] (only impact Windows). It also includes bugfixes: https://wiki.documentfoundation.org/Releases/7.0.5/RC1 https://wiki.documentfoundation.org/Releases/7.0.5/RC2 https://wiki.documentfoundation.org/Releases/7.0.6/RC1 https://wiki.documentfoundation.org/Releases/7.0.6/RC2 [0] https://www.libreoffice.org/about-us/security/advisories/cve-2021-25631/ --- .../office/libreoffice/src-still/download.nix | 24 +++++++++---------- .../office/libreoffice/src-still/primary.nix | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index d956a3b08a61..19dee4e1f136 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -721,25 +721,25 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.82.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; - sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; + name = "poppler-21.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; + sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; md5 = ""; - md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; + md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { - name = "postgresql-9.2.24.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; - sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + name = "postgresql-13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; + sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; md5 = ""; - md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; + md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { - name = "Python-3.7.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; - sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + name = "Python-3.7.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz"; + sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b"; md5 = ""; - md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index c9b182647114..d42f31bff3f9 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "0"; - patch = "4"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; + sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; + sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; + sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d"; }; } From 2e056140271657e1420b33eb65d2d0ca1ce4af66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 May 2021 12:10:39 +0200 Subject: [PATCH 068/664] kdeltachat: unstable-2021-05-18 -> unstable-2021-05-22 --- .../networking/instant-messengers/kdeltachat/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index d99bb5d5bb1e..cdda2fccc18e 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -8,17 +8,18 @@ , libdeltachat , qtimageformats , qtmultimedia +, qtwebengine }: mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-05-18"; + version = "unstable-2021-05-22"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "837336dc93b66912d48a3b7a2e8c1991b4d3650f"; - sha256 = "17ms6dcfdz0y24285fqpmgvw391bxrkagsiiy4g5cyp8gfppkgaj"; + rev = "9c22c6d6a03f620f14f289b464354159b8a76f6b"; + sha256 = "1qmal6dng8ynp5mrkrgykz78c8zp1gbv53s479qvj0h3axrp2s8p"; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ mkDerivation rec { libdeltachat qtimageformats qtmultimedia + qtwebengine ]; meta = with lib; { From 4dbad1fad8fad54a2c869570a28c74e69aa5363d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 12:38:49 +0200 Subject: [PATCH 069/664] gosh: init at 2020523-7ccb068 --- pkgs/tools/security/gosh/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/gosh/default.nix diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/tools/security/gosh/default.nix new file mode 100644 index 000000000000..5c5ad25e6d9e --- /dev/null +++ b/pkgs/tools/security/gosh/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gosh"; + # https://github.com/redcode-labs/GoSH/issues/4 + version = "2020523-${lib.strings.substring 0 7 rev}"; + rev = "7ccb068279cded1121eacc5a962c14b2064a1859"; + + src = fetchFromGitHub { + owner = "redcode-labs"; + repo = "GoSH"; + inherit rev; + sha256 = "143ig0lqnkpnydhl8gnfzhg613x4wc38ibdbikkqwfyijlr6sgzd"; + }; + + vendorSha256 = "06j6cj4m0w6n9vl7sxlxpsgk77k941npq9767rdzzgy2srfqlskq"; + + runVend = true; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Reverse/bind shell generator"; + homepage = "https://github.com/redcode-labs/GoSH"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb4e447884..7fbd1192a31b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1601,6 +1601,8 @@ in git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gosh = callPackage ../tools/security/gosh { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; From 7a49b33c3492245df1cf33ebb6237f7f50820a8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 13:50:36 +0200 Subject: [PATCH 070/664] python3Packages.geojson-client: 0.5 -> 0.6 --- pkgs/development/python-modules/geojson-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix index 7e683e204834..8c4eb2cdf1bf 100644 --- a/pkgs/development/python-modules/geojson-client/default.nix +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "geojson-client"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; rev = "v${version}"; - sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv"; + sha256 = "sha256-8eSLimCgFRn3cHTz5TE9fAUAbwFO72b23C0lg6fVOLQ="; }; propagatedBuildInputs = [ From 14bf8f109be960a7d7b1c6187b20b56c7edfe9d3 Mon Sep 17 00:00:00 2001 From: Matt Christ Date: Sun, 23 May 2021 08:03:19 -0500 Subject: [PATCH 071/664] fix brscan5 config generation before this, the config utility was unable to locate the models folder update tests to use a compatible model --- .../sane_extra_backends/brscan5_etc_files.nix | 6 +++--- nixos/tests/brscan5.nix | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix index 7ea384dcbce7..432f0316a4fa 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix @@ -21,8 +21,8 @@ nix-build -E 'let pkgs = import ./. {}; brscan5-etc-files = pkgs.callPackage (import ./nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix) {}; in brscan5-etc-files.override { netDevices = [ - {name="a"; model="MFC-7860DW"; nodename="BRW0080927AFBCE";} - {name="b"; model="MFC-7860DW"; ip="192.168.1.2";} + {name="a"; model="ADS-1200"; nodename="BRW0080927AFBCE";} + {name="b"; model="ADS-1200"; ip="192.168.1.2";} ]; }' ~~~ @@ -58,7 +58,7 @@ stdenv.mkDerivation { cp -rp "./brscan5.ini" "$TARGET_DIR" cp -rp "./brsanenetdevice.cfg" "$TARGET_DIR" - export NIX_REDIRECTS="/etc/opt/brother/scanner/brscan5//brsanenetdevice.cfg=$TARGET_DIR/brsanenetdevice.cfg" + export NIX_REDIRECTS="/etc/opt/brother/scanner/brscan5/=$TARGET_DIR/" printf '${addAllNetDev netDevices}\n' diff --git a/nixos/tests/brscan5.nix b/nixos/tests/brscan5.nix index af5333126b55..715191b383cb 100644 --- a/nixos/tests/brscan5.nix +++ b/nixos/tests/brscan5.nix @@ -15,8 +15,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { brscan5 = { enable = true; netDevices = { - "a" = { model="MFC-7860DW"; nodename="BRW0080927AFBCE"; }; - "b" = { model="MFC-7860DW"; ip="192.168.1.2"; }; + "a" = { model="ADS-1200"; nodename="BRW0080927AFBCE"; }; + "b" = { model="ADS-1200"; ip="192.168.1.2"; }; }; }; }; @@ -24,11 +24,19 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = '' # sane loads libsane-brother5.so.1 successfully, and scanimage doesn't die - assert 'libsane-brother5.so.1", O_RDONLY|O_CLOEXEC) = 10' in machine.succeed('strace scanimage -L 2>&1') + strace = machine.succeed('strace scanimage -L 2>&1').split("\n") + regexp = 'openat\(.*libsane-brother5.so.1", O_RDONLY|O_CLOEXEC\) = \d\d*$' + assert len([x for x in strace if re.match(regexp,x)]) > 0 # module creates a config cfg = machine.succeed('cat /etc/opt/brother/scanner/brscan5/brsanenetdevice.cfg') - assert 'DEVICE=a , "MFC-7860DW" , Unknown , NODENAME=BRW0080927AFBCE' in cfg - assert 'DEVICE=b , "MFC-7860DW" , Unknown , IP-ADDRESS=192.168.1.2' in cfg + assert 'DEVICE=a , "ADS-1200" , 0x4f9:0x459 , NODENAME=BRW0080927AFBCE' in cfg + assert 'DEVICE=b , "ADS-1200" , 0x4f9:0x459 , IP-ADDRESS=192.168.1.2' in cfg + + # scanimage lists the two network scanners + scanimage = machine.succeed("scanimage -L") + print(scanimage) + assert """device `brother5:net1;dev0' is a Brother b ADS-1200""" in scanimage + assert """device `brother5:net1;dev1' is a Brother a ADS-1200""" in scanimage ''; }) From 2367c4a1e0ebaec16df3742625ce3fc9402c4ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 May 2021 15:15:54 +0200 Subject: [PATCH 072/664] python3Packages.pytest-sanic: 1.7.0 -> 1.7.1 https://github.com/yunstanford/pytest-sanic/releases/tag/v1.7.1 --- .../python-modules/pytest-sanic/default.nix | 24 ++++++++++++------- pkgs/top-level/python-packages.nix | 5 ---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index ae1c56f95b75..81e189c22c57 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -2,7 +2,6 @@ , aiohttp , async_generator , buildPythonPackage -, doCheck ? true , fetchFromGitHub , httpx , pytest @@ -13,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "yunstanford"; repo = pname; rev = "v${version}"; - sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi"; + sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw="; }; buildInputs = [ pytest ]; @@ -37,7 +36,20 @@ buildPythonPackage rec { pytestCheckHook ]; - inherit doCheck; + disabledTests = [ + # https://github.com/yunstanford/pytest-sanic/issues/51 + "test_fixture_sanic_client_get" + "test_fixture_sanic_client_post" + "test_fixture_sanic_client_put" + "test_fixture_sanic_client_delete" + "test_fixture_sanic_client_patch" + "test_fixture_sanic_client_options" + "test_fixture_sanic_client_head" + "test_fixture_sanic_client_close" + "test_fixture_sanic_client_passing_headers" + "test_fixture_sanic_client_context_manager" + "test_fixture_test_client_context_manager" + ]; pythonImportsCheck = [ "pytest_sanic" ]; @@ -46,9 +58,5 @@ buildPythonPackage rec { homepage = "https://github.com/yunstanford/pytest-sanic/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; - # pytest-sanic is incompatible with Sanic 21.3, see - # https://github.com/sanic-org/sanic/issues/2095 and - # https://github.com/yunstanford/pytest-sanic/issues/50. - broken = lib.versionAtLeast sanic.version "21.3.0"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2661bef8ed57..7824fbb7f193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7392,11 +7392,6 @@ in { samsungtvws = callPackage ../development/python-modules/samsungtvws { }; sanic = callPackage ../development/python-modules/sanic { - # pytest-sanic is doing ok for the sole purpose of testing Sanic. - pytest-sanic = self.pytest-sanic.overridePythonAttrs (oldAttrs: { - doCheck = false; - meta.broken = false; - }); # Don't pass any `sanic` to avoid dependency loops. `sanic-testing` # has special logic to disable tests when this is the case. sanic-testing = self.sanic-testing.override { sanic = null; }; From 69ccec4c725d014f573a451b5cae44f8950caca5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 23 May 2021 10:27:54 -0300 Subject: [PATCH 073/664] firebird: 4.0.0rc1 -> 4.0.0 --- pkgs/servers/firebird/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index fa3a8d022983..074481f35187 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -9,7 +9,7 @@ let base = { changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; license = [ "IDPL" "Interbase-1.0" ]; platforms = platforms.linux; - maintainers = with maintainers; [ marcweber ]; + maintainers = with maintainers; [ marcweber superherointj ]; }; nativeBuildInputs = [ autoreconfHook ]; @@ -29,7 +29,7 @@ let base = { runHook postInstall ''; -}; in { +}; in rec { firebird_2_5 = stdenv.mkDerivation (base // rec { version = "2.5.9"; @@ -69,16 +69,17 @@ let base = { }); firebird_4 = stdenv.mkDerivation (base // rec { - version = "4.0.0-rc1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; - rev = "T4_0_0_RC1"; - sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4="; + rev = "v${version}"; + sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; }); + firebird = firebird_4; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb4e447884..9ba5b09adc23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18980,8 +18980,7 @@ in fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5; - firebird = firebird_3; + inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; freeradius = callPackage ../servers/freeradius { }; From 82f90f892f8ac3e26608fd2ce4f810dc30dd470f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 May 2021 15:46:06 +0200 Subject: [PATCH 074/664] openvpn: 2.5.0 -> 2.5.2 Fixes CVE-2020-15078. https://community.openvpn.net/openvpn/wiki/CVE-2020-15078 --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 6b98df215023..97af7b9c0e9e 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -83,7 +83,7 @@ in }; openvpn = generic { - version = "2.5.0"; - sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70="; + version = "2.5.2"; + sha256 = "sha256-sSdDg2kB82Xvr4KrJJOWfhshwh60POmo2hACoXycHcg="; }; } From e2df9554b03f31616c2e7848716386db4b9277db Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 May 2021 15:52:46 +0200 Subject: [PATCH 075/664] openvpn_24: 2.4.9 -> 2.4.11 Fixes CVE-2020-15078. https://community.openvpn.net/openvpn/wiki/CVE-2020-15078 --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 97af7b9c0e9e..46375b60fe46 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -78,8 +78,8 @@ let in { openvpn_24 = generic { - version = "2.4.9"; - sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; + version = "2.4.11"; + sha256 = "06s4m0xvixjhd3azrzbsf4j86kah4xwr2jp6cmcpc7db33rfyyg5"; }; openvpn = generic { From 97d9e7849be92601eccbdb8e8820a89ee0802c80 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 23 May 2021 10:53:00 -0300 Subject: [PATCH 076/664] nixos/firebird: updated firebird package --- nixos/modules/services/databases/firebird.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index ed47f647edd3..0815487d4a1f 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -43,17 +43,15 @@ in enable = mkEnableOption "the Firebird super server"; package = mkOption { - default = pkgs.firebirdSuper; - defaultText = "pkgs.firebirdSuper"; + default = pkgs.firebird; + defaultText = "pkgs.firebird"; type = types.package; - /* - Example: package = pkgs.firebirdSuper.override { icu = - pkgs.icu; }; which is not recommended for compatibility - reasons. See comments at the firebirdSuper derivation - */ - + example = '' + package = pkgs.firebird_3; + ''; description = '' - Which firebird derivation to use. + Which Firebird package to be installed: pkgs.firebird_3 + For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; ''; }; @@ -74,7 +72,7 @@ in }; baseDir = mkOption { - default = "/var/db/firebird"; # ubuntu is using /var/lib/firebird/2.1/data/.. ? + default = "/var/lib/firebird"; type = types.str; description = '' Location containing data/ and system/ directories. @@ -111,6 +109,14 @@ in cp ${firebird}/security2.fdb "${systemDir}" fi + if ! test -e "${systemDir}/security3.fdb"; then + cp ${firebird}/security3.fdb "${systemDir}" + fi + + if ! test -e "${systemDir}/security4.fdb"; then + cp ${firebird}/security4.fdb "${systemDir}" + fi + chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird ''; From 9b743d9bbb9483f044b6947c456d26e3e1e4baad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 23 May 2021 11:38:12 -0300 Subject: [PATCH 077/664] numix-solarized-gtk-theme: 20200910 -> 20210522 --- pkgs/data/themes/numix-solarized/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0d965e8030a6..532275e5f749 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "20200910"; pname = "numix-solarized-gtk-theme"; + version = "20210522"; src = fetchFromGitHub { owner = "Ferdi265"; - repo = "numix-solarized-gtk-theme"; + repo = pname; rev = version; - sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9"; + sha256 = "0hin73fmfir4w1z0j87k5hahhf2blhcq4r7gf89gz4slnl18cvjh"; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings + runHook preInstall for theme in *.colors; do make THEME="''${theme/.colors/}" install done + runHook postInstall ''; meta = with lib; { @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme"; downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.offline ]; }; From d37134ba0536cb16c3b208cf40ef07c8062fe717 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 18:31:16 +0200 Subject: [PATCH 078/664] sammler: init at -20210523-259b9fc --- pkgs/tools/security/sammler/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/security/sammler/default.nix diff --git a/pkgs/tools/security/sammler/default.nix b/pkgs/tools/security/sammler/default.nix new file mode 100644 index 000000000000..f5bfab987a17 --- /dev/null +++ b/pkgs/tools/security/sammler/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sammler"; + version = "20210523-${lib.strings.substring 0 7 rev}"; + rev = "259b9fc6155f40758e5fa480683467c35df746e7"; + + src = fetchFromGitHub { + owner = "redcode-labs"; + repo = "Sammler"; + inherit rev; + sha256 = "1gsv83sbqc9prkigbjvkhh547w12l3ynbajpnbqyf8sz4bd1nj5c"; + }; + + vendorSha256 = "1510rhdac8v21kpp00q8yy6b13hgac8547d7f5q7nwrgnihg03w4"; + + subPackages = [ "." ]; + + runVend = true; + + meta = with lib; { + description = "Tool to extract useful data from documents"; + homepage = "https://github.com/redcode-labs/Sammler"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb4e447884..ade06f865afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8352,6 +8352,8 @@ in saml2aws = callPackage ../tools/security/saml2aws {}; + sammler = callPackage ../tools/security/sammler {}; + samplicator = callPackage ../tools/networking/samplicator { }; sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; From b36764fcbe644bf1aedd3857db0e940d2a8503e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 May 2021 18:24:10 +0200 Subject: [PATCH 079/664] python3Packages.commentjson: init at 0.9.0 --- .../python-modules/commentjson/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/commentjson/default.nix diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix new file mode 100644 index 000000000000..2aefb51d481e --- /dev/null +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }: + +buildPythonPackage rec { + pname = "commentjson"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "vaidik"; + repo = "commentjson"; + rev = "v${version}"; + sha256 = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser" + + # NixOS is missing test.test_json module + rm -r commentjson/tests/test_json + ''; + + propagatedBuildInputs = [ lark-parser six ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "commentjson" ]; + + meta = with lib; { + description = "Add JavaScript or Python style comments in JSON"; + homepage = "https://github.com/vaidik/commentjson/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38ab293c872d..47044eb97640 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1519,6 +1519,8 @@ in { commandparse = callPackage ../development/python-modules/commandparse { }; + commentjson = callPackage ../development/python-modules/commentjson { }; + commoncode = callPackage ../development/python-modules/commoncode { }; CommonMark = callPackage ../development/python-modules/commonmark { }; From 23414c5026bd1a2c612786053aa7c5a21b26378f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:01:26 +0200 Subject: [PATCH 080/664] python3Packages.resolvelib: init at 0.7.0 --- .../python-modules/resolvelib/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/resolvelib/default.nix diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix new file mode 100644 index 000000000000..db3ecbcc86e6 --- /dev/null +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, commentjson +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "resolvelib"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "sarugaku"; + repo = "resolvelib"; + rev = version; + sha256 = "0r7cxwrfvpqz4kd7pdf8fsynzlmi6c754jd5hzd6vssc1zlyvvhx"; + }; + + checkInputs = [ + commentjson + pytestCheckHook + ]; + + meta = with lib; { + description = "Resolve abstract dependencies into concrete ones"; + homepage = "https://github.com/sarugaku/resolvelib"; + license = licenses.isc; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47044eb97640..6e02706d2480 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7206,6 +7206,8 @@ in { resampy = callPackage ../development/python-modules/resampy { }; + resolvelib = callPackage ../development/python-modules/resolvelib { }; + responses = callPackage ../development/python-modules/responses { }; respx = callPackage ../development/python-modules/respx { }; From 8e390750e320741c54aeb41aa239ae5ac108687f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:01:41 +0200 Subject: [PATCH 081/664] python3Packages.ansible-core: init at 2.11.0 --- .../python-modules/ansible/core.nix | 83 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/ansible/core.nix diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix new file mode 100644 index 000000000000..690d5a1725d4 --- /dev/null +++ b/pkgs/development/python-modules/ansible/core.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchPypi +, installShellFiles +, ansible-collections +, cryptography +, jinja2 +, junit-xml +, lxml +, ncclient +, packaging +, paramiko +, pexpect +, psutil +, pycrypto +, pyyaml +, requests +, resolvelib +, scp +, windowsSupport ? false, pywinrm +, xmltodict +}: + +buildPythonPackage rec { + pname = "ansible-core"; + version = "2.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l"; + }; + + # ansible_connection is already wrapped, so don't pass it through + # the python interpreter again, as it would break execution of + # connection plugins. + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + + substituteInPlace requirements.txt \ + --replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + # depend on ansible-collections instead of the other way around + ansible-collections + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + resolvelib + # optional dependencies + junit-xml + lxml + ncclient + paramiko + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optional windowsSupport pywinrm; + + postInstall = '' + installManPage docs/man/man1/*.1 + ''; + + # internal import errors, missing dependencies + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "https://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e02706d2480..ca9cd14d36de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -417,6 +417,8 @@ in { ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { }; + ansible-core = callPackage ../development/python-modules/ansible/core.nix { }; + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; ansible-lint = callPackage ../development/python-modules/ansible-lint { }; From 400d5d938c51036c017c33190839ae9866aa4802 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:03:13 +0200 Subject: [PATCH 082/664] ansible: 2.10.9 -> 2.11.0 --- pkgs/tools/admin/ansible/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 63ef76469599..4c66bda06f73 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,9 @@ { python3Packages, fetchurl, fetchFromGitHub }: rec { - ansible = ansible_2_10; + ansible = ansible_2_11; + + ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core; ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fdd3f31b8c4..9fe272c47982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12586,7 +12586,8 @@ in ansible ansible_2_8 ansible_2_9 - ansible_2_10; + ansible_2_10 + ansible_2_11; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; From fa71a242151cd6f95e64c34a16e8a4cbeb6c0c7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 23:15:12 +0200 Subject: [PATCH 083/664] python3Packages.ttp: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/ttp/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 1ebad5322005..4d43170cbf9a 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "08pglwmnhdrsj9rgys1zclhq1h597izb0jq7waahpdabfg25v2sw"; + sha256 = "0gv1hykbxx3wy195xynqi21rxzlh4701qw01s6pmf3x54w63fz42"; }; propagatedBuildInputs = [ @@ -76,6 +76,9 @@ buildPythonPackage rec { "test_include_attribute_with_yaml_loader" # TypeError: string indices must be integers "test_lookup_include_yaml" + # Missing .xslx files *shrug* + "test_excel_formatter_update" + "test_excel_formatter_update_using_result_kwargs" # missing package n2g "test_n2g_formatter" ]; From 0793950a1bd6235049d63a09cb1ac0cfd9a45885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 May 2021 20:36:46 +0200 Subject: [PATCH 084/664] rspamd: enable pie --- pkgs/servers/mail/rspamd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 7a2eb9fd2cdf..8e95e622b830 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs="; }; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan From 56ca2e6493e96c1e018b587ae21d92a245fbcf01 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 03:25:12 +0200 Subject: [PATCH 085/664] molot-lite: use fork with bugfix and extra features The original only had the mono version working; the stereo one just passed the sound. https://github.com/magnetophon/molot-lite/commit/06c055a94709f06ebc2537eb45bdfd45cd9a5127 --- .../applications/audio/molot-lite/default.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index d30b6bcad2fb..c44f597ef30c 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,35 +1,31 @@ -{ lib, stdenv, fetchurl, unzip, lv2 }: +{ lib, stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { -stdenv.mkDerivation { pname = "molot-lite"; - version = "unstable-2014-04-23"; + version = "1.0.0"; - src = fetchurl { - # fetchzip does not accept urls that do not end with .zip. - url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw"; - sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + src = fetchFromGitHub { + owner = "magnetophon"; + repo = pname; + rev = version; + sha256 = "0xbvicfk1rgp01nlg6hlym9bnygry0nrbv88mv7w6hnacvl63ba4"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ lv2 ]; - unpackPhase = '' - unzip $src - ''; - - buildPhase = '' - make -C Molot_Mono_Lite - make -C Molot_Stereo_Lite - ''; + makeFlags = [ "INSTALL_DIR=$out/lib/lv2" ]; installPhase = '' + runHook preInstall make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite + runHook postInstall ''; meta = with lib; { description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; - homepage = "https://sourceforge.net/projects/molot/"; + homepage = "https://github.com/magnetophon/molot-lite"; license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; From 75475505259189afe82c6fd41740d1f9d6122a4b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 23 May 2021 21:43:09 +0200 Subject: [PATCH 086/664] quadrafuzz: init at 0.1.1 --- .../applications/audio/quadrafuzz/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/audio/quadrafuzz/default.nix diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/applications/audio/quadrafuzz/default.nix new file mode 100644 index 000000000000..1432c0b81011 --- /dev/null +++ b/pkgs/applications/audio/quadrafuzz/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub, boost, cairo, lv2, pkg-config }: + +stdenv.mkDerivation rec { + pname = "quadrafuzz"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = pname; + rev = "v${version}"; + sha256 = "1kjsf7il9krihwlrq08gk2xvil4b4q5zd87nnm103hby2w7ws7z1"; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost cairo lv2 + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/lv2 + cp -r bin/quadrafuzz.lv2/ $out/lib/lv2 + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/jpcima/quadrafuzz"; + description = "Multi-band fuzz distortion plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a6953067e0..fac07e4597fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8033,6 +8033,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quadrafuzz = callPackage ../applications/audio/quadrafuzz { }; + quickfix = callPackage ../development/libraries/quickfix { }; quickjs = callPackage ../development/interpreters/quickjs { }; From b5a50d148696655ed50cd39ccbe591c3e19b68d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Topuzovi=C4=87?= Date: Sun, 23 May 2021 21:22:29 +0100 Subject: [PATCH 087/664] augustus: 2.0.1 -> 3.0.1 --- pkgs/games/augustus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index b7c2a0b79792..4693e290da6a 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "augustus"; - version = "2.0.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; rev = "v${version}"; - sha256 = "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"; + sha256 = "03pmnwq6bahq854vh1vmv1vabb8cs0alca8f36id8dlz8bw95nik"; }; nativeBuildInputs = [ cmake ]; From 41e46599ea2b6b947e14ccb3f1d38326bced3585 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sun, 23 May 2021 14:45:47 -0700 Subject: [PATCH 088/664] matrix-appservice-irc: set pname --- pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 808e81370bbd..ab92c29ee3dc 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -10,6 +10,8 @@ let }; in ourNodePackages."${packageName}".override { + pname = "matrix-appservice-irc"; + nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; postInstall = '' From a811e7385c6a4dd8eeb871f994939ff99260fa75 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sun, 23 May 2021 14:46:03 -0700 Subject: [PATCH 089/664] matrix-appservice-slack: set pname --- pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 9d21065dc02a..596739a45d73 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -13,6 +13,8 @@ let }; in nodePackages.package.override { + pname = "matrix-appservice-slack"; + inherit src; nativeBuildInputs = [ pkgs.makeWrapper ]; From 166aabe0c7ccd972ea3be092ab900d3a637216ef Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sun, 23 May 2021 14:46:18 -0700 Subject: [PATCH 090/664] mx-puppet-discord: set pname --- pkgs/servers/mx-puppet-discord/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index b3b72c2c5f2b..d2606148768d 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -16,7 +16,10 @@ let }; in myNodePackages.package.override { + pname = "mx-puppet-discord"; + inherit src; + nativeBuildInputs = [ nodePackages.node-pre-gyp pkg-config ]; buildInputs = [ libjpeg pixman cairo pango ]; From b817777ed7f5c5ee7e8362e223bfe6409abfb30e Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 17 May 2021 22:13:58 +0300 Subject: [PATCH 091/664] woeusb: 3.3.1 -> 5.1.0 --- pkgs/tools/misc/woeusb/default.nix | 43 ++++++++----------- .../tools/misc/woeusb/remove-workaround.patch | 15 ------- 2 files changed, 18 insertions(+), 40 deletions(-) delete mode 100644 pkgs/tools/misc/woeusb/remove-workaround.patch diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index a728afc388a5..ade752e09f66 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,45 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wget -, wxGTK30 }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wimlib, wget }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "5.1.0"; pname = "woeusb"; src = fetchFromGitHub { - owner = "slacka"; + owner = "WoeUSB"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "1hbr88sr943s4yqdvbny543jvgvnsa622wq4cmwd23hjsfcrvyiv"; + sha256 = "1qakk7lnj71m061rn72nabk4c37vw0vkx2a28xgxas8v8cwvkkam"; }; - patches = [ ./remove-workaround.patch ]; - - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ wxGTK30 ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postPatch = '' # Emulate version smudge filter (see .gitattributes, .gitconfig). - for file in configure.ac debian/changelog src/woeusb src/woeusb.1 src/woeusbgui.1; do + for file in sbin/woeusb share/man/man1/woeusb.1; do substituteInPlace "$file" \ --replace '@@WOEUSB_VERSION@@' '${version}' done - - substituteInPlace src/MainPanel.cpp \ - --replace "'woeusb " "'$out/bin/woeusb " ''; - postInstall = '' - # don't write data into / - substituteInPlace "$out/bin/woeusb" \ - --replace /media/ /run/woeusb/ + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv sbin/woeusb $out/bin + installManPage share/man/man1/woeusb.1 - # woeusbgui launches woeusb with pkexec, which sets - # PATH=/usr/sbin:/usr/bin:/sbin:/bin:/root/bin. Perhaps pkexec - # should be patched with a less useless default PATH, but for now - # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' + --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted p7zip util-linux wget wimlib ]}' + + runHook postInstall ''; doInstallCheck = true; @@ -52,8 +45,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create bootable USB disks from Windows ISO images"; - homepage = "https://github.com/slacka/WoeUSB"; - license = licenses.gpl3; + homepage = "https://github.com/WoeUSB/WoeUSB"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/woeusb/remove-workaround.patch b/pkgs/tools/misc/woeusb/remove-workaround.patch deleted file mode 100644 index 3550002dfedd..000000000000 --- a/pkgs/tools/misc/woeusb/remove-workaround.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/slacka/WoeUSB/issues/267 - -diff --git a/src/woeusb b/src/woeusb -index 8cb292c..c017dbf 100755 ---- a/src/woeusb -+++ b/src/woeusb -@@ -1661,6 +1661,8 @@ workaround_support_windows_7_uefi_boot(){ - ## - System lagging while copying data · Issue #113 · slacka/WoeUSB - ## - The pernicious USB-stick stall problem [LWN.net] - workaround_linux_make_writeback_buffering_not_suck(){ -+ return 0 -+ - util_check_function_parameters_quantity 1 "${#}" - local -r mode="${1}" - From caaee8a55e4ce0a3e4324c6bb43a32794e212a8b Mon Sep 17 00:00:00 2001 From: embr Date: Wed, 28 Apr 2021 22:49:55 +0200 Subject: [PATCH 092/664] bozohttpd: init --- .../bozohttpd/0001-include-stdint.h.patch | 12 +++ .../bozohttpd/0002-dont-use-host-BUFSIZ.patch | 88 ++++++++++++++++++ pkgs/servers/http/bozohttpd/default.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 193 insertions(+) create mode 100644 pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch create mode 100644 pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch create mode 100644 pkgs/servers/http/bozohttpd/default.nix diff --git a/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch b/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch new file mode 100644 index 000000000000..1d0d716290dd --- /dev/null +++ b/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch @@ -0,0 +1,12 @@ +diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c +index 67083b2c6782..273cb5f5a42b 100644 +--- a/libexec/httpd/bozohttpd.c ++++ b/libexec/httpd/bozohttpd.c +@@ -138,6 +138,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch b/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch new file mode 100644 index 000000000000..9a01a4adce7f --- /dev/null +++ b/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch @@ -0,0 +1,88 @@ +diff --git a/libexec/httpd/auth-bozo.c b/libexec/httpd/auth-bozo.c +index a2f2ee4304c1..c9eefe3313dd 100644 +--- a/libexec/httpd/auth-bozo.c ++++ b/libexec/httpd/auth-bozo.c +@@ -54,7 +54,7 @@ bozo_auth_check(bozo_httpreq_t *request, const char *file) + bozohttpd_t *httpd = request->hr_httpd; + struct stat sb; + char dir[MAXPATHLEN], authfile[MAXPATHLEN], *basename; +- char user[BUFSIZ], *pass; ++ char user[BOZO_MINBUFSIZE], *pass; + FILE *fp; + int len; + +@@ -144,7 +144,7 @@ bozo_auth_check_headers(bozo_httpreq_t *request, char *val, char *str, + + if (strcasecmp(val, "authorization") == 0 && + strncasecmp(str, "Basic ", 6) == 0) { +- char authbuf[BUFSIZ]; ++ char authbuf[BOZO_MINBUFSIZE]; + char *pass = NULL; + ssize_t alen; + +diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c +index 273cb5f5a42b..f619567ba822 100644 +--- a/libexec/httpd/bozohttpd.c ++++ b/libexec/httpd/bozohttpd.c +@@ -2275,7 +2275,7 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, + } + #endif /* !NO_USER_SUPPORT */ + +- size = snprintf(httpd->errorbuf, BUFSIZ, ++ size = snprintf(httpd->errorbuf, BOZO_MINBUFSIZE, + "%s\n" + "

%s

\n" + "%s%s: 
%s
\n" +@@ -2285,10 +2285,10 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, + user ? user : "", file, + reason, hostname, portbuf, hostname, portbuf); + free(user); +- if (size >= (int)BUFSIZ) { ++ if (size >= (int)BOZO_MINBUFSIZE) { + bozowarn(httpd, + "bozo_http_error buffer too small, truncated"); +- size = (int)BUFSIZ; ++ size = (int)BOZO_MINBUFSIZE; + } + + if (file_alloc) +@@ -2515,7 +2515,7 @@ bozo_init_httpd(bozohttpd_t *httpd) + httpd->mmapsz = BOZO_MMAPSZ; + + /* error buffer for bozo_http_error() */ +- if ((httpd->errorbuf = malloc(BUFSIZ)) == NULL) { ++ if ((httpd->errorbuf = malloc(BOZO_MINBUFSIZE)) == NULL) { + fprintf(stderr, + "bozohttpd: memory_allocation failure\n"); + return 0; +diff --git a/libexec/httpd/bozohttpd.h b/libexec/httpd/bozohttpd.h +index c83bd112d9d7..7b19494cf5ad 100644 +--- a/libexec/httpd/bozohttpd.h ++++ b/libexec/httpd/bozohttpd.h +@@ -227,6 +227,8 @@ typedef struct bozoprefs_t { + /* only allow this many total headers bytes */ + #define BOZO_HEADERS_MAX_SIZE (16 * 1024) + ++#define BOZO_MINBUFSIZE (4 * 1024) ++ + /* debug flags */ + #define DEBUG_NORMAL 1 + #define DEBUG_FAT 2 +diff --git a/libexec/httpd/testsuite/t10.out b/libexec/httpd/testsuite/t10.out +index cf410110627c..b3ab88f94fb9 100644 +--- a/libexec/httpd/testsuite/t10.out ++++ b/libexec/httpd/testsuite/t10.out +@@ -1,8 +1,8 @@ + HTTP/1.0 404 Not Found + Content-Type: text/html +-Content-Length: 1024 +-Server: bozohttpd/20140708 ++Content-Length: 4096 ++Server: bozohttpd/20210403 + + 404 Not Found +

404 Not Found

+-/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +\ No newline at end of file ++/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +\ No newline at end of file diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix new file mode 100644 index 000000000000..12aa438cf122 --- /dev/null +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchurl +, bmake +, groff +, inetutils +, wget +, openssl +, userSupport ? true +, cgiSupport ? true +, dirIndexSupport ? true +, dynamicContentSupport ? true +, sslSupport ? true +, luaSupport ? true +, lua +, htpasswdSupport ? true +}: + +let inherit (lib) optional optionals; +in +stdenv.mkDerivation rec { + pname = "bozohttpd"; + version = "20210227"; + + # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: + # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo + src = fetchurl { + url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2"; + sha512 = "b838498626ffb7f7e84f31611e0e99aaa3af64bd9376e1a13ec16313c182eebfd9ea2c2d03904497239af723bf34a3d2202dac1f2d3e55f9fd076f6d45ccfa33"; + }; + + # backport two unreleased commits to fix builds on non-netbsd platforms. + patches = [ + # add missing `#include ` + # https://freshbsd.org/netbsd/src/commit/qMGNoXfgeieZBVRC + ./0001-include-stdint.h.patch + + # BUFSIZ is not guaranteed to be large enough + # https://freshbsd.org/netbsd/src/commit/A4ueIHIp3JgjNVRC + ./0002-dont-use-host-BUFSIZ.patch + ]; + patchFlags = [ "-p3" ]; + + buildInputs = [ openssl ] ++ optional (luaSupport) lua; + nativeBuildInputs = [ bmake groff ]; + + COPTS = + [ + "-DNO_BLOCKLIST_SUPPORT" # unpackaged dependency: https://man.netbsd.org/blocklist.3 + ] + ++ optional (!userSupport) "-DNO_USER_SUPPORT" + ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" + ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT" + ++ optional (!luaSupport) "-DNO_LUA_SUPPORT" + ++ optional (!sslSupport) "-DNO_SSL_SUPPORT" + ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" + ++ optional (htpasswdSupport) "-DDO_HTPASSWD"; + + _LDADD = [ "-lcrypt" "-lm" ] + ++ optional (luaSupport) "-llua" + ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; + makeFlags = [ "LDADD=$(_LDADD)" ]; + + doCheck = true; + checkInputs = [ inetutils wget ]; + checkFlags = [ "-dx" "VERBOSE=yes" ] ++ optional (!cgiSupport) "CGITESTS="; + + installPhase = '' + install -m755 -Dt $out/bin bozohttpd + install -m644 -Dt $out/share/man/man8 bozohttpd.8 + ''; + + meta = with lib; { + description = "Bozotic HTTP server; small and secure"; + longDescription = '' + bozohttpd is a small and secure HTTP version 1.1 server. Its main + feature is the lack of features, reducing the code size and improving + verifiability. + + It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, + virtual hosting support, as well as multiple IP-based servers on a + single machine. It is capable of servicing pages via the IPv6 protocol. + It has SSL support. It has no configuration file by design. + ''; + homepage = "http://www.eterna.com.au/bozohttpd/"; + changelog = "http://www.eterna.com.au/bozohttpd/CHANGES"; + license = licenses.bsd2; + maintainers = [ maintainers.embr ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a6953067e0..f6444216f400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1953,6 +1953,8 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; + bozohttpd = callPackage ../servers/http/bozohttpd { }; + bpytop = callPackage ../tools/system/bpytop { }; brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); From 1274ba1572f74a5c97b3ead0e88d3d30f0a5be09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 01:11:10 +0200 Subject: [PATCH 093/664] python3packages.pysmt: 0.9.0 -> 0.9.1.dev132 --- .../python-modules/pysmt/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix index ce5b6b8673a0..4adb96bf2341 100644 --- a/pkgs/development/python-modules/pysmt/default.nix +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -1,28 +1,21 @@ { lib , buildPythonPackage -, fetchFromGitHub -, nose -, pytestCheckHook -, six +, fetchPypi }: buildPythonPackage rec { pname = "pysmt"; - version = "0.9.0"; + version = "0.9.1.dev132"; + format = "wheel"; # dev versions are only distributed as wheels - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + src = fetchPypi { + pname = "PySMT"; + inherit format version; + sha256 = "01iqs7yzms3alf1rdv0gnsnmfp7g8plkjcdqbari258zp4llf6x7"; }; - propagatedBuildInputs = [ six ]; - - checkInputs = [ - nose - pytestCheckHook - ]; + # No tests present, only GitHub release which is 0.9.0 + doCheck = false; pythonImportsCheck = [ "pysmt" ]; From 4c8e68bc07cfebe1f96b86ab25a2cdd55704779d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 01:12:09 +0200 Subject: [PATCH 094/664] python3Packages.angrop: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/angrop/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d1c80772bc3b..b9774b929549 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -4,25 +4,34 @@ , fetchFromGitHub , progressbar , pythonOlder +, tqdm }: buildPythonPackage rec { pname = "angrop"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY="; + sha256 = "sha256-UWqHNgJ8vUbLK3n9tvwOgHyOyTXsqRJKaAPWQfqi3lo="; }; propagatedBuildInputs = [ angr progressbar + tqdm ]; + postPatch = '' + # https://github.com/angr/angrop/issues/35 + substituteInPlace setup.py \ + --replace "packages=['angrop']," "packages=find_packages()," \ + --replace "from distutils.core import setup" "from setuptools import find_packages, setup" + ''; + # Tests have additional requirements, e.g., angr binaries # cle is executing the tests with the angr binaries already and is a requirement of angr doCheck = false; From 35a1e99d7a41ab5da0afba91f69b49495f7c85f8 Mon Sep 17 00:00:00 2001 From: Dusk Banks Date: Sun, 23 May 2021 16:08:46 -0700 Subject: [PATCH 095/664] betterdiscordctl: 1.7.1 -> 2.0.0 --- pkgs/tools/misc/betterdiscordctl/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix index e839d9ef09ce..f75f3a6f8223 100644 --- a/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -2,22 +2,28 @@ stdenv.mkDerivation rec { pname = "betterdiscordctl"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "12c3phcfwl4p2jfh22ihm57vxw4nq5kwqirb7y4gzc91swfh5yj1"; + sha256 = "1wys3wbcz5hq8275ia2887kr5fzz4b3gkcp56667j9k0p3k3zfac"; }; - preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; + postPatch = '' + substituteInPlace betterdiscordctl \ + --replace "DISABLE_SELF_UPGRADE=" "DISABLE_SELF_UPGRADE=yes" + ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/doc/betterdiscordctl + runHook preInstall + + mkdir -p "$out/bin" "$out/share/doc/betterdiscordctl" install -Dm744 betterdiscordctl $out/bin/betterdiscordctl install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md + + runHook postInstall ''; meta = with lib; { From 0fdad731cb788db1b191e278954c6418d0f1bd28 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 23 May 2021 19:22:43 -0700 Subject: [PATCH 096/664] xh: add shell completion, xhs symlink --- pkgs/tools/networking/xh/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index a878a1bd233b..0a62fee4bd74 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security -, libiconv }: +, libiconv, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "xh"; @@ -9,19 +9,27 @@ rustPlatform.buildRustPackage rec { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-eOP9sc1qmQuc3HecNNZDMarVkXmEfGZkan0H9598LC0="; + sha256 = "0b9cgjgzf1vxd9j6cz44g68xbaii8gb3973pvjf0p6barnqzvqvq"; }; - cargoSha256 = "sha256-JXywHuZPQVhuWBVUNi9k8TwgE8KCNDtucjxxDi6unVM="; + cargoSha256 = "0lwxmqp0ww9wf9p3nd42q89j0g7ichpkcm0mb1p5hhagwqgb0z15"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]; # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; - checkFlagsArray = [ "--skip=basic_options" ]; + postInstall = '' + installShellCompletion --cmd xh \ + --bash completions/xh.bash \ + --fish completions/xh.fish \ + --zsh completions/_xh + + # https://github.com/ducaale/xh#xh-and-xhs + ln -s $out/bin/xh $out/bin/xhs + ''; # Nix build happens in sandbox without internet connectivity # disable tests as some of them require internet due to nature of application @@ -29,10 +37,11 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; postInstallCheck = '' $out/bin/xh --help > /dev/null + $out/bin/xhs --help > /dev/null ''; meta = with lib; { - description = "Yet another HTTPie clone in Rust"; + description = "Friendly and fast tool for sending HTTP requests"; homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; From 1bfabf6fbaa23c785e1e6cb4c483028cf008b6e3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 23 May 2021 16:12:04 +0800 Subject: [PATCH 097/664] tellico: 3.4 -> 3.4.1 --- pkgs/applications/misc/tellico/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 65cd003253dc..10d8dc026141 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,15 +24,15 @@ mkDerivation rec { pname = "tellico"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { - # version 3.3.0 just uses 3.3 in its name + # version 3.3.0 just uses 3.3 in its file name urls = [ "https://tellico-project.org/files/tellico-${version}.tar.xz" "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz" ]; - sha256 = "sha256-YXMJrAkfehe3ox4WZ19igyFbXwtjO5wxN3bmgP01jPs="; + sha256 = "sha256-+FFN6sO0mvlage8JazyrqNZk4onejz1XJPiOK3gnhWE="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ mkDerivation rec { meta = with lib; { description = "Collection management software, free and simple"; homepage = "https://tellico-project.org/"; - license = with licenses; [ gpl2 gpl3 ]; + license = with licenses; [ gpl2Only gpl3Only lgpl2Only ]; maintainers = with maintainers; [ numkem ]; platforms = platforms.linux; }; From 42779e4e31f7aea37bd895ba7fbd49238f8853aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 03:20:12 +0000 Subject: [PATCH 098/664] ceph: 16.2.3 -> 16.2.4 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c10348fd711d..52bce3f274df 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -131,10 +131,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.3"; + version = "16.2.4"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-K3T1Lob19p8ykYEmYumHS8hqj2uysCuE0EAKb1TMJ0Q="; + sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0="; }; in rec { ceph = stdenv.mkDerivation { From 3d8311849e28a9fe1a174f6d83763b7172d23d4b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 23 May 2021 20:52:17 -0700 Subject: [PATCH 099/664] kooha: 1.1.3 -> 1.2.1 --- pkgs/applications/video/kooha/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 223ed132c928..6203041ed63e 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib -, gobject-introspection, gst_all_1, gtk3, libhandy, librsvg, meson, ninja +, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja , pkg-config, python3, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.3"; + version = "1.2.1"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36"; + sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w"; }; buildInputs = [ @@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base - gtk3 - libhandy + gtk4 + libadwaita librsvg ]; @@ -48,6 +48,10 @@ python3.pkgs.buildPythonApplication rec { patchShebangs build-aux/meson/postinstall.py ''; + installCheckPhase = '' + $out/bin/kooha --help + ''; + meta = with lib; { description = "Simple screen recorder"; homepage = "https://github.com/SeaDve/Kooha"; From 15752dc7f37d604c66524bb8f26ee13709036267 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 23 May 2021 22:10:40 -0700 Subject: [PATCH 100/664] winetricks: 20201206 -> 20210206 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 0fe4e4da92d7..fa9e88db6481 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -76,8 +76,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20201206"; - sha256 = "1xs09v1zr98yvwvdsmzgryc2hbk92mwn54yxx8162l461465razc"; + version = "20210206"; + sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ="; owner = "Winetricks"; repo = "winetricks"; rev = version; From c79d7252ce0d08dbcd0aba6c01fc2bc83d252b07 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 17 May 2021 14:17:51 +0200 Subject: [PATCH 101/664] trilium: 0.47.2 -> 0.47.3 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 1cf7f8769d5b..51a12ea40dbf 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.2"; + version = "0.47.3"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "04fyi0gbih6iw61b6d8lprf9qhxb6zb1pgckmi016wgv8x5ck02p"; + sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1f8csjgqq4yw1qcnlrfy5ysarazmvj2fnmnxj4sr1xjbfa78y2rr"; + sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh"; }; in { From 7cb492fb1357dde3a5c67f31f8ce6e612fd4301c Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 17 May 2021 14:36:19 +0200 Subject: [PATCH 102/664] nixos/trilium-server: add myself as maintainer --- nixos/modules/services/web-apps/trilium.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 3a6ea02676aa..b878de023ff5 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -28,7 +28,7 @@ in type = types.str; default = "/var/lib/trilium"; description = '' - The directory storing the nodes database and the configuration. + The directory storing the notes database and the configuration. ''; }; @@ -85,7 +85,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ ]; + meta.maintainers = with lib.maintainers; [ fliegendewurst ]; users.groups.trilium = {}; users.users.trilium = { From b9e2b878c52f6081ac09f32bd8f3c90d7814c63a Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 17 May 2021 15:37:16 +0200 Subject: [PATCH 103/664] nixos/trilium-server: noBackup option --- nixos/modules/services/web-apps/trilium.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index b878de023ff5..ae41ba50d2e2 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -9,6 +9,7 @@ let # Disable automatically generating desktop icon noDesktopIcon=true + noBackup=${cfg.noBackup} [Network] # host setting is relevant only for web deployments - set the host on which the server will listen @@ -40,6 +41,14 @@ in ''; }; + noBackup = mkOption { + type = types.bool; + default = false; + description = '' + Disable periodic database backups. + ''; + }; + host = mkOption { type = types.str; default = "127.0.0.1"; From 456dbc765abf49850e09bfc8ab2587452e455b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 May 2021 11:33:41 +0200 Subject: [PATCH 104/664] python3Packages.ytmusicapi: 0.17.1 -> 0.17.3 https://github.com/sigma67/ytmusicapi/releases/tag/0.17.2 https://github.com/sigma67/ytmusicapi/releases/tag/0.17.3 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 9c92e5e55a64..daba39eb224d 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.17.1"; + version = "0.17.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-b5+AGf9qFqQbx4Rq4RovK2NllYsB+sXVMFU4AvbDkzI="; + sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs="; }; propagatedBuildInputs = [ From ade1f796cb93e804983d956efc3356bdc1cf532f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 10:23:41 +0200 Subject: [PATCH 105/664] python3Packages.cssutils: 2.2.0 -> 2.3.0 https://github.com/jaraco/cssutils/blob/v2.3.0/CHANGES.rst --- .../python-modules/cssutils/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 8bfe8ea2948d..9d1aec862508 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -5,19 +5,21 @@ , setuptools-scm , toml , importlib-metadata +, cssselect +, lxml , mock , pytestCheckHook }: buildPythonPackage rec { pname = "cssutils"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf"; + sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; }; nativeBuildInputs = [ @@ -30,6 +32,8 @@ buildPythonPackage rec { ]; checkInputs = [ + cssselect + lxml mock pytestCheckHook ]; @@ -38,6 +42,12 @@ buildPythonPackage rec { # access network "test_parseUrl" "encutils" + "website.logging" + ] ++ lib.optionals (pythonOlder "3.9") [ + # AttributeError: module 'importlib.resources' has no attribute 'files' + "test_parseFile" + "test_parseString" + "test_combine" ]; pythonImportsCheck = [ "cssutils" ]; From d6ad9712ef134833dc6becefb6dc71c6404000e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Mon, 24 May 2021 11:59:33 +0300 Subject: [PATCH 106/664] helio-workstation: 3.4 -> 3.6 --- pkgs/applications/audio/helio-workstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 4bcda6c4d327..6378a97f31d7 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4="; + sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc="; }; buildInputs = [ From 475e7f1a55d8d97423be69af889b727c46b083d6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 24 May 2021 10:21:18 +0100 Subject: [PATCH 107/664] trivy: 0.18.2 -> 0.18.3 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 0295ed000cad..9507096335a9 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Ub78Js4KM1meXN5e1cwO8gb065cyGGNlsj4CGBIhTU="; + sha256 = "sha256-YQYDDg4rgLygswGl/IYb+USSsuXQ8kXh4NhQYvnaCko="; }; - vendorSha256 = "sha256-R1FX6BrzXP5HkqoYtY3f/oACAFLxIvcjiOyfq6YZezk="; + vendorSha256 = "sha256-f1un8jWhx7VfbbYV0/t3SLFXp496Wt5aEHkcuj/U4KQ="; excludedPackages = "misc"; From 91d51c4195cbbf22e696b24d8333ce6b53ef0fc8 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 24 May 2021 10:37:40 +0100 Subject: [PATCH 108/664] terragrunt: 0.29.2 -> 0.29.4 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ca10fdcf9bcb..9455121066de 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.2"; + version = "0.29.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e4DwMphX8I37MShMt5nnoizfL919mJaFCkDGNeGXHbQ="; + sha256 = "sha256-/LWzUVZAr4zw8mekcHybNuqe0wv4ZU8UcE0oGxq6jqY="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; From 33d5dc3e7a21cf94f812b7e2a8a0152b95678820 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Mon, 24 May 2021 09:53:11 +0000 Subject: [PATCH 109/664] terraform-provider-hcloud: 1.22.0 -> 1.26.0 --- .../cluster/terraform-providers/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix index f9a848669344..5d0fcb13f179 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-hcloud"; - version = "1.22.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = pname; rev = "v${version}"; - sha256 = "1h4kplrmpsbwa0nq3zyqa0cnvhv1s5avdrjyf1k1f2z6b6h4gynf"; + sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs"; }; - vendorSha256 = "070p34g0ca55rmfdwf1l53yr8vyhmm5sb8hm8q036n066yp03yfs"; + vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0"; # Spends an awful time in other test folders, apparently tries to reach # opencensus and fails. From 28508dce6a7e192339caacdb9dc7dd3d3e2e408c Mon Sep 17 00:00:00 2001 From: embr Date: Mon, 24 May 2021 13:35:09 +0200 Subject: [PATCH 110/664] bozohttpd: use bmake flags instead of a custom installPhase --- pkgs/servers/http/bozohttpd/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 12aa438cf122..0e97910e6f11 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -59,17 +59,12 @@ stdenv.mkDerivation rec { _LDADD = [ "-lcrypt" "-lm" ] ++ optional (luaSupport) "-llua" ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; - makeFlags = [ "LDADD=$(_LDADD)" ]; + makeFlags = [ "LDADD=$(_LDADD)" "prefix=$(out)" "MANDIR=$(out)/share/man" "BINOWN=" ]; doCheck = true; checkInputs = [ inetutils wget ]; checkFlags = [ "-dx" "VERBOSE=yes" ] ++ optional (!cgiSupport) "CGITESTS="; - installPhase = '' - install -m755 -Dt $out/bin bozohttpd - install -m644 -Dt $out/share/man/man8 bozohttpd.8 - ''; - meta = with lib; { description = "Bozotic HTTP server; small and secure"; longDescription = '' From 77acedc33b2a90f9eab71a4582e655ea5c840869 Mon Sep 17 00:00:00 2001 From: embr Date: Mon, 24 May 2021 13:35:38 +0200 Subject: [PATCH 111/664] bozohttpd: remove unnecessary checkFlags --- pkgs/servers/http/bozohttpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 0e97910e6f11..e934f86f2c17 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ inetutils wget ]; - checkFlags = [ "-dx" "VERBOSE=yes" ] ++ optional (!cgiSupport) "CGITESTS="; + checkFlags = optional (!cgiSupport) "CGITESTS="; meta = with lib; { description = "Bozotic HTTP server; small and secure"; From f088ce558f74c68be13416f356137dca3ffe0b19 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Fri, 7 May 2021 10:02:43 +0200 Subject: [PATCH 112/664] xjobs: init at 20200726 xjobs reads job descriptions line by line and executes them in parallel. Signed-off-by: Sirio Balmelli Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/tools/misc/xjobs/default.nix | 65 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/tools/misc/xjobs/default.nix diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/tools/misc/xjobs/default.nix new file mode 100644 index 000000000000..5edb365a3327 --- /dev/null +++ b/pkgs/tools/misc/xjobs/default.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchurl +, flex, installShellFiles, ncurses, which +}: + +stdenv.mkDerivation rec { + pname = "xjobs"; + version = "20200726"; + + src = fetchurl { + url = "mirror://sourceforge//xjobs/files/${pname}-${version}.tgz"; + sha256 = "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3"; + }; + + nativeBuildInputs = [ + flex + installShellFiles + which + ]; + buildInputs = [ + ncurses + ]; + + checkPhase = '' + runHook preCheck + ./${pname} -V + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,etc} + install -m755 ${pname} $out/bin/${pname} + install -m644 ${pname}.rc $out/etc/${pname}.rc + installManPage ${pname}.1 + runHook postInstall + ''; + + meta = with lib; { + description = "A program which reads job descriptions line by line and executes them in parallel"; + homepage = "https://www.maier-komor.de/xjobs.html"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.siriobalmelli ]; + longDescription = '' + xjobs reads job descriptions line by line and executes them in parallel. + + It limits the number of parallel executing jobs and starts new jobs when jobs finish. + + Therefore, it combines the arguments from every input line with the utility + and arguments given on the command line. + If no utility is given as an argument to xjobs, + then the first argument on every job line will be used as utility. + To execute utility xjobs searches the directories given in the PATH environment variable + and uses the first file found in these directories. + + xjobs is most useful on multi-processor/core machines when one needs to execute + several time consuming command several that could possibly be run in parallel. + With xjobs this can be achieved easily, and it is possible to limit the load + of the machine to a useful value. + + It works similar to xargs, but starts several processes simultaneously + and gives only one line of arguments to each utility call. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..812f4c4d5d0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4307,6 +4307,8 @@ in xkcdpass = with python3Packages; toPythonApplication xkcdpass; + xjobs = callPackage ../tools/misc/xjobs { }; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; From 1024bdd7ee9b11978ac03da2d5e9fdb538c3dce8 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 24 May 2021 16:06:17 +0200 Subject: [PATCH 113/664] ghc_filesystem: 1.5.4 -> 1.5.6 --- pkgs/development/libraries/ghc_filesystem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix index 76cfc4fbce6b..0ffad301a493 100644 --- a/pkgs/development/libraries/ghc_filesystem/default.nix +++ b/pkgs/development/libraries/ghc_filesystem/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "filesystem"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; rev = "v${version}"; - hash = "sha256-SvNUzKoNiSIM0no+A0NUT6hmeUH9SzgLQLrC5XOC0Ho="; + hash = "sha256-qnBZ9aCrCPOgxymjbzrRs0gssijo8MJOMiy7QWWMb5c="; }; nativeBuildInputs = [ cmake ]; From 20bb6ae50695c4614492b16b62464fcc8eeb8107 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 9 May 2021 09:43:10 +0100 Subject: [PATCH 114/664] scli: init at 0.6.1 scli: add license scli: add basic checkPhase scli: apply formatting changes from @SuperSandro2000 Co-authored-by: Sandro scli: update src sha256 scli: remove chmod from checkPhase scli: add pathShebangs --- pkgs/applications/misc/scli/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/scli/default.nix diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix new file mode 100644 index 000000000000..93fd5d41942b --- /dev/null +++ b/pkgs/applications/misc/scli/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonApplication, fetchFromGitHub, signal-cli, urwid +, urwid-readline, dbus }: + +buildPythonApplication rec { + pname = "scli"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "isamert"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hWzpqj/sxPq/doxdmytnj5rh2qKQE71WMB0ugomWhHg"; + }; + + propagatedBuildInputs = [ signal-cli urwid urwid-readline dbus ]; + dontBuild = true; + + checkPhase = '' + # scli attempts to write to these directories, make sure they're writeable + export XDG_DATA_HOME=$(mktemp -d) + export XDG_CONFIG_HOME=$(mktemp -d) + ./scli --help > /dev/null # don't spam nix-build log + test $? == 0 + ''; + + installPhase = '' + mkdir -p $out/bin + patchShebangs scli + install -m755 -D scli $out/bin/scli + ''; + + meta = with lib; { + description = "Simple terminal user interface for Signal"; + homepage = "https://github.com/isamert/scli"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alex-eyre ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..d4c3a5abed30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26244,6 +26244,8 @@ in scite = callPackage ../applications/editors/scite { }; + scli = with python3Packages; callPackage ../applications/misc/scli { }; + scribus = callPackage ../applications/office/scribus { inherit (gnome2) libart_lgpl; }; From c5545b7e423869aaabc1232e9f339a5cb18398db Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:35 +0200 Subject: [PATCH 115/664] linux: 4.14.232 -> 4.14.233 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 431180c34bba..5108eaaf6965 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.232"; + version = "4.14.233"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x"; + sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From be7fc1bdee8bc3907f1089f37570ece1938532ba Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:40 +0200 Subject: [PATCH 116/664] linux: 4.19.190 -> 4.19.191 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5357251720be..d5e998ac194e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.190"; + version = "4.19.191"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g"; + sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 7d15d507177349feee82e225a2ddbb09a9830d47 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:44 +0200 Subject: [PATCH 117/664] linux: 4.4.268 -> 4.4.269 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 36b54e8191df..05fb7a88d4a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.268"; + version = "4.4.269"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8"; + sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From e51c114dfeab0f7f7655edb3bb045c775982c5c6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:48 +0200 Subject: [PATCH 118/664] linux: 4.9.268 -> 4.9.269 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d1cd267dd22c..5e1318675bd4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.268"; + version = "4.9.269"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv"; + sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 43730b18ea08d7bf93aee23f47c2683f7a93e945 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:53 +0200 Subject: [PATCH 119/664] linux: 5.10.38 -> 5.10.39 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index cce8d1d92646..afd8f21382bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.38"; + version = "5.10.39"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; + sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 6485d14e6de1ce89d39367d3d8b7eac5fdae684c Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:06 +0200 Subject: [PATCH 120/664] linux: 5.12.5 -> 5.12.6 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 8efecb53ea1c..4e7142b4a31c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.5"; + version = "5.12.6"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; + sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 44ed8b845d762581ca84ab4dd6baab89a0674d79 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:12 +0200 Subject: [PATCH 121/664] linux: 5.4.120 -> 5.4.121 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index fd3cd525c203..a5eb04751f99 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.120"; + version = "5.4.121"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; + sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From be8af32578742a2940eb0aa0f3437bfdb43a515d Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:29 +0200 Subject: [PATCH 122/664] linux_latest-libre: 18063 -> 18096 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index ea04414804c7..6d1c73397200 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18063"; - sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is"; + rev = "18096"; + sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; } , ... }: From 96806043e7e73bb98d2362b5c14f3eb6dee2b514 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:44 +0200 Subject: [PATCH 123/664] linux/hardened/patches/4.14: 4.14.232-hardened1 -> 4.14.233-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a7505c95f104..acd24be11efd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.232-hardened1.patch", - "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch" + "name": "linux-hardened-4.14.233-hardened1.patch", + "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 38a17bf83560749fab96d595c3ac10b2d4b922ad Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:46 +0200 Subject: [PATCH 124/664] linux/hardened/patches/4.19: 4.19.190-hardened1 -> 4.19.191-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index acd24be11efd..0ef029650689 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.190-hardened1.patch", - "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch" + "name": "linux-hardened-4.19.191-hardened1.patch", + "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" }, "5.10": { "extra": "-hardened1", From f8df946b8b6b37a6d05d9cac7728709593c774ae Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:48 +0200 Subject: [PATCH 125/664] linux/hardened/patches/5.10: 5.10.37-hardened1 -> 5.10.39-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ef029650689..4da8c0ba1e63 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.37-hardened1.patch", - "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" + "name": "linux-hardened-5.10.39-hardened1.patch", + "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" }, "5.11": { "extra": "-hardened1", From ac7c67ea0c13e60d1a39d658b2418ce616e4ccc6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:49 +0200 Subject: [PATCH 126/664] linux/hardened/patches/5.11: 5.11.21-hardened1 -> 5.11.22-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4da8c0ba1e63..abfdc43f18c3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.21-hardened1.patch", - "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" + "name": "linux-hardened-5.11.22-hardened1.patch", + "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 63f5c51430ba45904bd3ffa915c045cb746a4d20 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:50 +0200 Subject: [PATCH 127/664] linux/hardened/patches/5.4: 5.4.119-hardened1 -> 5.4.121-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index abfdc43f18c3..5822b154364e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.119-hardened1.patch", - "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch" + "name": "linux-hardened-5.4.121-hardened1.patch", + "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" } } From 8bf4f7e2f3ac9232e7e198296f4904c634848216 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 24 May 2021 19:09:06 +0200 Subject: [PATCH 128/664] rPackages.lwgeom: fix build --- pkgs/development/r-modules/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 067db74663e2..f16a6d0bb4aa 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -276,6 +276,7 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; + lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; @@ -406,6 +407,7 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; + lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; From 12eaa1f5fb46f7ad0115c885109bf6a90bb43901 Mon Sep 17 00:00:00 2001 From: Matheus de Souza Pessanha Date: Mon, 24 May 2021 14:39:47 -0300 Subject: [PATCH 129/664] gTile: init at 44 --- .../gnome/extensions/gtile/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/gtile/default.nix diff --git a/pkgs/desktops/gnome/extensions/gtile/default.nix b/pkgs/desktops/gnome/extensions/gtile/default.nix new file mode 100644 index 000000000000..3430dff1355b --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gtile/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-gtile"; + version = "44"; + + src = fetchFromGitHub { + owner = "gTile"; + repo = "gTile"; + rev = "V${version}"; + sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; + }; + + uuid = "gTile@vibou"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid} + + runHook postInstall + ''; + + meta = with lib; { + description = "A window tiling extension for Gnome. This is the new official home of the vibou.gTile extension."; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mdsp ]; + platforms = platforms.linux; + homepage = "https://github.com/gTile/gTile"; + }; +} From 54fd011d658b30131584d904be4a6040f0eff4b4 Mon Sep 17 00:00:00 2001 From: Matheus de Souza Pessanha Date: Mon, 24 May 2021 14:43:51 -0300 Subject: [PATCH 130/664] maintainers: add mdsp's GPG keys --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e229e6a08184..f85d74b1c72b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6417,6 +6417,10 @@ githubId = 44469426; name = "Matheus de Souza Pessanha"; email = "matheus_pessanha2001@outlook.com"; + keys = [{ + longkeyid = "rsa4096/6DFD656220A3B849"; + fingerprint = "2D4D 488F 17FB FF75 664E C016 6DFD 6562 20A3 B849"; + }]; }; meatcar = { email = "nixpkgs@denys.me"; From 5e914394e1d44ac4293bccbdf6e34f5b4d34a8b6 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 20 Feb 2021 14:39:36 +0100 Subject: [PATCH 131/664] webcamoid: 8.7.1 -> 8.8.0 --- pkgs/applications/video/webcamoid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index ef485fc82011..aea8266b1d0c 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -4,10 +4,10 @@ , v4l-utils }: mkDerivation rec { pname = "webcamoid"; - version = "8.7.1"; + version = "8.8.0"; src = fetchFromGitHub { - sha256 = "1d8g7mq0wf0ycds87xpdhr3zkljgjmb94n3ak9kkxj2fqp9242d2"; + sha256 = "0a8M9GQ6Ea9jBCyfbORVyB6HC/O6jdcIZruQZj9Aai4="; rev = version; repo = "webcamoid"; owner = "webcamoid"; From 5eb80c23b62728c14fef235665a9069944aef4ec Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 13 May 2021 17:38:29 +0200 Subject: [PATCH 132/664] ryujinx: 1.0.6835 -> 1.0.6893 --- pkgs/misc/emulators/ryujinx/default.nix | 12 +- pkgs/misc/emulators/ryujinx/deps.nix | 348 ++++++++++++------------ pkgs/misc/emulators/ryujinx/log.patch | 18 +- 3 files changed, 194 insertions(+), 184 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index db3b87b7b59e..91f4ef519346 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert -, SDL2, libX11, libgdiplus, ffmpeg, openal, libsoundio +, libX11, libgdiplus, ffmpeg +, SDL2_mixer, openal, libsoundio, sndio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: let runtimeDeps = [ - SDL2 gtk3 libX11 libgdiplus ffmpeg + SDL2_mixer openal libsoundio + sndio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6893"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04"; - sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f"; + rev = "fb65f392d1c4b0e01f22b6ddebcc8317ba9769c3"; + sha256 = "0ncrcbwyirz21j81vc6yvcjc2fn8nc5ilrfczclq6f8cpy09c3y8"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 1ccd7c9b38fe..23eacb690a0e 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -21,13 +21,13 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.166"; - sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; - version = "4.3.0"; - sha256 = "03lb3xzgwxik8nljq87pr1b9bsxbsl3a4kvy0kqkw9f57n29ihvk"; + version = "4.4.0"; + sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; }) (fetchNuGet { name = "GdkSharp"; @@ -44,16 +44,16 @@ version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) + (fetchNuGet { + name = "GtkSharp"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; + }) (fetchNuGet { name = "LibHac"; version = "0.12.0"; @@ -89,6 +89,11 @@ version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; + }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; @@ -144,11 +149,6 @@ version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; @@ -279,26 +279,21 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; @@ -309,16 +304,16 @@ version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; @@ -330,15 +325,20 @@ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; + name = "runtime.any.System.Runtime"; version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -364,16 +364,6 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; @@ -384,15 +374,25 @@ version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -511,8 +511,8 @@ }) (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; - version = "4.3.0"; - sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; + version = "4.4.0-build7"; + sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) (fetchNuGet { name = "SharpZipLib"; @@ -524,20 +524,20 @@ version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) - (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; - }) (fetchNuGet { name = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) + (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + }) (fetchNuGet { name = "SPB"; - version = "0.0.2"; - sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r"; + version = "0.0.3-build15"; + sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw"; }) (fetchNuGet { name = "System.AppContext"; @@ -564,16 +564,6 @@ version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; @@ -590,9 +580,14 @@ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.ComponentModel"; + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; @@ -609,6 +604,11 @@ version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) (fetchNuGet { name = "System.Console"; version = "4.0.0"; @@ -659,16 +659,6 @@ version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; @@ -685,19 +675,14 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { - name = "System.IO"; + name = "System.Globalization"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { name = "System.IO.Compression.ZipFile"; @@ -705,14 +690,9 @@ sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { name = "System.IO.FileSystem.Primitives"; @@ -724,6 +704,31 @@ version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) (fetchNuGet { name = "System.Linq"; version = "4.1.0"; @@ -734,11 +739,6 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) (fetchNuGet { name = "System.Management"; version = "5.0.0"; @@ -784,26 +784,6 @@ version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -824,6 +804,16 @@ version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; @@ -854,6 +844,16 @@ version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; @@ -864,16 +864,6 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; @@ -904,16 +894,6 @@ version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; @@ -924,6 +904,16 @@ version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; @@ -934,6 +924,16 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; @@ -984,11 +984,6 @@ version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; @@ -1005,14 +1000,9 @@ sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "System.Security.Principal"; version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1024,6 +1014,16 @@ version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; @@ -1034,31 +1034,11 @@ version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; @@ -1069,6 +1049,16 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; @@ -1084,6 +1074,16 @@ version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; @@ -1104,14 +1104,14 @@ version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.3.0"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; - }) (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) ] diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/misc/emulators/ryujinx/log.patch index 7283ef9e7d5d..57e96e5c25cb 100644 --- a/pkgs/misc/emulators/ryujinx/log.patch +++ b/pkgs/misc/emulators/ryujinx/log.patch @@ -1,8 +1,16 @@ -diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs -index 20c0fb46..534576bc 100644 ---- a/Ryujinx.Common/Configuration/LoggerModule.cs -+++ b/Ryujinx.Common/Configuration/LoggerModule.cs -@@ -75,7 +75,7 @@ namespace Ryujinx.Configuration +diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs +index 44631ea0..534576bc 100644 +--- a/Ryujinx/Configuration/LoggerModule.cs ++++ b/Ryujinx/Configuration/LoggerModule.cs +@@ -1,6 +1,7 @@ + using Ryujinx.Common; + using Ryujinx.Common.Logging; + using System; ++using System.IO; + + namespace Ryujinx.Configuration + { +@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration if (e.NewValue) { Logger.AddTarget(new AsyncLogTargetWrapper( From 9cf6b9d681ba6f1afc181c16720692ad72d0891c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 19:27:29 +0000 Subject: [PATCH 133/664] mbuffer: 20210209 -> 20210328 --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 2ab76e8dfd42..19bc784ae086 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20210209"; + version = "20210328"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "sha256-6B8niOJiHyD4SBge8ssZrG0SMoaRQ38wFXSyU/2Jmgw="; + sha256 = "sha256-UbW42EiJkaVf4d/OkBMPnke8HOKGugO09ijAS3hP3F0="; }; buildInputs = [ openssl ]; From 5b0928bd2b1471166f2ae579d662a3d4f9e996c0 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 24 May 2021 21:28:35 +0200 Subject: [PATCH 134/664] yuzu-{mainline,ea}: {576,1536} -> {633,1704} --- pkgs/misc/emulators/yuzu/base.nix | 3 +++ pkgs/misc/emulators/yuzu/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix index b0459d61679f..c2b8061485b5 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/misc/emulators/yuzu/base.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DYUZU_USE_BUNDLED_QT=OFF" + "-DYUZU_USE_BUNDLED_SDL2=OFF" + "-DYUZU_USE_BUNDLED_FFMPEG=OFF" "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index d47c5937385c..806ec806e4d6 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -4,25 +4,25 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "576"; + version = "633"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "121pn3kmghpcf4pzs0mc8z3viyp32rzm7rssva7cdd5016z2648k"; + sha256 = "1zq20dd6x3kk179ls7y3mc5rj9vr73qs12bdj52bl3kscphxybf1"; fetchSubmodules = true; }; }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "1536"; + version = "1704"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0smrx05xxr4b96i8bw6n6pynkl9r21ydfvpjdzxkr9amin20r54y"; + sha256 = "07pcldcmn8ammzbnxki6by7hgacr6z0548dvhv2p5lp9qcf3xz22"; }; }; }.${branch} From e04a574cff8d3c9a4e75fc9e66fb14043f121385 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 24 May 2021 21:34:28 +0200 Subject: [PATCH 135/664] vscod{e,ium}: allow nixpkgs-update to run nixpkgs-update didn't run the updatescript before, causing issues. This has since been fixed. --- pkgs/applications/editors/vscode/vscode.nix | 3 --- pkgs/applications/editors/vscode/vscodium.nix | 2 -- 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 6ae837105a92..672b1aaf096e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -20,9 +20,6 @@ let }.${system}; in callPackage ./generic.nix rec { - # The update script doesn't correctly change the hash for darwin, so please: - # nixpkgs-update: no auto update - # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. version = "1.56.2"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index da29daa63599..f542557c384e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -28,8 +28,6 @@ let in callPackage ./generic.nix rec { inherit sourceRoot; - # The update script doesn't correctly change the hash for darwin, so please: - # nixpkgs-update: no auto update # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. From 9674711a573144ba5c533bef38460449296ffec9 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 24 May 2021 21:46:44 +0200 Subject: [PATCH 136/664] vscod{e,ium}: set passthru.updateScript --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- pkgs/applications/editors/vscode/vscode.nix | 2 ++ pkgs/applications/editors/vscode/vscodium.nix | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8bdfc64d8571..56a81f21febb 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -9,7 +9,7 @@ # Attributes inherit from specific versions , version, src, meta, sourceRoot -, executableName, longName, shortName, pname +, executableName, longName, shortName, pname, updateScript }: let @@ -19,7 +19,7 @@ let inherit pname version src sourceRoot; passthru = { - inherit executableName tests; + inherit executableName tests updateScript; fhs = fhs {}; fhsWithPackages = f: fhs { additionalPkgs = f; }; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 672b1aaf096e..fd1cb7153ebf 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -37,6 +37,8 @@ in sourceRoot = ""; + updateScript = ./update-vscodium.sh; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f542557c384e..7dadd02a4476 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -45,6 +45,8 @@ in tests = nixosTests.vscodium; + updateScript = ./update-vscodium.sh; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, From 374ce1b1af3348e5f343b954b576ebc436766193 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Wed, 14 Apr 2021 16:22:35 +0200 Subject: [PATCH 137/664] reposurgeon: 3.44 -> 4.26 --- .../reposurgeon/default.nix | 78 +++++++------------ 1 file changed, 28 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 3e526d5ac7ca..2f9ff92ad672 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,60 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy -, breezy ? null, cvs ? null, darcs ? null, fossil ? null -, mercurial ? null, monotone ? null, rcs ? null -, subversion ? null, cvs_fast_export ? null }: +{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git +, asciidoctor, ruby +}: -with stdenv; with lib; -let - inherit (python27Packages) python; -in mkDerivation rec { - name = "reposurgeon-${meta.version}"; - meta = { - description = "A tool for editing version-control repository history"; - version = "3.44"; - license = licenses.bsd3; - homepage = "http://www.catb.org/esr/reposurgeon/"; - maintainers = with maintainers; [ dfoxfranke ]; - platforms = platforms.all; - }; +buildGoModule rec { + pname = "reposurgeon"; + version = "4.26"; src = fetchurl { - url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz"; - sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn"; + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${version}.tar.xz"; + sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY="; }; - # install fails because the files README.md, NEWS, and TODO were not included in the source distribution - patches = [ ./fix-makefile.patch ]; + vendorSha256 = "sha256-KpdXI2Znhe0iCp0DjSZXzUYDZIz2KBRv1/SpaRTFMAc="; - buildInputs = - [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ]; + subPackages = [ "." ]; - preBuild = '' - makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" - prefix="$out" - pyinclude="-I${python}/include/python2.7" - pylib="-L${python}/lib -lpython2.7" - ) + runVend = true; + + nativeBuildInputs = [ asciidoctor ruby ]; + + postBuild = '' + patchShebangs . + make all HTMLFILES= ''; - postInstall = - let - binpath = makeBinPath ( - filter (x: x != null) - [ out git breezy cvs darcs fossil mercurial - monotone rcs src subversion cvs_fast_export ] - ); - pythonpath = makeSearchPathOutput "lib" python.sitePackages ( - filter (x: x != null) - [ python27Packages.readline or null python27Packages.hglib or null ] - ); - in '' - for prog in reposurgeon repodiffer repotool; do - wrapProgram $out/bin/$prog \ - --prefix PATH : "${binpath}" \ - --prefix PYTHONPATH : "${pythonpath}" - done - '' - ; + postInstall = '' + make install prefix=$out HTMLFILES= + ''; + + meta = { + description = "A tool for editing version-control repository history"; + license = lib.licenses.bsd3; + homepage = "http://www.catb.org/esr/reposurgeon/"; + maintainers = with lib.maintainers; [ dfoxfranke ]; + platforms = lib.platforms.all; + }; } From a9c375563e8c82a582ffeeed7dd257833109c72f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 22 May 2021 14:35:45 +0200 Subject: [PATCH 138/664] Gxplugins-Lv2: 0.8 -> 0.9 --- pkgs/applications/audio/gxplugins-lv2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index d71d40f401c4..5e8747f76566 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal"; + sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877"; fetchSubmodules = true; }; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brummer10/GxPlugins.lv2"; description = "A set of extra lv2 plugins from the guitarix project"; maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } From 13f114593bb7796010fccaffbdb0686852a1de27 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 24 May 2021 22:07:52 -0700 Subject: [PATCH 139/664] nv-codec-headers-10: init at 10.0.26.2 --- .../libraries/nv-codec-headers/10_x.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/nv-codec-headers/10_x.nix diff --git a/pkgs/development/libraries/nv-codec-headers/10_x.nix b/pkgs/development/libraries/nv-codec-headers/10_x.nix new file mode 100644 index 000000000000..b1fe1611301f --- /dev/null +++ b/pkgs/development/libraries/nv-codec-headers/10_x.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchgit }: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "10.0.26.2"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "0n5jlwjfv5irx1if1g0n52m279bw7ab6bd3jz2v4vwg9cdzbxx85"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://ffmpeg.org/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MP2E ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..e49421cbf38f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17164,6 +17164,7 @@ in nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; + nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let From 873fa488248ba6871fbff4b3823517f0c38abdbe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 25 May 2021 00:43:39 -0700 Subject: [PATCH 140/664] linuxPackages.mxu11x0: mark broken for kernel>=5.4 --- pkgs/os-specific/linux/mxu11x0/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index ac9f27e2e6bd..3498625be757 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.4"; }; } From f9eedc34577b5484307e30efa81c6f0521427919 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sat, 15 May 2021 22:00:20 +0200 Subject: [PATCH 141/664] step-ca: 0.15.11 -> 0.15.15 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 84fe06e6c19c..f72f3c978ffe 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.15.11"; + version = "0.15.15"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY="; + sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY=="; }; - vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90="; + vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs="; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; From 2a45e01bb8dc59d3696654b1b08a4ba4c8956ccb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 25 May 2021 00:49:35 -0700 Subject: [PATCH 142/664] linuxPackages.perf: mark broken for kernels<5 --- pkgs/os-specific/linux/kernel/perf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b28e16590839..ae27839c8cd3 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation { description = "Linux tools to profile with performance counters"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; + broken = kernel.kernelOlder "5"; }; } From 753452f8084a9e151d8c2118d11f327cbd42b315 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 25 May 2021 16:38:57 +0800 Subject: [PATCH 143/664] sacad: 2.3.4 -> 2.4.0 --- pkgs/tools/misc/sacad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index c5c48c271db7..50599fbbabd7 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "sacad"; - version = "2.3.4"; + version = "2.4.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r"; + sha256 = "sha256-KLVkyiXjpqskM67W9uPl9aPKc3pYMu0nAfwI0OpOniE="; }; propagatedBuildInputs = with python3Packages; [ From 376f8578ee9add68e69f23daefd011aee7825750 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 14:13:29 +0200 Subject: [PATCH 144/664] python3Packages.dulwich: 0.20.21 -> 0.20.23 --- .../python-modules/dulwich/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 9c7f62edf11a..a9af41c499d7 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -8,25 +8,38 @@ , geventhttpclient , git , glibcLocales +, gpgme , mock +, pkgs , urllib3 }: buildPythonPackage rec { - version = "0.20.21"; + version = "0.20.23"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rHZMmpuA+mGv40BNUnDFBgqlf38IexGpU5XTt287cf0="; + sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU="; }; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ urllib3 certifi ]; + propagatedBuildInputs = [ + certifi + urllib3 + ]; - # Only test dependencies - checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + checkInputs = [ + fastimport + gevent + geventhttpclient + git + glibcLocales + gpgme + pkgs.gnupg + mock + ]; doCheck = !stdenv.isDarwin; From 4ca44017c17fe04696d312e655fdd6865ddb0761 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 15:26:56 +0200 Subject: [PATCH 145/664] python3Packages.pyftdi: 0.52.9 -> 0.53.1 --- pkgs/development/python-modules/pyftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 2b46a4ce6825..eb7d9a623d4f 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.52.9"; + version = "0.53.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6"; + sha256 = "sha256-lpNe+8DhyfVuClGcjWIA6pnfh+NwdlBGffjRH62K4uw="; }; propagatedBuildInputs = [ pyusb pyserial ]; From 4ea29081fbbf601b3b626f3de74a14b7e8718fa9 Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Tue, 25 May 2021 17:54:47 +0200 Subject: [PATCH 146/664] dconf2nix: 0.0.7 -> 0.0.8 --- pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index b857b910f0a5..3ebbc9b03396 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, template-haskell, text +{ mkDerivation, base, containers, fetchgit, hedgehog, lib +, optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.7"; + version = "0.0.8"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1"; - rev = "34c523e920b79208c3b4c0ad371900b0948799f7"; + sha256 = "19jk3p0ys3lbqk21lm37a7alkg2vhnmkvcffjqfxrw8p4737hxid"; + rev = "6bf3d7d4ca9f553a9e1ba4a70a65640114d230b2"; fetchSubmodules = true; }; isLibrary = true; From 4b08e67c3ec4b1c859354d3cba194edf41997f64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 May 2021 19:58:21 +0200 Subject: [PATCH 147/664] python3Packages.corsair-scan: init at 0.2.0 --- .../python-modules/corsair-scan/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/corsair-scan/default.nix diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix new file mode 100644 index 000000000000..e7c016be06bb --- /dev/null +++ b/pkgs/development/python-modules/corsair-scan/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, requests +, tldextract +, urllib3 +, validators +}: + +buildPythonPackage rec { + pname = "corsair-scan"; + version = "0.2.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Santandersecurityresearch"; + repo = "corsair_scan"; + rev = "v${version}"; + sha256 = "09jsv5bag7mjy0rxsxjzmg73rjl7qknzr0d7a7himd7v6a4ikpmk"; + }; + + propagatedBuildInputs = [ + validators + requests + urllib3 + tldextract + click + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + pythonImportsCheck = [ "corsair_scan" ]; + + meta = with lib; { + description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations"; + homepage = "https://github.com/Santandersecurityresearch/corsair_scan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d186e8e27f08..8e7c08869fef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1356,6 +1356,8 @@ in coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + corsair = with python3Packages; toPythonApplication corsair-scan; + corsmisc = callPackage ../tools/security/corsmisc { }; cosign = callPackage ../tools/security/cosign { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38ab293c872d..75985fd5cb1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1574,6 +1574,8 @@ in { coronavirus = callPackage ../development/python-modules/coronavirus { }; + corsair-scan = callPackage ../development/python-modules/corsair-scan { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; From ce7b5ac8c99d37f2d693dd1c8a3d6e3455c1eb46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 00:27:56 +0200 Subject: [PATCH 148/664] python3Packages.aioambient: allow later websockets releases --- .../python-modules/aioambient/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 5e504ab87a02..83c74925b8cd 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -5,8 +5,8 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook , python-engineio , python-socketio @@ -27,7 +27,9 @@ buildPythonPackage rec { sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -39,13 +41,20 @@ buildPythonPackage rec { checkInputs = [ aresponses asynctest + pytest-aiohttp pytest-asyncio - pytest-cov pytestCheckHook ]; + postPatch = '' + # https://github.com/bachya/aioambient/pull/84 + substituteInPlace pyproject.toml \ + --replace 'websockets = "^8.1"' 'websockets = ">=8.1,<10.0"' + ''; + # Ignore the examples directory as the files are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "aioambient" ]; meta = with lib; { From c92404dc69c461c6a019bf955303c7581642d9fc Mon Sep 17 00:00:00 2001 From: Matt Christ Date: Tue, 25 May 2021 19:14:18 -0500 Subject: [PATCH 149/664] brscan5: update example to be supported model --- nixos/modules/services/hardware/sane_extra_backends/brscan5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix index f61b9b1494c7..fc3cb3e00163 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix @@ -29,7 +29,7 @@ let The model of the network device. ''; - example = literalExample "MFC-7860DW"; + example = literalExample "ADS-1200"; }; ip = mkOption { From b86e59d6d6ac3ad7d1fe17db17af8e4e5a2d70cf Mon Sep 17 00:00:00 2001 From: c4605 Date: Wed, 26 May 2021 09:58:35 +0800 Subject: [PATCH 150/664] maintainers: add c4605 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0130499a993d..ae398ae8a16a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1528,6 +1528,12 @@ githubId = 510553; name = "Jos van Bakel"; }; + c4605 = { + email = "bolasblack@gmail.com"; + github = "bolasblack"; + githubId = 382011; + name = "c4605"; + }; caadar = { email = "v88m@posteo.net"; github = "caadar"; From 99b56f14ad3b21fc36fe82f6f05ea302b1faa8cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 May 2021 04:38:09 +0000 Subject: [PATCH 151/664] cargo-sweep: 0.5.0 -> 0.6.2 --- pkgs/development/tools/rust/cargo-sweep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 537275c68f69..9efa337f1b19 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "holmgr"; repo = pname; rev = "v${version}"; - sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf"; + sha256 = "sha256-tumcGnYqY/FGP8UWA0ccfdAK49LBcT8qH6SshrDXNAI="; }; - cargoSha256 = "023gbq8izpbaxq1pdzs8428k24myd2b8gi9g4kl2hx79yciiscnz"; + cargoSha256 = "sha256-fcosKyGOy0SKrHbsKdxQJimelt1ByAM4YKo7WpHV8CA="; meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; From e649cfc1e955936ca8e4d9af3e9dadb088d9f404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 26 May 2021 07:45:49 +0200 Subject: [PATCH 152/664] schismtracker: fix darwin build --- pkgs/applications/audio/schismtracker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 3b5708529e06..797d2c1d7337 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; - configureFlags = [ "--enable-dependency-tracking" ]; + configureFlags = [ "--enable-dependency-tracking" ] + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python ]; From 6c6f9a5abfdc601d1d5ade71e8b667ed9cdc5fcd Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 26 May 2021 08:07:00 +0200 Subject: [PATCH 153/664] linux/hardened/patches/5.12: init at 5.12.6-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5822b154364e..ed9dc68e885a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -23,6 +23,12 @@ "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, + "5.12": { + "extra": "-hardened1", + "name": "linux-hardened-5.12.6-hardened1.patch", + "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.121-hardened1.patch", From 83694bb2197e7770778d8eaa8f17b8f7367990bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 May 2021 07:06:14 +0000 Subject: [PATCH 154/664] goreleaser: 0.165.0 -> 0.166.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index c4fc87967fd7..fb7bb2f9648d 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.165.0"; + version = "0.166.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xffxpEOEWnh3FtK5JYX38kMkKWQHWrdAXShbVDrW+lE="; + sha256 = "sha256-4D8KiTGuiJ0y1w3NdWcOs5q61kuIIZ49ys18wMb3fXI="; }; - vendorSha256 = "sha256-9CO5dHp/RHygp4YXCJM/XPvFcNQGHu1Gx3bhxlQ0Quk="; + vendorSha256 = "sha256-UI/cz9xZYi6BU/4MK/Qup55Kc1yv6DQHCEJM/I5oMec="; buildFlagsArray = [ "-ldflags=" From 90cf7fa9e986af2fa0137b71e9957b3e297ac649 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 26 May 2021 09:15:31 +0200 Subject: [PATCH 155/664] cypress: 7.3.0 -> 7.4.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 97cd5b87261f..9b84f9897fab 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.3.0"; + version = "7.4.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "158bpk4czfv2kkh1al1bb42jb0h3mbx9r72dk6crr2gg0bhabn8m"; + sha256 = "1xhjmn6cwpdph12k4gbl2f1v72bp689779l5i16i90i01m31kwjp"; }; passthru.updateScript = ./update.sh; From ebe3aaa78b9d29b1b58d233cb98cd4f02658cf08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 May 2021 07:31:48 +0000 Subject: [PATCH 156/664] gummi: 0.8.1 -> 0.8.2 --- pkgs/applications/misc/gummi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index c36f50b1cbdb..a98017f095cb 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.8.1"; + version = "0.8.2"; pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; rev = version; - sha256 = "0wxgmzazqiq77cw42i5fn2hc22hhxf5gbpl9g8y3zlnp21lw9y16"; + sha256 = "sha256-7txAyzJrEoGPjchXstMWIF1Vy+aoba6aa6+JNUYnKQs="; }; nativeBuildInputs = [ From 704060a8d5b8e450c29db90b21c523f087219ab6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 10:12:06 +0200 Subject: [PATCH 157/664] python3Packages.adb-shell: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/adb-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 6cbbe7c5d802..24ee4ee7ea44 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.2"; + version = "0.3.3"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-+K4fV8dlRpOZC5B7cvkfPRVK/2OBkH9qOmAnOwsm7kQ="; + sha256 = "sha256-QVSPQk/QNnIjTgKGuIg0e58qCH91wn7e4TwgWSmOJEk="; }; propagatedBuildInputs = [ From 76b39037c952f527424f52572a24f8dbbb3c0cda Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Fri, 14 May 2021 20:20:51 +0200 Subject: [PATCH 158/664] maintainers: add hoppla20 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e229e6a08184..2ecc284a90bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4109,6 +4109,12 @@ githubId = 362833; name = "Hongchang Wu"; }; + hoppla20 = { + email = "privat@vincentcui.de"; + github = "hoppla20"; + githubId = 25618740; + name = "Vincent Cui"; + }; hoverbear = { email = "operator+nix@hoverbear.org"; github = "hoverbear"; From 236e56dfda02526a35c5583667673da75b79d0fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 11:12:39 +0200 Subject: [PATCH 159/664] python3Packages.yalesmartalarmclient: 0.3.1 -> 0.3.4 --- .../python-modules/yalesmartalarmclient/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index a4ca97e27ac0..ce0dc34c0b40 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -1,4 +1,5 @@ { lib +, backoff , buildPythonPackage , fetchFromGitHub , requests @@ -6,16 +7,19 @@ buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "0fscp9n66h8a8khvjs2rjgm95xsdckpknadnyxqdmhw3hlj0aw6h"; + sha256 = "sha256-waWi3QnH7xQZh5iYklISCvfAaBdH5k+Y10huZuTNlSc="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + backoff + requests + ]; # Project has no tests doCheck = false; @@ -23,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interface with Yale Smart Alarm Systems"; - homepage = "https://github.com/mampfes/python-wiffi"; + homepage = "https://github.com/domwillcode/yale-smart-alarm-client"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From dc9165346e18665191b39e2ae5309e1e50b7ff40 Mon Sep 17 00:00:00 2001 From: embr Date: Wed, 26 May 2021 11:20:59 +0200 Subject: [PATCH 160/664] bozohttpd: resolve warnings, serve >2GB files on 32bit host -D_DEFAULT_SOURCE *and* -D_GNU_SOURCE together resolve all warnings about implicitly defined functions. -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 enable gcc's Large File Extensions to allow a 32-bit host to serve files larger than 2GB. Based on what Makefile.boot does, for platforms without bmake: http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/httpd/Makefile.boot --- pkgs/servers/http/bozohttpd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index e934f86f2c17..6d403756bd28 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -46,7 +46,15 @@ stdenv.mkDerivation rec { COPTS = [ - "-DNO_BLOCKLIST_SUPPORT" # unpackaged dependency: https://man.netbsd.org/blocklist.3 + "-D_DEFAULT_SOURCE" + "-D_GNU_SOURCE" + + # Ensure that we can serve >2GB files even on 32-bit systems. + "-D_LARGEFILE_SOURCE" + "-D_FILE_OFFSET_BITS=64" + + # unpackaged dependency: https://man.netbsd.org/blocklist.3 + "-DNO_BLOCKLIST_SUPPORT" ] ++ optional (!userSupport) "-DNO_USER_SUPPORT" ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" From 9fa8d24573643bdce2a7ab1c869339a8c4a30432 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 11:37:58 +0200 Subject: [PATCH 161/664] python3Packages.pymazda: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 8b3b74048e3c..f4b9f0b1f01e 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.1.5"; + version = "0.1.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vV7Morza6ov/rN44+7Rvo9p7DoE6jQtDk00TdrD0zBo="; + sha256 = "sha256-fQcycOMNYCO6bP344DTLxNf/YoliEITyxsnIDyTPO5E="; }; propagatedBuildInputs = [ From f4f05481e325aa8d5975f11f46340ca04ff729d6 Mon Sep 17 00:00:00 2001 From: embr Date: Wed, 26 May 2021 11:38:57 +0200 Subject: [PATCH 162/664] bozohttpd: add bozohttpd-minimal target --- pkgs/servers/http/bozohttpd/default.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 6d403756bd28..32a21f842643 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -6,14 +6,15 @@ , inetutils , wget , openssl -, userSupport ? true -, cgiSupport ? true -, dirIndexSupport ? true -, dynamicContentSupport ? true -, sslSupport ? true -, luaSupport ? true +, minimal ? false +, userSupport ? !minimal +, cgiSupport ? !minimal +, dirIndexSupport ? !minimal +, dynamicContentSupport ? !minimal +, sslSupport ? !minimal +, luaSupport ? !minimal , lua -, htpasswdSupport ? true +, htpasswdSupport ? !minimal }: let inherit (lib) optional optionals; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6444216f400..a86f41e44f2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1954,6 +1954,7 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; bozohttpd = callPackage ../servers/http/bozohttpd { }; + bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; bpytop = callPackage ../tools/system/bpytop { }; From 24a369cebd96548ccbde064e1b278ee4216d3fd7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 May 2021 12:39:48 +0200 Subject: [PATCH 163/664] python3Packages.beancount: add google-auth dep --- pkgs/development/python-modules/beancount/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 88369f41872b..ec864e71498f 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -7,6 +7,7 @@ , chardet , dateutil , google-api-python-client +, google-auth-oauthlib , lxml , oauth2client , ply @@ -35,6 +36,7 @@ buildPythonPackage rec { chardet dateutil google-api-python-client + google-auth-oauthlib lxml oauth2client ply From 53548f6755c25223f30729488f10d0a20ce13b4f Mon Sep 17 00:00:00 2001 From: c4605 Date: Sat, 11 Jul 2020 20:10:48 +0800 Subject: [PATCH 164/664] fn-cli: init at 0.6.6 --- .../networking/cluster/fn-cli/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/networking/cluster/fn-cli/default.nix diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix new file mode 100644 index 000000000000..118e3e0fbe2c --- /dev/null +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, docker }: + +buildGoModule rec { + pname = "fn"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "fnproject"; + repo = "cli"; + rev = version; + sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7"; + }; + + vendorSha256 = null; + + subPackages = ["."]; + + buildInputs = [ + docker + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + mv $out/bin/cli $out/bin/fn + ''; + + meta = with lib; { + description = "Command-line tool for the fn project"; + homepage = "https://fnproject.io"; + license = licenses.asl20; + maintainers = [ maintainers.c4605 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8230fb4161eb..3d7a68b26281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30077,6 +30077,8 @@ in atlantis = callPackage ../applications/networking/cluster/atlantis { }; + fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; areca = callPackage ../applications/backup/areca { From 1270b7977172de534ec12236b8a7a62904a8f317 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sat, 15 May 2021 22:08:07 +0200 Subject: [PATCH 165/664] step-cli: 0.15.3-22 -> 0.15.16 --- pkgs/tools/security/step-cli/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 2b6ec57bbf2b..a13eec71eb84 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -1,26 +1,24 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch }: buildGoModule rec { pname = "step-cli"; - version = "0.15.3-22-g3ddc5aa"; + version = "0.15.16"; - # 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394 src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; - rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3"; - sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0"; + rev = "v${version}"; + sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I="; }; preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go ''; - vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10"; + vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; From acf134771c79171ce183aa85aec162e03763bc30 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Wed, 26 May 2021 09:09:59 +0200 Subject: [PATCH 166/664] step-ca: use latest buildGoModule --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8f24ecbd561..100bbcf6a98a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3125,7 +3125,6 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; - buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; From 69de7cc12abfa1d0434750e5d346c299992a57ec Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 15:03:49 +0200 Subject: [PATCH 167/664] dockerTools: Format --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 54eb13d38ff3..5e66c81e4ff9 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -786,7 +786,7 @@ rec { fakeRootCommands ? "", # We pick 100 to ensure there is plenty of room for extension. I # believe the actual maximum is 128. - maxLayers ? 100 + maxLayers ? 100, }: assert (lib.assertMsg (maxLayers > 1) From 5259d66b7487b94233821e28aafb0683ae3f1df6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 15:04:45 +0200 Subject: [PATCH 168/664] dockerTools: Allow omitting all store paths Adds includeStorePaths, allowing the omission of the store paths. You generally want to leave it on, but tooling may disable this to insert the store paths more efficiently via other means, such as bind mounting the host store. --- nixos/tests/docker-tools.nix | 14 ++++++++++++++ pkgs/build-support/docker/default.nix | 12 +++++++++++- pkgs/build-support/docker/examples.nix | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 39b97b4cb997..831ef2fb77ad 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -20,6 +20,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.wait_for_unit("sockets.target") + with subtest("includeStorePath"): + with subtest("assumption"): + docker.succeed("${examples.helloOnRoot} | docker load") + docker.succeed("set -euo pipefail; docker run --rm hello | grep -i hello") + docker.succeed("docker image rm hello:latest") + with subtest("includeStorePath = false; breaks example"): + docker.succeed("${examples.helloOnRootNoStore} | docker load") + docker.fail("set -euo pipefail; docker run --rm hello | grep -i hello") + docker.succeed("docker image rm hello:latest") + with subtest("includeStorePath = false; works with mounted store"): + docker.succeed("${examples.helloOnRootNoStore} | docker load") + docker.succeed("set -euo pipefail; docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello") + docker.succeed("docker image rm hello:latest") + with subtest("Ensure Docker images use a stable date by default"): docker.succeed( "docker load --input='${examples.bash}'" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5e66c81e4ff9..5bbf1b63f2b0 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -37,6 +37,10 @@ let + inherit (lib) + optionals + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; in '' @@ -787,6 +791,10 @@ rec { # We pick 100 to ensure there is plenty of room for extension. I # believe the actual maximum is 128. maxLayers ? 100, + # Whether to include store paths in the image. You generally want to leave + # this on, but tooling may disable this to insert the store paths more + # efficiently via other means, such as bind mounting the host store. + includeStorePaths ? true, }: assert (lib.assertMsg (maxLayers > 1) @@ -834,7 +842,9 @@ rec { ''; }; - closureRoots = [ baseJson ] ++ contentsList; + closureRoots = optionals includeStorePaths /* normally true */ ( + [ baseJson ] ++ contentsList + ); overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); # These derivations are only created as implementation details of docker-tools, diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 7dbee38feeb4..de90eab3ea1d 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -516,4 +516,29 @@ rec { bash layeredImageWithFakeRootCommands ]; + + helloOnRoot = pkgs.dockerTools.streamLayeredImage { + name = "hello"; + tag = "latest"; + contents = [ + (pkgs.buildEnv { + name = "hello-root"; + paths = [ pkgs.hello ]; + }) + ]; + config.Cmd = [ "hello" ]; + }; + + helloOnRootNoStore = pkgs.dockerTools.streamLayeredImage { + name = "hello"; + tag = "latest"; + contents = [ + (pkgs.buildEnv { + name = "hello-root"; + paths = [ pkgs.hello ]; + }) + ]; + config.Cmd = [ "hello" ]; + includeStorePaths = false; + }; } From 4b6ff1c9876e23a1ccc3a7f1398d54af5fead600 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 15:44:01 +0200 Subject: [PATCH 169/664] python3Packages.connect-box: 0.2.8 -> 0.3.0 --- pkgs/development/python-modules/connect_box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/connect_box/default.nix b/pkgs/development/python-modules/connect_box/default.nix index 6c92ac025d8d..cfcb1d946824 100644 --- a/pkgs/development/python-modules/connect_box/default.nix +++ b/pkgs/development/python-modules/connect_box/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "connect-box"; - version = "0.2.8"; + version = "0.3.0"; src = fetchPypi { pname = "connect_box"; inherit version; - sha256 = "1lvz7g2f0a9ifnjczmbavn105miirdgyayr4sixhzgdgadcdhz3l"; + sha256 = "sha256-d1KqVKaHlZDm2o1GJ7r8KoONwfd1lxXexJxavCvjfW8="; }; propagatedBuildInputs = [ From dd7ad31f5d41fc6c16ec196003d27a5f525b7e07 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 26 May 2021 10:07:44 -0400 Subject: [PATCH 170/664] cloudflared: 2021.5.9 -> 2021.5.10 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 686d99511317..153f0a9cb990 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.5.9"; + version = "2021.5.10"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-Ojbn4QRNZWkSF9RUtFt7roGbt/6l5SFAqEXBCcTJvRI="; + sha256 = "sha256-v/ehqaI3TPhHACtxU8PRB9tGp8qrl6AN6buxOhJdevI="; }; vendorSha256 = null; From 09555c2a8491d5d627353721f987dfa7e53a5d17 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 20 May 2021 19:38:28 +0000 Subject: [PATCH 171/664] polkadot: 0.9.2 -> 0.9.3 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 99498c73d996..105686777db2 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-lxkLRJYdP30JNDHwa7tpugyIObmnjIBQ/HMGw6deElo="; + sha256 = "sha256-BxBrgcAJm6KM6ha494xlwiLYOSAr71gDFgqlH5RPqMM="; }; - cargoSha256 = "0gg42b6h8782wny3dr9gc38wl6bybyf4smashchgrpc649ds6w0a"; + cargoSha256 = "131fkdazcspblzblmd9nhkymwn7qh6lhaqvi1jqnsq4951l9f4ms"; nativeBuildInputs = [ clang ]; From 12ea274a74c29f6df5017e006631b9c5f211209c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 17:56:24 +0200 Subject: [PATCH 172/664] python3Packages.hatasmota: 0.2.13 -> 0.2.14 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 0164e84f8f77..abfc4523965f 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-RzBEiO8IfeMls7ssCZ2yhL78UVrpZykwDl1IUshqOu8="; + sha256 = "sha256-sCGUlEN1ejWhc2+9JRQ7UPqueq30u8gGSPRxbs4cnLE="; }; propagatedBuildInputs = [ From 2353879e8d34eba42e3c4d236ae56e7736ac7d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 26 May 2021 07:41:48 +0200 Subject: [PATCH 173/664] toppler: fix darwin build --- pkgs/games/toppler/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index 08baf2ab6fd2..ffe807410bb4 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { zlib ]; + # The conftest hangs on Hydra runners, because they are not logged in. + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + meta = with lib; { description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; homepage = "http://toppler.sourceforge.net/"; From 5fa469b6f2f599a7869de69e6a994059d750ac92 Mon Sep 17 00:00:00 2001 From: "Hedtke, Moritz" Date: Wed, 26 May 2021 18:26:16 +0200 Subject: [PATCH 174/664] wordpress: 5.7.1 -> 5.7.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 8ad888e759b6..7dbf4054ef27 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4"; + sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk="; }; installPhase = '' From d7de7087fcc62b0c571825d5aa3d096c277c1d41 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 26 May 2021 03:49:11 +0200 Subject: [PATCH 175/664] weechatScripts.wee-slack: 2.7.0 -> 2.8.0 https://github.com/wee-slack/wee-slack/releases/tag/v2.8.0 --- .../0001-hardcode-json-file-path.patch | 35 ------------------- .../irc/weechat/scripts/wee-slack/default.nix | 11 +++--- .../weechat/scripts/wee-slack/libpath.patch | 14 ++++---- .../scripts/wee-slack/load_weemoji_path.patch | 25 +++++++++++++ 4 files changed, 39 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch create mode 100644 pkgs/applications/networking/irc/weechat/scripts/wee-slack/load_weemoji_path.patch diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch deleted file mode 100644 index 45e620db258d..000000000000 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5dd2593369645b11a9dc03e1930617d2f5dbd039 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Wed, 11 Nov 2020 11:48:49 +0100 -Subject: [PATCH] hardcode json file path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - wee_slack.py | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/wee_slack.py b/wee_slack.py -index a3d779c..5942289 100644 ---- a/wee_slack.py -+++ b/wee_slack.py -@@ -5136,13 +5136,7 @@ def create_slack_debug_buffer(): - - def load_emoji(): - try: -- weechat_dir = w.info_get('weechat_dir', '') -- weechat_sharedir = w.info_get('weechat_sharedir', '') -- local_weemoji, global_weemoji = ('{}/weemoji.json'.format(path) -- for path in (weechat_dir, weechat_sharedir)) -- path = (global_weemoji if os.path.exists(global_weemoji) and -- not os.path.exists(local_weemoji) else local_weemoji) -- with open(path, 'r') as ef: -+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef: - emojis = json.loads(ef.read()) - if 'emoji' in emojis: - print_error('The weemoji.json file is in an old format. Please update it.') --- -2.29.0 - diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 679e278c8a09..698ee80edf60 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-6Z/H15bKe0PKpNe9PCgc5mLOii3CILCAVon7EgzIkx8="; + sha256 = "0xfklr0gsc9jgxfyrrb2j756lclz9g8imcb0pk0xgyj8mhsw23zk"; }; patches = [ @@ -16,10 +16,13 @@ stdenv.mkDerivation rec { src = ./libpath.patch; env = "${buildEnv { name = "wee-slack-env"; - paths = with python3Packages; [ websocket_client six ]; + paths = with python3Packages; [ + websocket_client + six + ]; }}/${python3Packages.python.sitePackages}"; }) - ./0001-hardcode-json-file-path.patch + ./load_weemoji_path.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch index af2dd36b41c5..a6e38c16fb14 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch @@ -1,13 +1,13 @@ diff --git a/wee_slack.py b/wee_slack.py -index dbe6446..d1b7546 100644 +index e4716b4..f673b7c 100644 --- a/wee_slack.py +++ b/wee_slack.py -@@ -25,6 +25,8 @@ import random - import socket - import string +@@ -31,6 +31,8 @@ import string + # See https://github.com/numpy/numpy/issues/11925 + sys.modules["numpy"] = None +sys.path.append('@env@') + - from websocket import ABNF, create_connection, WebSocketConnectionClosedException - - try: + from websocket import ( # noqa: E402 + ABNF, + create_connection, diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/load_weemoji_path.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/load_weemoji_path.patch new file mode 100644 index 000000000000..1e97dc32fa65 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/load_weemoji_path.patch @@ -0,0 +1,25 @@ +diff --git a/wee_slack.py b/wee_slack.py +index e4716b4..ffd122d 100644 +--- a/wee_slack.py ++++ b/wee_slack.py +@@ -6092,19 +6092,7 @@ def create_slack_debug_buffer(): + + def load_emoji(): + try: +- weechat_dir = w.info_get("weechat_data_dir", "") or w.info_get( +- "weechat_dir", "" +- ) +- weechat_sharedir = w.info_get("weechat_sharedir", "") +- local_weemoji, global_weemoji = ( +- "{}/weemoji.json".format(path) for path in (weechat_dir, weechat_sharedir) +- ) +- path = ( +- global_weemoji +- if os.path.exists(global_weemoji) and not os.path.exists(local_weemoji) +- else local_weemoji +- ) +- with open(path, "r") as ef: ++ with open("@out@/share/wee-slack/weemoji.json", "r") as ef: + emojis = json.loads(ef.read()) + if "emoji" in emojis: + print_error( From 45f20b85679f1b99f3c06d3bd76b5cda2e4010f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 19:30:26 +0200 Subject: [PATCH 176/664] mubeng: init at 0.4.5 --- pkgs/tools/networking/mubeng/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/mubeng/default.nix diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix new file mode 100644 index 000000000000..11ebe338c90b --- /dev/null +++ b/pkgs/tools/networking/mubeng/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mubeng"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "kitabisa"; + repo = pname; + rev = "v${version}"; + sha256 = "03hm4wqlvsbi06g0ijrhvbk9i2ahmd1m8l80wbcijznhbdl5msl8"; + }; + + vendorSha256 = "1qcxix6724ly0klsr8bw3nv6pxn0wixqiqcgqkcp6sia4dxbbg14"; + + meta = with lib; { + description = "Proxy checker and IP rotator"; + homepage = "https://github.com/kitabisa/mubeng"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4f1a3d25583..220d88a74445 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6914,6 +6914,8 @@ in mt-st = callPackage ../tools/backup/mt-st {}; + mubeng = callPackage ../tools/networking/mubeng { }; + multitime = callPackage ../tools/misc/multitime { }; sta = callPackage ../tools/misc/sta {}; From f6c24c5d7dbbd7f1dc20329125df01a2a26c1a6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 20:08:07 +0200 Subject: [PATCH 177/664] python3Packages.xkcdpass: 1.17.6 -> 1.19.2 --- pkgs/development/python-modules/xkcdpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index e372a843cf84..233f77613fe8 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.17.6"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy"; + sha256 = "sha256-F7977Tb8iu/pRy6YhginJgK0N0G3CjPpHjomLTFf1F8="; }; nativeBuildInputs = [ installShellFiles ]; From 5123bf1f746b3e47ef4374508e29c8229e5e462f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 26 May 2021 21:17:36 +0200 Subject: [PATCH 178/664] emacsWithPackages: Fix auto-complete-clang-async and irony --- .../editors/emacs/elisp-packages/melpa-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 79290b5859ef..e55a920e36a1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -80,8 +80,8 @@ let auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; - CFLAGS = "-I${pkgs.llvmPackages.clang}/include"; - LDFLAGS = "-L${pkgs.llvmPackages.clang}/lib"; + CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; + LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; }); # part of a larger package @@ -195,7 +195,7 @@ let dontUseCmakeBuildDir = true; doCheck = true; packageRequires = [ self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.clang ]; + nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.libclang ]; }); # tries to write a log file to $HOME From 1a87d5544c88fa6e72800ea7bc3d524b76926af9 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Wed, 26 May 2021 21:28:27 +0100 Subject: [PATCH 179/664] snippetpixie: 1.5.1 -> 1.5.2 --- pkgs/tools/text/snippetpixie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 935f593177bb..6cd6bdda0d9d 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "047ghk0zfmcsnbr4h2h5ar7g1sw2mnk8r2887v81dh3vf767rqg2"; + sha256 = "173fm9h7lnhhbg5qbjz40g0fy60dwd2l55mdcc1j8dh73vz96pfr"; }; nativeBuildInputs = [ From 2a190d26fc8615065a2e810fa718828e359cdd41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 May 2021 20:56:13 +0000 Subject: [PATCH 180/664] goaccess: 1.4.6 -> 1.5 --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 5ccf4b96d818..6f0c90517da4 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.5"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx"; + sha256 = "sha256-liJtXfiXAyg+NBCcF+G07v4kBKWefHaitu76EPOqwWE="; }; configureFlags = [ From e71c4f4628d0b5cce28f1a23c0c41eaffb6b1fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 May 2021 23:11:31 +0200 Subject: [PATCH 181/664] vmTools: update current lts versions of ubuntu --- pkgs/build-support/vm/default.nix | 107 ++++++++++-------------------- 1 file changed, 34 insertions(+), 73 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index f6be1b299f61..1ea8814bd65c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -822,45 +822,6 @@ rec { /* The set of supported Dpkg-based distributions. */ debDistros = { - - # Interestingly, the SHA-256 hashes provided by Ubuntu in - # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are - # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. - - ubuntu1204i386 = { - name = "ubuntu-12.04-precise-i386"; - fullName = "Ubuntu 12.04 Precise (i386)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2"; - sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2"; - sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1204x86_64 = { - name = "ubuntu-12.04-precise-amd64"; - fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2"; - sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2"; - sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - ubuntu1404i386 = { name = "ubuntu-14.04-trusty-i386"; fullName = "Ubuntu 14.04 Trusty (i386)"; @@ -929,40 +890,6 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1710i386 = { - name = "ubuntu-17.10-artful-i386"; - fullName = "Ubuntu 17.10 Artful (i386)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz"; - sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz"; - sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1710x86_64 = { - name = "ubuntu-17.10-artful-amd64"; - fullName = "Ubuntu 17.10 Artful (amd64)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz"; - sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz"; - sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - ubuntu1804i386 = { name = "ubuntu-18.04-bionic-i386"; fullName = "Ubuntu 18.04 Bionic (i386)"; @@ -997,6 +924,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu2004i386 = { + name = "ubuntu-20.04-focal-i386"; + fullName = "Ubuntu 20.04 Focal (i386)"; + packagesLists = + [ (fetchurl { + url = "mirror://ubuntu/dists/focal/main/binary-i386/Packages.xz"; + sha256 = "sha256-7RAYURoN3RKYQAHpwBS9TIV6vCmpURpphyMJQmV4wLc="; + }) + (fetchurl { + url = "mirror://ubuntu/dists/focal/universe/binary-i386/Packages.xz"; + sha256 = "sha256-oA551xVE80volUPgkMyvzpQ1d+GhuZd4DAe7dXZnULM="; + }) + ]; + urlPrefix = "mirror://ubuntu"; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu2004x86_64 = { + name = "ubuntu-20.04-focal-amd64"; + fullName = "Ubuntu 20.04 Focal (amd64)"; + packagesLists = + [ (fetchurl { + url = "mirror://ubuntu/dists/focal/main/binary-amd64/Packages.xz"; + sha256 = "sha256-d1eSH/j+7Zw5NKDJk21EG6SiOL7j6myMHfXLzUP8mGE="; + }) + (fetchurl { + url = "mirror://ubuntu/dists/focal/universe/binary-amd64/Packages.xz"; + sha256 = "sha256-RqdG2seJvZU3rKVNsWgLnf9RwkgVMRE1A4IZnX2WudE="; + }) + ]; + urlPrefix = "mirror://ubuntu"; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian8i386 = { name = "debian-8.11-jessie-i386"; fullName = "Debian 8.11 Jessie (i386)"; From be0c41c8584799bc21bcc4091cf1f00805bdbc08 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 26 May 2021 18:21:53 -0300 Subject: [PATCH 182/664] rpi-imager: 1.6 -> 1.6.2 --- pkgs/tools/misc/rpi-imager/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 963a0832ef9f..c67dddf536fc 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,20 +16,20 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.6"; + version = "1.6.2"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw="; + sha256 = "sha256-ITn31ENEf2bysgJgV3u+NNPXk1pfIkUyJWIvS2DOrzY="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake util-linux ]; + buildInputs = [ curl libarchive - util-linux qtbase qtdeclarative qtsvg @@ -46,6 +46,7 @@ mkDerivation rec { meta = with lib; { description = "Raspberry Pi Imaging Utility"; homepage = "https://www.raspberrypi.org/software/"; + downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; maintainers = with maintainers; [ ymarkus ]; platforms = platforms.all; From 5bae3c6746d121e5acbdf3fda5fde31eac2d60d0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 26 May 2021 22:22:19 +0100 Subject: [PATCH 183/664] python3Packages.hdbscan: disable another flaky test --- pkgs/development/python-modules/hdbscan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 5264ff24890d..bf48d6cf5e76 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { "test_mem_vec_diff_clusters" "test_all_points_mem_vec_diff_clusters" "test_approx_predict_diff_clusters" + # another flaky test https://github.com/scikit-learn-contrib/hdbscan/issues/421 + "test_hdbscan_boruvka_balltree_matches" ]; meta = with lib; { From 391cde8d24c3ab27dc9764cf218bc1c84632b640 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 May 2021 23:44:09 +0200 Subject: [PATCH 184/664] python3Packages.pysonos: 0.0.49 -> 0.0.50 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 05411e0d7fb7..cdd5291af99d 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.49"; + version = "0.0.50"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f8MBf2E7kHzvdt7oBwdJZ91jlU6I5np1FhOmxgxbqYw="; + sha256 = "sha256-iyFdT+RH2dtMtD+jSLFuAVE1DIQn6k9ONLOXNFhpuHs="; }; propagatedBuildInputs = [ From 7101c28779656450a9807d0c6ea26f58a1e7178b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 May 2021 00:34:25 +0200 Subject: [PATCH 185/664] python3Packages.soco: 0.21.2 -> 0.22.3 --- .../python-modules/soco/default.nix | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index a72c413c1860..c1db4dd01582 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,58 +1,32 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, fetchpatch , graphviz , ifaddr -, isPy27 -, lib +, pythonOlder , mock , nix-update-script , pytestCheckHook , requests , requests-mock -, sphinx -, sphinx_rtd_theme -, toml , xmltodict }: buildPythonPackage rec { pname = "soco"; - version = "0.21.2"; - disabled = isPy27; + version = "0.22.3"; + disabled = pythonOlder "3.6"; - # N.B. We fetch from GitHub because the PyPI tarball doesn't contain the - # required files to run the tests. src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0="; + sha256 = "sha256-RCWXXk5aQQYqyxm65M96XBoMS5UlYqyAz3aM/DVghRw="; }; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch"; - sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4="; - }) - ]; - - # N.B. These exist because: - # 1. Upstream's pinning isn't well maintained, leaving dependency versions no - # longer in nixpkgs. - # 2. There is no benefit for us to be running linting and coverage tests. - postPatch = '' - sed -i "/black/d" ./requirements-dev.txt - sed -i "/coveralls/d" ./requirements-dev.txt - sed -i "/flake8/d" ./requirements-dev.txt - sed -i "/pylint/d" ./requirements-dev.txt - sed -i "/pytest-cov/d" ./requirements-dev.txt - ''; - propagatedBuildInputs = [ ifaddr requests - toml xmltodict ]; @@ -61,10 +35,10 @@ buildPythonPackage rec { graphviz mock requests-mock - sphinx - sphinx_rtd_theme ]; + pythonImportsCheck = [ "soco" ]; + passthru.updateScript = nix-update-script { attrPath = "python3Packages.${pname}"; }; From b4711d8af5eb92c1130f4cccd1074cb9c71cb8d3 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 23 May 2021 14:02:27 +0800 Subject: [PATCH 186/664] linux_xanmod: 5.12.5 -> 5.12.7 --- .../os-specific/linux/kernel/linux-xanmod.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index eecdc09ca201..bb70221c791b 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,27 +1,27 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.5"; + version = "5.12.7"; suffix = "xanmod1-cacule"; in - buildLinux (args // rec { - modDirVersion = "${version}-${suffix}"; - inherit version; +buildLinux (args // rec { + modDirVersion = "${version}-${suffix}"; + inherit version; - src = fetchFromGitHub { - owner = "xanmod"; - repo = "linux"; - rev = modDirVersion; - sha256 = "sha256-u9ebl2M8zrCNdangcUdk/78KwPCYV41PIB6YKTqCgIY="; - extraPostFetch = '' - rm $out/.config - ''; - }; + src = fetchFromGitHub { + owner = "xanmod"; + repo = "linux"; + rev = modDirVersion; + sha256 = "sha256-zwaCQ0qMp6LCyWZikyyDyTktBlYEvJqJX46uiRCOUz4="; + extraPostFetch = '' + rm $out/.config + ''; + }; - extraMeta = { - branch = "5.12-cacule"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; - description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; - broken = stdenv.hostPlatform.isAarch64; - }; - } // (args.argsOverride or { })) + extraMeta = { + branch = "5.12-cacule"; + maintainers = with lib.maintainers; [ fortuneteller2k ]; + description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; + broken = stdenv.hostPlatform.isAarch64; + }; +} // (args.argsOverride or { })) From f45e3e90752a2b637777ade733ee0ce8bb6bf8af Mon Sep 17 00:00:00 2001 From: Victor Luft Date: Wed, 26 May 2021 21:32:07 -0400 Subject: [PATCH 187/664] sublime-merge-dev: 2047 -> 2055 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 1ca04a1634a2..d55009c4ec8b 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2046"; - sha256 = "04laygxr4vm6mawlfmdn2vj0dwj1swab39znsgb1d6rhysz62kjd"; + buildVersion = "2055"; + sha256 = "0f5qmxs5cqgdp7gav223ibjwbcrh8bszk1yg1a6hpz8s8j3icvdi"; dev = true; } {}; } From b32f22110cd08354b6212840462077abb95de867 Mon Sep 17 00:00:00 2001 From: Victor Luft Date: Wed, 26 May 2021 21:32:22 -0400 Subject: [PATCH 188/664] sublime-merge: 2047 -> 2056 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index d55009c4ec8b..33716a48fb08 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2047"; - sha256 = "03a0whifhx9py25l96xpqhb4p6hi9qmnrk2bxz6gh02sinsp3mia"; + buildVersion = "2056"; + sha256 = "08472214kazx9fdw7y8gy0bp63mqxcpa79myn2w95wdp0mrlr119"; } {}; sublime-merge-dev = common { From a404eb2a02ef9a02ea42e16431bbedd6bca53ccb Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 26 May 2021 22:09:18 -0400 Subject: [PATCH 189/664] handbrake: fix audio when linking with ffmpeg-4.4 Handbrake rips do not include working audio without this upstream patch. --- pkgs/applications/video/handbrake/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index faa3113690ad..5007f7419aeb 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,7 +7,7 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchFromGitHub, +{ stdenv, lib, fetchFromGitHub, fetchpatch, # Main build tools pkg-config, autoconf, automake, libtool, m4, xz, python3, numactl, @@ -58,6 +58,15 @@ stdenv.mkDerivation rec { ''; }; + # Remove with a release after 1.3.3 + patches = [ + (fetchpatch { + name = "audio-fix-ffmpeg-4_4"; + url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch"; + sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz"; + }) + ]; + # we put as little as possible in src.extraPostFetch as it's much easier to # add to it here without having to fiddle with src.sha256 # only DATE and HASH are absolutely necessary From 361a54ac31ec06f8de8fb9c047516b7cb9aa3b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 27 May 2021 00:17:21 -0300 Subject: [PATCH 190/664] nordic: 1.9.0 -> 2021-05-21 (#123928) Co-authored-by: Sandro --- pkgs/data/themes/nordic/default.nix | 82 +++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 1d8ceec3d1ba..dcda14977a7f 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -1,33 +1,56 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "nordic"; - version = "1.9.0"; + version = "unstable-2021-05-21"; srcs = [ - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; - sha256 = "12x13h9w4yqk56a009zpj1kq3vn2hn290xryfv1b0vyf2r45rsn7"; + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "7e4f95ddaa8d94a66ed11a3b939cbd10864f1610"; + sha256 = "079gf8gxn1d2j44nhx4jzx2hz8hpsid7xwh414fjl3g2avb7n05a"; + name = "Nordic"; }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "0f38nx1rvp9l6xz62yx6cbab4im8d425gxr52jkc8gfqpl5lrf0q"; + + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "0b4197e281ba306ac4918cabbd83003c38c0067d"; + sha256 = "1w85i2fbils2ivwsa85g1asj2nx0p0cak840nyr58hdwky49ci5p"; + name = "Nordic-standard-buttons"; }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker.tar.xz"; - sha256 = "0frp0jf7hbiapl3m67av7rbm3sx8db52zi3j01k2hysh6kba7x33"; + + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "aba3c78910de8a47950a0b2defb8022c615d91f6"; + sha256 = "1746w0iahmdgw3kj1q2cswf12pf0ln7qq1grfz9sn8rjafzjchj8"; + name = "Nordic-darker"; }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker-standard-buttons.tar.xz"; - sha256 = "0grfsjr9kq0lszmqxvjvpgvf4avm34446nqykz1zfpdg50j7r54b"; + + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "9946dd747e1ea05782e084d2c2d94e2e4c7605ac"; + sha256 = "0mz1l1h26zhv0pnsbs0rx0xrwrn2y8g3ik0aa8ww5f411vvzgfr5"; + name = "Nordic-darker-standard-buttons"; }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent.tar.xz"; - sha256 = "0zndldwavir22ay2r0jazpikzzww3hc09gsmbiyjmw54v29qhl9r"; + + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "5c0be5a783cd14af5c7647ca13d946c64e03561d"; + sha256 = "0751z3b9s0ycrsha20jx8lhdgvggcl0rdgv975dpaiqqjqyd9z06"; + name = "Nordic-bluish-accent"; }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; - sha256 = "1b9d2fvdndyh7lh3xhmc75csfbapl4gv59y7wy15k2awisvlvz07"; + + (fetchFromGitHub { + owner = "EliverLara"; + repo = pname; + rev = "9cb8d9f786614579e59ec2c3dd9fd8dd9b56316e"; + sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7"; + name = "Nordic-bluish-accent-standard-buttons"; }) ]; @@ -36,15 +59,28 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a Nordic* $out/share/themes - rm $out/share/themes/*/{LICENSE,README.md} + rm -r $out/share/themes/*/.gitignore + rm -r $out/share/themes/*/Art + rm -r $out/share/themes/*/LICENSE + rm -r $out/share/themes/*/README.md + rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js} + rm -r $out/share/themes/*/src + rm -r $out/share/themes/*/cinnamon/*.scss + rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} + rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} + rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} + rm -r $out/share/themes/*/kde + rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + runHook postInstall ''; meta = with lib; { - description = "Dark Gtk theme created using the awesome Nord color pallete"; + description = "Dark Gtk theme using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; From a1ddc216083ab538aa807cb2376c37f535683ee6 Mon Sep 17 00:00:00 2001 From: Philipp Eder Date: Thu, 27 May 2021 05:25:03 +0200 Subject: [PATCH 191/664] maintainers: add nichtsfrei --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0130499a993d..5e377e866403 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7165,6 +7165,12 @@ githubId = 10180857; name = "Anmol Sethi"; }; + nichtsfrei = { + email = "philipp.eder@posteo.net"; + github = "nichtsfrei"; + githubId = 1665818; + name = "Philipp Eder"; + }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; From 669ee721ee8482c712a4306876f7b9f83966a1dc Mon Sep 17 00:00:00 2001 From: Philipp Eder Date: Thu, 27 May 2021 05:26:41 +0200 Subject: [PATCH 192/664] cgreen: init at 1.4.0 Cgreen is a modern unit test and mocking framework for C and C++ --- pkgs/development/libraries/cgreen/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/cgreen/default.nix diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix new file mode 100644 index 000000000000..5a1dd2d26400 --- /dev/null +++ b/pkgs/development/libraries/cgreen/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "cgreen"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "cgreen-devs"; + repo = "cgreen"; + rev = version; + sha256 = "JEpvkM0EZiiQUZRngICNxHbNqS/qjqkEdMPckGbdWac="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/cgreen-devs/cgreen"; + description = "The Modern Unit Test and Mocking Framework for C and C++"; + license = licenses.isc; + maintainers = [ maintainers.nichtsfrei ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7f04f175923..99dd5ae08955 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3483,6 +3483,8 @@ in cfdg = callPackage ../tools/graphics/cfdg { }; + cgreen = callPackage ../development/libraries/cgreen { }; + checkinstall = callPackage ../tools/package-management/checkinstall { }; checkmake = callPackage ../development/tools/checkmake { }; From 5d3f6739e5abbd1c32dc44fa782297fda70aac00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Thu, 27 May 2021 05:28:31 +0200 Subject: [PATCH 193/664] kubeone: init at 1.2.1 (#124238) Co-authored-by: Sandro --- .../networking/cluster/kubeone/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubeone/default.nix diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix new file mode 100644 index 000000000000..4876233cd29f --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "kubeone"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "kubermatic"; + repo = "kubeone"; + rev = "v${version}"; + sha256 = "1abm7735c4pjv31pfggkvia7br19zbhjpp2w0n5zckwrjm9hxns6"; + }; + + vendorSha256 = "01rl4sd9prfw4ivx7dwrr9irjr0xryihp4fzpcjd2zg8f1ibkwsn"; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd kubeone \ + --bash <($out/bin/kubeone completion bash) \ + --zsh <($out/bin/kubeone completion zsh) + ''; + + meta = { + description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments."; + homepage = "https://kubeone.io/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lblasc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8fe2779c16..23777a323c0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13443,6 +13443,8 @@ in kubei = callPackage ../tools/security/kubei { }; + kubeone = callPackage ../applications/networking/cluster/kubeone { }; + kubeprompt = callPackage ../development/tools/kubeprompt { }; kubesec = callPackage ../tools/security/kubesec { }; From 91233c46e36ef775e0ef92b4be0b810598d9b800 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:45 +0200 Subject: [PATCH 194/664] linux: 4.14.233 -> 4.14.234 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5108eaaf6965..588041587619 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.233"; + version = "4.14.234"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; + sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From bd12ba96439e67cf75ec94773b7b2b5fc5f6079b Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:51 +0200 Subject: [PATCH 195/664] linux: 4.19.191 -> 4.19.192 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d5e998ac194e..23d651e21da4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.191"; + version = "4.19.192"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; + sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 819f6a5d8cf82857e9cc4f17879a68c944747bdf Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:06 +0200 Subject: [PATCH 196/664] linux: 4.4.269 -> 4.4.270 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 05fb7a88d4a8..8320c2fb9ce6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.269"; + version = "4.4.270"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; + sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 7d57471efa5d1b36f44084709e77c087ee8629f7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:11 +0200 Subject: [PATCH 197/664] linux: 4.9.269 -> 4.9.270 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5e1318675bd4..7dda6f5356dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.269"; + version = "4.9.270"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; + sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From bed18f50193d35c43408682837c7f96f30717c22 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:17 +0200 Subject: [PATCH 198/664] linux: 5.10.39 -> 5.10.40 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index afd8f21382bc..ae8f50953070 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.39"; + version = "5.10.40"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; + sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 01cc705d4a07ef89a8aa7806fdf2366360237c3e Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:22 +0200 Subject: [PATCH 199/664] linux: 5.12.6 -> 5.12.7 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 4e7142b4a31c..80a25ad23965 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.6"; + version = "5.12.7"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; + sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From c16011b1d9f92d6bf68064fc0e12b66b4c6ad48f Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:27 +0200 Subject: [PATCH 200/664] linux: 5.4.121 -> 5.4.122 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a5eb04751f99..a245ee7c44ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.121"; + version = "5.4.122"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; + sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 52e8c2d1650de8760c2cd93f67f45f559e00cdfe Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:54 +0200 Subject: [PATCH 201/664] linux/hardened/patches/4.14: 4.14.233-hardened1 -> 4.14.234-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ed9dc68e885a..2538bb22d51d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.233-hardened1.patch", - "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" + "name": "linux-hardened-4.14.234-hardened1.patch", + "sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 938ea32339ada0492d545542123e68e8833986c7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:56 +0200 Subject: [PATCH 202/664] linux/hardened/patches/4.19: 4.19.191-hardened1 -> 4.19.192-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2538bb22d51d..3ba8e4e71c60 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.191-hardened1.patch", - "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" + "name": "linux-hardened-4.19.192-hardened1.patch", + "sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 46ca914a5e4b8aa4cd184cd5a514200f224a5d06 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:57 +0200 Subject: [PATCH 203/664] linux/hardened/patches/5.10: 5.10.39-hardened1 -> 5.10.40-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3ba8e4e71c60..44be0d6a460b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.39-hardened1.patch", - "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" + "name": "linux-hardened-5.10.40-hardened1.patch", + "sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" }, "5.11": { "extra": "-hardened1", From cdc6a4cc1e858d299e20e4cb90df427ac15411cc Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:59 +0200 Subject: [PATCH 204/664] linux/hardened/patches/5.12: 5.12.6-hardened1 -> 5.12.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 44be0d6a460b..fed73c80f918 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.6-hardened1.patch", - "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + "name": "linux-hardened-5.12.7-hardened1.patch", + "sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 1ce119e9bb3ada25ad7f9fcfb7565194a4faffdb Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:29:00 +0200 Subject: [PATCH 205/664] linux/hardened/patches/5.4: 5.4.121-hardened1 -> 5.4.122-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fed73c80f918..6cf635da18b3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.121-hardened1.patch", - "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" + "name": "linux-hardened-5.4.122-hardened1.patch", + "sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" } } From 364e6e634b9d8f44ce68677f7cf1186eaea22c77 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 21 May 2021 10:29:29 +0900 Subject: [PATCH 206/664] subversion: update libtool to fix build on aarch64-darwin --- .../version-management/subversion/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 042dafbb6745..6411e834327c 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,6 +6,7 @@ , javahlBindings ? false , saslSupport ? false , lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc +, autoconf, libtool , apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , sasl ? null, serf ? null }: @@ -16,6 +17,8 @@ assert pythonBindings -> swig != null && python3 != null && py3c != null; assert javahlBindings -> jdk != null && perl != null; let + # Update libtool for macOS 11 support + needsAutogen = stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11"; common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec { inherit version; @@ -29,6 +32,8 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = lib.optionals needsAutogen [ autoconf libtool python3 ]; + buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ] ++ lib.optional httpSupport serf ++ lib.optionals pythonBindings [ python3 py3c ] @@ -42,6 +47,10 @@ let # "-P" CPPFLAG is needed to build Python bindings and subversionClient CPPFLAGS = [ "-P" ]; + preConfigure = lib.optionalString needsAutogen '' + ./autogen.sh + ''; + configureFlags = [ (lib.withFeature bdbSupport "berkeley-db") (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") From eb0034927d08e2c63675b6a90a9219472356fd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 May 2021 23:12:03 +0200 Subject: [PATCH 207/664] vmTools: update current maintained debian versions Co-authored-by: Sandro --- pkgs/build-support/vm/default.nix | 60 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 1ea8814bd65c..cfc19c03cfdd 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -958,51 +958,49 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian8i386 = { - name = "debian-8.11-jessie-i386"; - fullName = "Debian 8.11 Jessie (i386)"; - packagesList = fetchurl { - url = "mirror://debian/dists/jessie/main/binary-i386/Packages.xz"; - sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; - }; - - debian8x86_64 = { - name = "debian-8.11-jessie-amd64"; - fullName = "Debian 8.11 Jessie (amd64)"; - packagesList = fetchurl { - url = "mirror://debian/dists/jessie/main/binary-amd64/Packages.xz"; - sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; - }; - debian9i386 = { - name = "debian-9.8-stretch-i386"; - fullName = "Debian 9.8 Stretch (i386)"; + name = "debian-9.13-stretch-i386"; + fullName = "Debian 9.13 Stretch (i386)"; packagesList = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz"; - sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz"; + sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; debian9x86_64 = { - name = "debian-9.8-stretch-amd64"; - fullName = "Debian 9.8 Stretch (amd64)"; + name = "debian-9.13-stretch-amd64"; + fullName = "Debian 9.13 Stretch (amd64)"; packagesList = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz"; - sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz"; + sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; + debian10i386 = { + name = "debian-10.9-buster-i386"; + fullName = "Debian 10.9 Buster (i386)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz"; + sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; + debian10x86_64 = { + name = "debian-10.9-buster-amd64"; + fullName = "Debian 10.9 Buster (amd64)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz"; + sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; }; @@ -1129,7 +1127,7 @@ rec { "passwd" ]; - commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; + commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ]; /* A set of functions that build the Linux distributions specified From ca201dac1a23f38e9290a8153c96b2c4a6b1102b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 10:16:07 +0000 Subject: [PATCH 208/664] boundary: 0.2.2 -> 0.2.3 --- pkgs/tools/networking/boundary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 31fd2e70d4a8..32dcea9682a1 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.2.2"; + version = "0.2.3"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-K9WlOS9pRhBcoGaSZ3AhbGoTfKUrn4SDq50x6wnIib8="; - aarch64-linux = "sha256-BRm0Hy9vuxZSYINrPIMwl2UGZdWTSixLT8EJ1OzCGMg="; - x86_64-darwin = "sha256-pinmzz6GbQWAj3Ut/IB2o75w8X+CS2tXhE6nekYO4vc="; + x86_64-linux = "sha256-tfTyhuQaVh0F1HvFS+ToDk/lJEHEYMQVNFpdEjABer4="; + aarch64-linux = "sha256-0g6nYoNgu3C/r4fgKuZBrzTjpt14lQf2rpbVMS9CEZE="; + x86_64-darwin = "sha256-er1bDqi+PDucwUSsWDi8z1fUZTz7epq6HE6cOLTN3SE="; }; in fetchzip { From b5533ff868bf16f67460875ab7394dbfa306a334 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 03:00:59 +0000 Subject: [PATCH 209/664] ergo: 4.0.10 -> 4.0.11 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index c9761542da03..4f61be7dcee5 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.10"; + version = "4.0.11"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-o3+yL81WO5/UGh0gl4MOewPHTDch/Vij8mzZWOlEkjg="; + sha256 = "sha256-GzpYwytkWZBEIVmsOmK5RTJ7lPUfDeC1204FbK4O+XQ="; }; nativeBuildInputs = [ makeWrapper ]; From c30ec77e196fccb219cb1e3a13ec06d19c6d0fb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 04:37:51 +0000 Subject: [PATCH 210/664] helmfile: 0.139.6 -> 0.139.7 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 90aa94479961..6dacc008304f 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.6"; + version = "0.139.7"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-pAo8MmQqqSICB4rguhkGHJqyB9fBBzpp7NEaa59rVb4="; + sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A="; }; - vendorSha256 = "sha256-Hs09CT/KSwYL2AKLseOjWB5Xvvr5TvbzwDywsGQ9kMw="; + vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw="; doCheck = false; From 346f68bf71e3bed7d62ebf833d5338508585474e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 08:33:09 +0000 Subject: [PATCH 211/664] bacula: 11.0.2 -> 11.0.3 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index cb4f5874bac1..aca741175e57 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8="; + sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 13750b25a5970517a6794053fa673eace50d4c78 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 20 May 2021 16:52:08 -0400 Subject: [PATCH 212/664] kubernetes: fix generated kubeconfig The absence of current-context in the right place resulted in obscure bugs. The reason this has not been detected before can only be that it was unused. --- nixos/modules/services/cluster/kubernetes/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 0dc3649237b7..33d217ba60ed 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -48,8 +48,9 @@ let cluster = "local"; user = name; }; - current-context = "local"; + name = "local"; }]; + current-context = "local"; }); caCert = secret "ca"; From bfcd6bd009d279d644c237ae7b26cfe0aaccde27 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 26 May 2021 14:04:27 -0600 Subject: [PATCH 213/664] rpg-cli: init at 0.2.0 --- pkgs/games/rpg-cli/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/games/rpg-cli/default.nix diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix new file mode 100644 index 000000000000..1e07c3418fcc --- /dev/null +++ b/pkgs/games/rpg-cli/default.nix @@ -0,0 +1,27 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "rpg-cli"; + version = "unstable-2021-05-27"; + + src = fetchFromGitHub { + owner = "facundoolano"; + repo = pname; + # certain revision because the Cargo.lock was checked-in in that commit + rev = "4d8a1dac79a1d29d79c0c874475037769dcef5a1"; + sha256 = "sha256-qfj1uij9lYyfyHFUnVi9I0ELOoObjFG2NS9UreC/xio="; + }; + + cargoSha256 = "sha256-I+rSfuiGFdzA5zqPfvMPcERaQfiX92LW2NKjazWh9c4="; + + # tests assume the authors macbook, and thus fail + doCheck = false; + + meta = with lib; { + description = "Your filesystem as a dungeon"; + homepage = "https://github.com/facundoolano/rpg-cli"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + mainProgram = "rpg-cli"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d186e8e27f08..3bab2eae8da9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8242,6 +8242,8 @@ in rowhammer-test = callPackage ../tools/system/rowhammer-test { }; + rpg-cli = callPackage ../games/rpg-cli { }; + rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; From 14018b71dd5e3654d070e38ce59295e16a7d82ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 20:24:29 +0000 Subject: [PATCH 214/664] mavproxy: 1.8.36 -> 1.8.37 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 8d27446bd664..2652856511ea 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.36"; + version = "1.8.37"; src = fetchPypi { inherit pname version; - sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g"; + sha256 = "0527c65b55652a130c44c131cce5644cc5ac00a3f85edb81899f79f5e3ee16fb"; }; postPatch = '' From 089915f6349e0d08039c784268769ecc35a46ce2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 01:23:52 +0000 Subject: [PATCH 215/664] bowtie2: 2.4.3 -> 2.4.4 --- pkgs/applications/science/biology/bowtie2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 4f5872de07dd..205ff9afdca1 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ="; + sha256 = "sha256-2B6w6c/qztyBb1jNA0zg+udQm41ouT1DyB6Ygpi5nC8="; }; nativeBuildInputs = [ cmake ]; From 022465fba300ce5e6c76ff49ccd2f2f67d2fb531 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 May 2021 00:34:43 +0000 Subject: [PATCH 216/664] agate: 3.0.2 -> 3.0.3 --- pkgs/servers/gemini/agate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 953087721652..5585926da581 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk="; + sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU="; }; - cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; + cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From e6c78b6d8db88c8580579c7c00d01bf3ae573103 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 21:42:33 +0000 Subject: [PATCH 217/664] mediastreamer: 4.5.1 -> 4.5.15 --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index ea164dd481d3..452031dc9246 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.5.1"; + version = "4.5.15"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw"; + sha256 = "sha256-n/EuXEQ9nJKC32PMvWkfP1G+E6uQQuu1/A168n8/cIY="; }; patches = [ From db9740579e852ddf76888dfe748292c92868262e Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 26 May 2021 23:53:49 -0700 Subject: [PATCH 218/664] Add ocamlformat_18_0 as a toplevel alias Consistent with all other ocamlformat versions Signed-off-by: Rudi Grinberg --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16496656714f..23bd1620b399 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11533,7 +11533,7 @@ in ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0; orc = callPackage ../development/compilers/orc { }; From 044ba9b560ac3ddf74e2909b1a2810e1b66de6fa Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 27 May 2021 17:03:16 +1000 Subject: [PATCH 219/664] singularity: 3.7.3 -> 3.7.4 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index fe66df0c6d98..2610e1f0fc6a 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw="; + sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; }; goPackagePath = "github.com/sylabs/singularity"; From 70dc16dec8d78b0aef50d069c5801a5be5f95eb1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 27 May 2021 09:13:25 +0200 Subject: [PATCH 220/664] goattracker,goattracker-stereo: 2.75 -> 2.76, 2.76 -> 2.77 --- pkgs/applications/audio/goattracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 30bb4099233c..743417570c16 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -27,16 +27,16 @@ let in stdenv.mkDerivation rec { inherit pname; version = if isStereo - then "2.76" # stereo - else "2.75"; # normal + then "2.77" # stereo + else "2.76"; # normal src = fetchurl { url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo - then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo - else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal + then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo + else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal }; - sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; + sourceRoot = "src"; nativeBuildInputs = [ copyDesktopItems unzip imagemagick ]; buildInputs = [ SDL ]; From f96cff58df74ba4e0e6b50d9cd2cfb8cf863b421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 May 2021 09:31:10 +0200 Subject: [PATCH 221/664] fetchFromGitea: init --- pkgs/build-support/fetchgitea/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/build-support/fetchgitea/default.nix diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix new file mode 100644 index 000000000000..79804588cfe5 --- /dev/null +++ b/pkgs/build-support/fetchgitea/default.nix @@ -0,0 +1,7 @@ +# Gitea's URLs are compatible with GitHub + +{ lib, fetchFromGitHub }: + +{ domain, ... }@args: + +fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..4c5c0b454db4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -556,6 +556,8 @@ in fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; + fetchFromGitea = callPackage ../build-support/fetchgitea { }; + fetchFromGitHub = callPackage ../build-support/fetchgithub {}; fetchFromBitbucket = callPackage ../build-support/fetchbitbucket {}; From 0492987aea856d55f9c798c45935b69b97992faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:42:40 +0200 Subject: [PATCH 222/664] librttopo: init at 1.1.0 --- .../libraries/librttopo/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/librttopo/default.nix diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix new file mode 100644 index 000000000000..d349278d5f5d --- /dev/null +++ b/pkgs/development/libraries/librttopo/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitea +, autoreconfHook +, geos +}: + +stdenv.mkDerivation rec { + pname = "librttopo"; + version = "1.1.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitea { + domain = "git.osgeo.org/gitea"; + owner = "rttopo"; + repo = "librttopo"; + rev = "librttopo-${version}"; + sha256 = "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ geos ]; + + meta = with lib; { + description = "RT Topology Library"; + homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5c0b454db4..55971887b2a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16564,6 +16564,8 @@ in librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { }; + librttopo = callPackage ../development/libraries/librttopo { }; + libs3 = callPackage ../development/libraries/libs3 { }; libschrift = callPackage ../development/libraries/libschrift { }; From 06df299b9e85f62b94269d4c58b2384a66affc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:32:45 +0200 Subject: [PATCH 223/664] libspatialite: 4.3.0a -> 5.0.1 --- .../libraries/libspatialite/default.nix | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 2e9dadf0bf5d..592b7101a074 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,34 +1,54 @@ -{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }: - -with lib; +{ lib +, stdenv +, fetchurl +, pkg-config +, geos +, librttopo +, libxml2 +, minizip +, proj +, sqlite +, libiconv +}: stdenv.mkDerivation rec { - name = "libspatialite-4.3.0a"; + pname = "libspatialite"; + version = "5.0.1"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; - sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${pname}-${version}.tar.gz"; + sha256 = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; + buildInputs = [ + geos + librttopo + libxml2 + minizip + proj + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ]; configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; - CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - - postInstall = "" + optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/mod_spatialite.{so,dylib} ''; - meta = { + meta = with lib; { description = "Extensible spatial index library in C++"; homepage = "https://www.gaia-gis.it/fossil/libspatialite"; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; }; } From 1b4dc54d4011a1920effc11a6116bf2ac539ed37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 00:41:00 +0200 Subject: [PATCH 224/664] spatialite_tools: 4.1.1 -> 5.0.0 --- .../libraries/spatialite-tools/default.nix | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ffded04510b4..ee6d05247dc6 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ lib +, stdenv +, fetchurl +, pkg-config +, geos +, expat +, librttopo +, libspatialite +, libxml2 +, minizip +, proj +, readosm +, sqlite +}: stdenv.mkDerivation rec { - name = "spatialite-tools-4.1.1"; + pname = "spatialite-tools"; + version = "5.0.0"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; - sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${pname}-${version}.tar.gz"; + sha256 = "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; + + buildInputs = [ + expat + geos + librttopo + libspatialite + libxml2 + minizip + proj + readosm + sqlite + ]; configureFlags = [ "--disable-freexl" ]; @@ -17,10 +42,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lsqlite3"; - meta = { + meta = with lib; { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = lib.platforms.linux; + license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; }; } From 1ec7d100efd29b6e7dc1b953c115c5a98eda7c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 22:21:41 +0200 Subject: [PATCH 225/664] proj: build using CMake QMapShack relies on PROJ providing a CMake configuration. --- pkgs/development/libraries/proj/default.nix | 32 ++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 92119a8788d7..3bbc4c6da33a 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, sqlite +, libtiff +, curl +, gtest +}: stdenv.mkDerivation rec { pname = "proj"; @@ -11,19 +20,34 @@ stdenv.mkDerivation rec { sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; }; + postPatch = lib.optionalString (version == "7.2.1") '' + substituteInPlace CMakeLists.txt \ + --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" + ''; + outputs = [ "out" "dev"]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sqlite libtiff curl ]; + checkInputs = [ gtest ]; + + cmakeFlags = [ + "-DUSE_EXTERNAL_GTEST=ON" + ]; + doCheck = stdenv.is64bit; + preCheck = '' + export HOME=$TMPDIR + ''; + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ vbgl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl dotlambda ]; }; } From d4aa09175b1f1fcd0d1e5649e8b6faeac582d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 23:35:27 +0200 Subject: [PATCH 226/664] python3Packages.pyproj: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/pyproj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 2f4f26f03b43..98e3e802c6ee 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = version; - sha256 = "1q1i1235cp3k32dpb11r7krx5rpqwszb89mrx85rflc1z5acaj58"; + sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E="; }; # force pyproj to use ${proj} From 93f419b7a843f7239977fb974d48331ac6ab34dd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 25 May 2021 17:32:14 +0100 Subject: [PATCH 227/664] qgis: 3.16.6 -> 3.16.7 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3669cf0771b1..5b972ae5017f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.6"; + version = "3.16.7"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1vnz5kiyjircmhn4vq3fa5j2kvkxpwcsry7jc6nxl0w0dqx1zay1"; + sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p"; }; passthru = { From 187b6cd41f4d17a76b5afe23d81ad014d0d62f52 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 25 May 2021 17:54:56 +0100 Subject: [PATCH 228/664] postgis: 3.1.1 -> 3.1.2 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index f3f7a4a69114..81f3f4fee254 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.1"; + version = "3.1.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"; + sha256 = "0ch7gry8a1i9114mlhklxryn7ja3flsz6pxj9r5p09k92xh3gp9c"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From 90a8fbf146cbba06e631bc7fe26ac32f2ade9198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 23:10:45 +0200 Subject: [PATCH 229/664] python3Packages.python-mapnik: add pythonImportsCheck --- pkgs/development/python-modules/python-mapnik/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index b1b0c70d8602..228e0d74ebc2 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -63,6 +63,8 @@ in buildPythonPackage rec { ]); propagatedBuildInputs = [ pillow pycairo ]; + pythonImportsCheck = [ "mapnik" ] ; + meta = with lib; { description = "Python bindings for Mapnik"; homepage = "https://mapnik.org"; From 103d945f801a6e4c0a16faebaaeaa917d9e81f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 May 2021 21:17:35 +0200 Subject: [PATCH 230/664] qmapshack: 1.15.2 -> 1.16.0 https://github.com/Maproom/qmapshack/releases/tag/V_1.16.0 --- pkgs/applications/gis/qmapshack/default.nix | 11 +- .../qmapshack/pr350-support-quazip-1x.patch | 141 ------------------ 2 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index 30231e7135ac..d0d39e299aa2 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7"; + sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx"; }; nativeBuildInputs = [ cmake ]; @@ -20,13 +20,6 @@ mkDerivation rec { "-DROUTINO_XML_PATH=${routino}/share/routino" ]; - patches = [ - "${src}/FindPROJ4.patch" - - # Support QuaZip 1.x. - ./pr350-support-quazip-1x.patch - ]; - qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" ]; diff --git a/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch b/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch deleted file mode 100644 index 82ebed14dbbf..000000000000 --- a/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001 -From: kiozen -Date: Sat, 20 Mar 2021 12:14:29 +0100 -Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x - -Simply adjusted the cmake scripts ---- - CMakeLists.txt | 2 +- - src/qmapshack/CMakeLists.txt | 27 +++++++++++++-------------- - 3 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d2cf127..7420d9b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED) - find_package(PROJ REQUIRED) - find_package(JPEG REQUIRED) - find_package(ROUTINO REQUIRED) --find_package(QuaZip5 REQUIRED) -+find_package(QuaZip-Qt5 REQUIRED) - find_package(ALGLIB ) # optional as we can use our local version - - -diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt -index 08eeb183..9b3836d6 100644 ---- a/src/qmapshack/CMakeLists.txt -+++ b/src/qmapshack/CMakeLists.txt -@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH}) - # All source files needed to compile - ############################################################################################### - --set( SRCS -- CAbout.cpp -+set( SRCS -+ CAbout.cpp - CMainWindow.cpp - CSingleInstanceProxy.cpp - canvas/CCanvas.cpp -@@ -160,7 +160,7 @@ set( SRCS - gis/trk/CInvalidTrk.cpp - gis/trk/CKnownExtension.cpp - gis/trk/CListTrkPts.cpp -- gis/trk/CPropertyTrk.cpp -+ gis/trk/CPropertyTrk.cpp - gis/trk/CScrOptTrk.cpp - gis/trk/CSelectActivityColor.cpp - gis/trk/CTableTrk.cpp -@@ -272,7 +272,7 @@ set( SRCS - mouse/line/CLineOpMovePoint.cpp - mouse/line/CLineOpSelectRange.cpp - mouse/line/CScrOptEditLine.cpp -- mouse/line/CScrOptRangeLine.cpp -+ mouse/line/CScrOptRangeLine.cpp - mouse/line/ILineOp.cpp - mouse/line/IMouseEditLine.cpp - plot/CPlot.cpp -@@ -401,7 +401,7 @@ set( HDRS - gis/CGisListDB.h - gis/CGisListWks.h - gis/CGisWorkspace.h -- gis/CSelDevices.h -+ gis/CSelDevices.h - gis/IGisItem.h - gis/IGisLine.h - gis/Poi.h -@@ -512,7 +512,7 @@ set( HDRS - gis/trk/CInvalidTrk.h - gis/trk/CKnownExtension.h - gis/trk/CListTrkPts.h -- gis/trk/CPropertyTrk.h -+ gis/trk/CPropertyTrk.h - gis/trk/CScrOptTrk.h - gis/trk/CSelectActivityColor.h - gis/trk/CTableTrk.h -@@ -579,7 +579,7 @@ set( HDRS - map/CMapList.h - map/CMapMAP.h - map/CMapPathSetup.h -- map/CMapPropSetup.h -+ map/CMapPropSetup.h - map/CMapRMAP.h - map/CMapTMS.h - map/CMapVRT.h -@@ -655,7 +655,7 @@ set( HDRS - realtime/CRtSelectSource.h - realtime/CRtWorkspace.h - realtime/IRtInfo.h -- realtime/IRtRecord.h -+ realtime/IRtRecord.h - realtime/IRtSource.h - realtime/gpstether/CRtGpsTether.h - realtime/gpstether/CRtGpsTetherInfo.h -@@ -764,7 +764,7 @@ set( UIS - gis/search/IGeoSearchWebConfigDialog.ui - gis/search/ISearchExplanationDialog.ui - gis/summary/IGisSummary.ui -- gis/summary/IGisSummarySetup.ui -+ gis/summary/IGisSummarySetup.ui - gis/trk/ICombineTrk.ui - gis/trk/ICutTrk.ui - gis/trk/IDetailsTrk.ui -@@ -818,7 +818,7 @@ set( UIS - mouse/range/IActionSelect.ui - mouse/range/IRangeToolSetup.ui - mouse/range/IScrOptRangeTool.ui -- mouse/range/IScrOptRangeTrk.ui -+ mouse/range/IScrOptRangeTrk.ui - mouse/IScrOptRuler.ui - mouse/IScrOptSelect.ui - mouse/line/IScrOptEditLine.ui -@@ -899,7 +899,6 @@ include_directories( - ${PROJ_INCLUDE_DIRS} - ${ROUTINO_INCLUDE_DIRS} - ${ALGLIB_INCLUDE_DIRS} -- ${QUAZIP_INCLUDE_DIRS} - ) - - if(APPLE) -@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND) - - target_link_libraries(${APPLICATION_NAME} - Qt5::Widgets -- Qt5::Xml -+ Qt5::Xml - Qt5::Sql - Qt5::PrintSupport -- Qt5::UiTools -+ Qt5::UiTools - Qt5::Network - Qt5::WebEngineWidgets - Qt5::Qml -@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME} - ${PROJ_LIBRARIES} - ${ROUTINO_LIBRARIES} - ${ALGLIB_LIBRARIES} -- ${QUAZIP_LIBRARIES} -+ QuaZip::QuaZip - ) - - if(APPLE) From d7d4b0dc3a827316ec48c09a59ca99dab0cf9f77 Mon Sep 17 00:00:00 2001 From: regnat Date: Mon, 24 May 2021 21:01:29 +0200 Subject: [PATCH 231/664] zeal: Use the main qt5 libraries set Builds fine with it, so no need to pin an older version. (This originally was triggered by qtwebengine failing for Qt514. The build has been fixed on master in the meantime, but I guess it still makes sense) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16496656714f..e11b6b25933f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22385,7 +22385,7 @@ in inherit (plasma5Packages) breeze-icons; }; - zeal = libsForQt514.callPackage ../data/documentation/zeal { }; + zeal = libsForQt5.callPackage ../data/documentation/zeal { }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; From e34b55910991a52b432f97cddfb2e8a2b4b13f97 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 May 2021 04:54:05 -0400 Subject: [PATCH 232/664] qhull: add fixDarwinDylibNames --- pkgs/development/libraries/qhull/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 0a6f39e672cd..a7f1bc271155 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "qhull"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with lib; { homepage = "http://www.qhull.org/"; From 7683afc895f2e27b76ce73954b75b573cf2dbb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 May 2021 15:35:33 +0200 Subject: [PATCH 233/664] spotdl: 3.5.2 -> 3.6.1 https://github.com/spotDL/spotify-downloader/releases/tag/v3.6.0 https://github.com/spotDL/spotify-downloader/releases/tag/v3.6.1 --- pkgs/tools/audio/spotdl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 9306c516af51..38f69b4d2b77 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.5.2"; + version = "3.6.1"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-V9jIA+ULjZRj+uVy4Yh55PapPiqFy9I9ZVln1nt/bJw="; + sha256 = "sha256-F3bP8f1LtcFZL7qahYkCUvhtc27fcL8WBnmyLcS9lCY="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { tqdm beautifulsoup4 requests + unidecode ]; checkInputs = with python3.pkgs; [ From 3f1fc1731e4aa10d1f3957caf04cfece6705f21b Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Thu, 27 May 2021 11:14:37 +0200 Subject: [PATCH 234/664] pcmsolver: init at 1.3.0 formatting Co-authored-by: Sandro formatting Co-authored-by: Sandro --- .../libraries/pcmsolver/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/pcmsolver/default.nix diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix new file mode 100644 index 000000000000..8cd4b318cc5a --- /dev/null +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python +, boost, eigen, zlib +} : + +stdenv.mkDerivation rec { + pname = "pcmsolver"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "PCMSolver"; + repo = pname; + rev = "v${version}"; + sha256= "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; + }; + + nativeBuildInputs = [ + cmake + gfortran + perl + python + ]; + + buildInputs = [ + boost + eigen + zlib + ]; + + cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; + + hardeningDisable = [ "format" ]; + + # Requires files, that are not installed. + doCheck = false; + + meta = with lib; { + description = "An API for the Polarizable Continuum Model"; + homepage = "https://pcmsolver.readthedocs.io/en/stable/"; + license = licenses.lgpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 974595bb1192..efc96dae1b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7156,6 +7156,8 @@ in pasystray = callPackage ../tools/audio/pasystray { }; + pcmsolver = callPackage ../development/libraries/pcmsolver { }; + phash = callPackage ../development/libraries/phash { }; pnmixer = callPackage ../tools/audio/pnmixer { }; From 136addaa6e924e642669a925a323475a2d0c207e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 May 2021 11:45:06 +0200 Subject: [PATCH 235/664] chromiumDev: 92.0.4512.4 -> 92.0.4515.20 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index caca98c0ce0f..2cb53eda3e3e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "92.0.4512.4", - "sha256": "0ycwr11bz2hlzczs6cajxn5k32m44ndhmqh86iykcbi982dj7jq2", - "sha256bin64": "0wv29rghcbin725qbl8cq20j8w5mlcjmjaqdcr73m753dv3jv8rq", + "version": "92.0.4515.20", + "sha256": "0xmpmjpxr4bgy62d71ky9asxwbgnx60mrp9f1dxm9nm92dv6w0ac", + "sha256bin64": "1la5mrh33izl7nf1rr899ljh448ckpqz2bp0vac83vb8952krm05", "deps": { "gn": { "version": "2021-05-07", From c9373da859ffc673079ec02eded595addf10480c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 27 May 2021 09:05:33 -0300 Subject: [PATCH 236/664] nordic: add the Nordic-Polar themes Nordic-Polar is the light version of the Nordic themes. Although the author keeps it in a separate git repository, they are organized in the very same way. They are also distributed together in https://www.pling.com/p/1267246/, the primary site used by the author for distribution. Adding Nordic-Polar to the nordic package makes maintainance easier. --- pkgs/data/themes/nordic/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index dcda14977a7f..c12f9e2ba78b 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -52,6 +52,22 @@ stdenv.mkDerivation rec { sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7"; name = "Nordic-bluish-accent-standard-buttons"; }) + + (fetchFromGitHub { + owner = "EliverLara"; + repo = "${pname}-polar"; + rev = "69652db56e1721ac183cd57d21a801a09655a811"; + sha256 = "0zjd4np11mjwmc1kh2n1ig77g4wq88s2yrmnga0gvw1lf44n3qn2"; + name = "Nordic-Polar"; + }) + + (fetchFromGitHub { + owner = "EliverLara"; + repo = "${pname}-polar"; + rev = "3a67c1a2308ba3e9ec5d82f4a3416f85b6085b08"; + sha256 = "0gpg2izh4ay78j79vjp4svmi3qy9qaw0n6ai8zwm7p25dwm56fjy"; + name = "Nordic-Polar-standard-buttons"; + }) ]; sourceRoot = "."; @@ -78,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Dark Gtk theme using the Nord color pallete"; + description = "Gtk themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3Only; platforms = platforms.all; From abb9ea73f7b2bd8d0862be47a0a1010d7644136b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 May 2021 14:09:02 +0200 Subject: [PATCH 237/664] nixos/tests/{sway,cagebreak}: Disable on aarch64-linux The tests timeout on AArch64 (e.g. [0] and [1]), likely because the QEMU option "-vga virtio" isn't supported there (unfortunately I currently lack access to an AArch64 system with NixOS to investigate). This also affects the test for Cage but that one is already limited to x86_64-linux. [0]: https://hydra.nixos.org/build/144148809 [1]: https://hydra.nixos.org/build/144103034 --- nixos/tests/all-tests.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 99393e5b1842..ed0dc0b8e6d0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -53,7 +53,7 @@ in caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTestOn ["x86_64-linux"] ./cage.nix {}; - cagebreak = handleTest ./cagebreak.nix {}; + cagebreak = handleTestOn ["x86_64-linux"] ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; @@ -395,7 +395,7 @@ in sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; - sway = handleTest ./sway.nix {}; + sway = handleTestOn ["x86_64-linux"] ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; From cd4de6f15fad8ee04a4fdeaf3310696cae64fca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 27 May 2021 09:20:48 -0300 Subject: [PATCH 238/664] nordic-polar: remove The Nordic-Polar themes are now part of the nordic package. --- pkgs/data/themes/nordic-polar/default.nix | 35 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/data/themes/nordic-polar/default.nix diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix deleted file mode 100644 index 8af17dd98afe..000000000000 --- a/pkgs/data/themes/nordic-polar/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - pname = "nordic-polar"; - version = "1.9.0"; - - srcs = [ - (fetchurl { - url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; - sha256 = "1583mx8frkl5w26myczbyrggrp07lmpsfj00h1bzicw6lz8jbxf1"; - }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; - sha256 = "1n2qys0xcg1k28bwfrrr44cqz7q2rnfj6ry6qgd67ivgh63kmcq6"; - }) - ]; - - sourceRoot = "."; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - mkdir -p $out/share/themes - cp -a Nordic-Polar* $out/share/themes - rm $out/share/themes/*/{LICENSE,README.md} - ''; - - meta = with lib; { - description = "Gtk theme created using the awesome Nord color pallete"; - homepage = "https://github.com/EliverLara/Nordic-Polar"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c5a5b01c3f4..ba631bb45ec5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -498,6 +498,7 @@ mapAliases ({ nixFlakes = nixUnstable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 + nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; oauth2_proxy = oauth2-proxy; # added 2021-04-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e11b6b25933f..4ed8f5e6bfaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21994,8 +21994,6 @@ in nordic = callPackage ../data/themes/nordic { }; - nordic-polar = callPackage ../data/themes/nordic-polar { }; - inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; From b945329a0cc3e24f010ede6376498fc5ddcfc53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 May 2021 15:47:38 -0300 Subject: [PATCH 239/664] dockbarx: 0.93 -> 1.0-beta-d98020e - Switch to a fork from xuzhen (which is maintained), the same used in AUR - Update to the latest revision from the repository, which supports gtk3 and python3 - Review dependences and wrapping - Replace maintainers --- pkgs/applications/misc/dockbarx/default.nix | 95 +++++++++++++++------ 1 file changed, 69 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 5bc8de522dec..cac6c363c323 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,41 +1,84 @@ -{ lib, fetchFromGitHub, python2Packages, gnome2, keybinder }: +{ lib +, fetchFromGitHub +, glib +, gobject-introspection +, gtk3 +, keybinder3 +, libwnck3 +, python3Packages +, wrapGAppsHook +}: -python2Packages.buildPythonApplication rec { - ver = "0.93"; - name = "dockbarx-${ver}"; +python3Packages.buildPythonApplication rec { + pname = "dockbarx"; + version = "${ver}-${rev}"; + ver = "1.0-beta"; + rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe"; src = fetchFromGitHub { - owner = "M7S"; + owner = "xuzhen"; repo = "dockbarx"; - rev = ver; - sha256 = "1h1g2vag5vnx87sa1f0qi8rq7wlr2ymvkrdr08kk7cma4wk0x6hg"; + rev = rev; + sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m"; }; - postPatch = '' - substituteInPlace setup.py --replace /usr/ "" - substituteInPlace setup.py --replace '"/", "usr", "share",' '"share",' - substituteInPlace dockbarx/applets.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/dockbar.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/iconfactory.py --replace /usr/share/ $out/share/ - substituteInPlace dockbarx/theme.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/battery_status.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/namebar.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/namebar_window_buttons.py --replace /usr/share/ $out/share/ - substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/ - ''; + nativeBuildInputs = [ + glib.dev + python3Packages.polib + wrapGAppsHook + ]; - propagatedBuildInputs = (with python2Packages; [ pygtk pyxdg dbus-python pillow xlib ]) - ++ (with gnome2; [ gnome_python gnome_python_desktop ]) - ++ [ keybinder ]; + buildInputs = [ + gobject-introspection + gtk3 + libwnck3 + keybinder3 + ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + pillow + pygobject3 + pyxdg + xlib + ]; # no tests doCheck = false; + dontWrapGApps = true; + + postPatch = '' + substituteInPlace setup.py \ + --replace /usr/ "" \ + --replace '"/", "usr", "share",' '"share",' + + for f in \ + dbx_preference \ + dockbarx/applets.py \ + dockbarx/dockbar.py \ + dockbarx/iconfactory.py \ + dockbarx/theme.py \ + mate_panel_applet/dockbarx_mate_applet + do + substituteInPlace $f --replace /usr/share/ $out/share/ + done + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { - homepage = "https://launchpad.net/dockbar/"; - description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; - license = licenses.gpl3; + homepage = "https://github.com/xuzhen/dockbarx"; + description = "Lightweight taskbar/panel replacement which works as a stand-alone dock"; + license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.volth ]; + maintainers = [ maintainers.romildo ]; }; } From e79342a712b375b1d0731fcf1acef9d2ab1ce069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 May 2021 17:24:35 -0300 Subject: [PATCH 240/664] xfce.xfce4-dockbarx-plugin: fix dependences and wrapping Also replace maintainer. --- .../xfce4-dockbarx-plugin/default.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 2c83abe6575e..9224a22e53ba 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -1,11 +1,23 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48 -, dockbarx, gtk2, xfce, pythonPackages, wafHook }: +{ lib +, stdenv +, fetchFromGitHub +, bash +, dockbarx +, gobject-introspection +, keybinder3 +, pkg-config +, python3Packages +, vala_0_48 +, wafHook +, wrapGAppsHook +, xfce +}: stdenv.mkDerivation rec { pname = "xfce4-dockbarx-plugin"; version = "${ver}-${rev}"; ver = "0.6"; - rev = "5213876"; + rev = "5213876151f1836f044e9902a22d1e682144c1e0"; src = fetchFromGitHub { owner = "xuzhen"; @@ -14,12 +26,27 @@ stdenv.mkDerivation rec { sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn"; }; - pythonPath = [ dockbarx ]; + pythonPath = [ + dockbarx + python3Packages.pygobject3 + ]; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ] - ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) - ++ pythonPath; + nativeBuildInputs = [ + gobject-introspection + pkg-config + python3Packages.wrapPython + vala_0_48 + wafHook + wrapGAppsHook + ]; + + buildInputs = [ + keybinder3 + python3Packages.python + xfce.xfce4-panel + xfce.xfconf + ] + ++ pythonPath; postPatch = '' substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" @@ -28,14 +55,15 @@ stdenv.mkDerivation rec { ''; postFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath" ''; meta = with lib; { homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin"; - description = "A plugins to embed DockbarX into xfce4-panel"; + description = "Plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.volth ]; + maintainers = [ maintainers.romildo ]; }; } From 44c286d23663a5d3ef5c5b74b51b125a2dcd29ac Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 21 May 2021 07:31:19 +0100 Subject: [PATCH 241/664] tree-sitter: 0.19.3 -> 0.19.5 new grammars: * tree-sitter-toml * tree-sitter-tsq * tree-sitter-zig --- .../development/tools/parsing/tree-sitter/default.nix | 6 +++--- .../tools/parsing/tree-sitter/grammars/default.nix | 3 +++ .../tree-sitter/grammars/tree-sitter-c-sharp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-java.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-javascript.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-julia.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-ocaml.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-toml.json | 10 ++++++++++ .../parsing/tree-sitter/grammars/tree-sitter-tsq.json | 10 ++++++++++ .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-yaml.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-zig.json | 10 ++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 11 +++++++++++ 16 files changed, 87 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 29edf0f9f27c..6ab1463917c8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,9 +28,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.19.3"; - sha256 = "0zd1p9x32bwdc5cdqr0x8i9fpcykk1zczb8zdjawrrr92465d26y"; - cargoSha256 = "1n63lxp8rknb5xqp02csj649cxs7d891a520djl3lb4k1finhsjj"; + version = "0.19.5"; + sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"; + cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index d9d5fa46badc..e5eb3029c868 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -29,7 +29,10 @@ tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json)); tree-sitter-svelte = (builtins.fromJSON (builtins.readFile ./tree-sitter-svelte.json)); tree-sitter-swift = (builtins.fromJSON (builtins.readFile ./tree-sitter-swift.json)); + tree-sitter-toml = (builtins.fromJSON (builtins.readFile ./tree-sitter-toml.json)); + tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json)); tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json)); tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json)); + tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json)); } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index dd6a3a380bc6..148004de4657 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "09749b7b5428e770cc2ebdf2e90029c0f4a2d411", - "date": "2021-04-13T07:05:48+01:00", - "path": "/nix/store/w99nivk866bglvijxb5m0c789qh99x1m-tree-sitter-c-sharp", - "sha256": "17n7r1j1ib3gzjf0qw88512flzamjrvilksbf1p15dqa17rmwyq1", + "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282", + "date": "2021-05-21T15:22:56+02:00", + "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp", + "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 6783d4381f6d..69d4869010f4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "2a83dfdd759a632651f852aa4dc0af2525fae5cd", - "date": "2021-03-09T16:11:33-05:00", - "path": "/nix/store/2jk1bacllxsii8nlbc5lyi3k376ylf3q-tree-sitter-go", - "sha256": "001p8kb8g4vghn78690bnav42inkypld2k1mbd5pbmd5svvacfav", + "rev": "eb306e6e60f393df346cfc8cbfaf52667a37128a", + "date": "2021-05-04T14:03:16-07:00", + "path": "/nix/store/xgi4w5by155m1zqhqf2s7hmngy6sxdq3-tree-sitter-go", + "sha256": "03x3nkjxdfck9a4z2i50wq065vixqqk4v5w6fnd870q63v0zrc7c", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index c3e5cb9d20f2..0856320ef59b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "ee8e358637e05188f9f65d8d1ad88a4412c975ce", - "date": "2021-04-20T10:40:14-04:00", - "path": "/nix/store/8612qackwqdsvbfc03lzc5vds6mvqwxf-tree-sitter-java", - "sha256": "19qxfimy8w49gqc97siknd27kvkz73qp2v2118pvdbdz7c5dv27r", + "rev": "2efe37f92d2e6aeb25186e9da07455bb4a30163c", + "date": "2021-05-04T14:05:05-07:00", + "path": "/nix/store/bzljwaraqj6zqpq85cz9xb0vwh7c10yj-tree-sitter-java", + "sha256": "09v3xg1356ghc2n0yi8iqkp80lbkav0jpfgz8iz2j1sl7ihbvkyw", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 351a0f262cb0..c0411d15fb69 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "a263a8f53266f8f0e47e21598e488f0ef365a085", - "date": "2021-04-20T10:37:09-04:00", - "path": "/nix/store/y6qbdzdx4g1g1sa2rb7dnk9snjs6lhpp-tree-sitter-javascript", - "sha256": "04s1jb9c96kwq0nrh6516idlh58d2b1k66amqa2sl5kk32pl9pmm", + "rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a", + "date": "2021-05-11T09:51:32-07:00", + "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript", + "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index d90f09348cad..ef319a1e33d7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "0ba7a24b062b671263ae08e707e9e94383b25bb7", - "date": "2021-03-04T14:52:13-08:00", - "path": "/nix/store/2ni8p1cgyrkn1mcccl4zqdpkfm63a10m-tree-sitter-julia", - "sha256": "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463", + "rev": "12ea597262125fc22fd2e91aa953ac69b19c26ca", + "date": "2021-05-03T17:44:45-07:00", + "path": "/nix/store/lbz23r698hn7cha09qq0dbfay7dh74gg-tree-sitter-julia", + "sha256": "0rmd7k3rv567psxrlqv17gvckijs19xs6mxni045rpayxmk441sk", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index eb97bb46f685..ff638a08baf0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "d5287aac195ab06da4fe64ccf93a76ce7c918445", - "date": "2021-04-21T19:11:29-05:00", - "path": "/nix/store/6labzn2qd3wyn4k2ddb09z2avpgqwbp1-tree-sitter-nix", - "sha256": "0mapqdqrinskdxlarrrvyd55mjg97gbd6jm9vbjmdm4xi2hhzvxa", + "rev": "50f38ceab667f9d482640edfee803d74f4edeba5", + "date": "2021-04-27T17:21:51-05:00", + "path": "/nix/store/fhf3mvxg17g0xli59cgmmwqy4g21fbzj-tree-sitter-nix", + "sha256": "11gifb9b7x9v223hsrcb6wlkqpxbc4p5v4ny9aixzi9k8g0jhb3d", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index 941a96646843..fe6b149e0409 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "2f962cf4eb0bee87bba755347a79ee501cd58313", - "date": "2021-03-11T02:13:42+01:00", - "path": "/nix/store/pwf6di3pdghsnb83c87vvm3w0d5aanvp-tree-sitter-ocaml", - "sha256": "1dfan7kbs7i0nz9dkxv8ipn0b341j1fr9fn0a2zfqsx6xxkra56r", + "rev": "0348562f385bc2bd67ecf181425e1afd6d454192", + "date": "2021-05-07T21:05:16+02:00", + "path": "/nix/store/s2499rsi28k0nrwx8wl2idsp86zsx2iz-tree-sitter-ocaml", + "sha256": "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index a536d54b651c..4ff38790b6f7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "4dcc061668fbc68b79421c72eb8a8baeeb0f3693", - "date": "2021-04-19T12:44:47-04:00", - "path": "/nix/store/2i80zds4dbynrdim9ngc8yp6yn825byb-tree-sitter-php", - "sha256": "0hs6dfw9n6sp7vbp7zfid0f0sxydyya3dyp5ghckz7al069g3vx2", + "rev": "6a271f4075e11815e787df9055a950fb844ee63b", + "date": "2021-05-13T12:41:22+02:00", + "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php", + "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json new file mode 100644 index 000000000000..a3d9bedd133b --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/ikatyang/tree-sitter-toml", + "rev": "8bd2056818b21860e3d756b5a58c4f6e05fb744e", + "date": "2021-05-11T12:47:32+08:00", + "path": "/nix/store/isgpadcxmgkb14w9yg67pb8lx7wlfhnn-tree-sitter-toml", + "sha256": "0yasw5fp4mq6vzrdwlc3dxlss8a94bsffv4mzrfp0b3iw0s1dlyg", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json new file mode 100644 index 000000000000..918e87b38a42 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-tsq", + "rev": "b665659d3238e6036e22ed0e24935e60efb39415", + "date": "2021-05-18T15:57:40-04:00", + "path": "/nix/store/j59y4s3bsv6d5nbmhhdgb043hmk8157k-tree-sitter-tsq", + "sha256": "03bch2wp2jwxk69zjplvm0gbyw06qqdy7il9qkiafvhrbh03ayd9", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index a59dd9a0004a..04ad785f76f9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "82916165120f840164f11119f268a4de819ea90b", - "date": "2021-04-19T18:16:19-07:00", - "path": "/nix/store/0c0kkiiamms3yl3mf1clyrqcjwp5j920-tree-sitter-typescript", - "sha256": "1jnf0hn6hmn4x2cvy29mk8g1wlp0afs8immp461by3q5hcq8fzb4", + "rev": "28e757a2f498486931b3cb13a100a1bcc9261456", + "date": "2021-05-04T14:04:30-07:00", + "path": "/nix/store/d90hgv5g374a6mrwhq9vcxk6d6lp2ags-tree-sitter-typescript", + "sha256": "0dxy5h68hhypzq0z15q8iawjgw3kx7dlpw76zv6xkxh25idqgxqh", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index c8544d7dbec3..8959c80f9f48 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ikatyang/tree-sitter-yaml", - "rev": "6129a83eeec7d6070b1c0567ec7ce3509ead607c", - "date": "2021-04-18T14:25:59+08:00", - "path": "/nix/store/8wrwm71z9flfk00phrh9aaxpvsrw1m67-tree-sitter-yaml", - "sha256": "1bimf5fq85wn8dwlk665w15n2bj37fma5rsfxrph3i9yb0lvzi3q", + "rev": "0e36bed171768908f331ff7dff9d956bae016efb", + "date": "2021-05-11T12:47:24+08:00", + "path": "/nix/store/7d7m4zs4ydnwbn3xnfm3pvpy7gvkrmg8-tree-sitter-yaml", + "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json new file mode 100644 index 000000000000..97774bc58f61 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/GrayJack/tree-sitter-zig", + "rev": "41bbc7f7b94bde3e948e41e4d42673945238ff03", + "date": "2021-03-30T12:55:10-03:00", + "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig", + "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index c55858b5ff15..168c9a0a403d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -35,6 +35,7 @@ let "tree-sitter-jsdoc" "tree-sitter-ql" "tree-sitter-embedded-template" + "tree-sitter-tsq" ]; knownTreeSitterOrgGrammarReposJson = jsonFile "known-tree-sitter-org-grammar-repos" knownTreeSitterOrgGrammarRepos; @@ -60,6 +61,8 @@ let "tree-sitter.github.io" # not maintained "tree-sitter-razor" + # rust library for constructing arbitrary graph structures from source code + "tree-sitter-graph" ]; ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos; @@ -91,6 +94,14 @@ let orga = "ikatyang"; repo = "tree-sitter-yaml"; }; + "tree-sitter-toml" = { + orga = "ikatyang"; + repo = "tree-sitter-toml"; + }; + "tree-sitter-zig" = { + orga = "GrayJack"; + repo = "tree-sitter-zig"; + }; }; allGrammars = From d8638f1c7f57ab06e11575ac80868c9adeee4068 Mon Sep 17 00:00:00 2001 From: remedialchaos Date: Thu, 27 May 2021 20:34:02 +0530 Subject: [PATCH 242/664] pmbootstrap: init at 1.30.0 (#118444) Co-authored-by: Sandro --- pkgs/tools/misc/pmbootstrap/default.nix | 95 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/tools/misc/pmbootstrap/default.nix diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix new file mode 100644 index 000000000000..3f75e8e33af0 --- /dev/null +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -0,0 +1,95 @@ +{ lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps +, fetchPypi, fetchFromGitLab }: + +buildPythonApplication rec { + pname = "pmbootstrap"; + version = "1.30.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-uHN3nplQOMuBeQIxAocCVqwnmJUQZL67+iXLhQ7onps="; + }; + + repo = fetchFromGitLab { + domain = "gitlab.com"; + owner = "postmarketOS"; + repo = pname; + rev = version; + sha256 = "sha256-JunI/mqq+UvmzNVt3mdJN3+tKGN4uTrxkUU2imCNCNY="; + }; + + pmb_test = "${repo}/test"; + + checkInputs = [ pytestCheckHook git openssl ps ]; + + # Add test dependency in PATH + checkPhase = "export PYTHONPATH=$PYTHONPATH:${pmb_test}"; + + # skip impure tests + disabledTests = [ + "test_get_apkbuild" + "test_check_build_for_arch" + "test_get_depends" + "test_build_depends_no_binary_error" + "test_build_depends_binary_outdated" + "test_init_buildenv" + "test_run_abuild" + "test_finish" + "test_package" + "test_build_depends_high_level" + "test_build_local_source_high_level" + "test_chroot_interactive_shell" + "test_chroot_interactive_shell_user" + "test_chroot_arguments" + "test_switch_to_channel_branch" + "test_read_config_channel" + "test_cross_compile_distcc" + "test_build_src_invalid_path" + "test_can_fast_forward" + "test_clean_worktree" + "test_get_upstream_remote" + "test_pull" + "test_helpers_package_get_apkindex" + "test_filter_missing_packages_invalid" + "test_filter_missing_packages_binary_exists" + "test_filter_missing_packages_pmaports" + "test_filter_aport_packages" + "test_pmbootstrap_status" + "test_print_checks_git_repo" + "test_helpers_ui" + "test_newapkbuild" + "test_package_from_aports" + "test_recurse_invalid" + "test_questions_bootimg" + "test_questions_keymaps" + "test_questions_work_path" + "test_questions_channel" + "test_apk_static" + "test_aportgen" + "test_aportgen_device_wizard" + "test_bootimg" + "test_build_is_necessary" + "test_config_user" + "test_crossdirect" + "test_file" + "test_folder_size" + "test_helpers_lint" + "test_helpers_repo" + "test_kconfig_check" + "test_keys" + "test_pkgrel_bump" + "test_qemu_running_processes" + "test_run_core" + "test_shell_escape" + "test_version" + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ git openssl ]}" ]; + + meta = with lib; { + description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS"; + homepage = "https://gitlab.com/postmarketOS/pmbootstrap"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ payas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e11b6b25933f..c77d3652187b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24188,6 +24188,8 @@ in pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-cli = callPackage ../tools/networking/slack-cli { }; From 15eb917faf7ddab6d7ab8a17cf72a425eff898e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 May 2021 17:04:19 +0200 Subject: [PATCH 243/664] diff-so-fancy: 1.4.0 -> 1.4.1 --- .../git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index a1daf3db4487..77ad7d8658d1 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-//n7kOANVHRSjxclxDcMnpMVzUcd/U6fFsP8acRjVWA="; + sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE="; }; nativeBuildInputs = [ From c0431f8436df4a7d2c41b9d38b432d1eba17731b Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 27 May 2021 17:26:45 +0200 Subject: [PATCH 244/664] zellij: 0.11.0 -> 0.12.0 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 920f4aff4399..72b2a2742318 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aqiJPYoG1Yi5bK0gos+2OoycrrqdIY2GjpQGE1PK1bw="; + sha256 = "sha256-c79n/gNMAg+Eb+ZJcG+H+GSB0hI9FyyqkZGDcfz0ahA="; }; - cargoSha256 = "sha256-j9eZ2kHK9Mxxcv/yuriJ55xs2waCaWT5XQOSlA+WZXE="; + cargoSha256 = "sha256-m7hYDnZBBcrSHL2s+NwD/Z9+gpFvfZmnoLwgOXqc3mw="; nativeBuildInputs = [ installShellFiles ]; From 3a66432f2616484c880b6daea2393bf1e9425a33 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Thu, 27 May 2021 12:13:16 -0400 Subject: [PATCH 245/664] php.buildPecl: Add checkPhase Also update phpPackages' to use NO_INTERACTION --- pkgs/build-support/build-pecl.nix | 1 + pkgs/top-level/php-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d75d3cf943a0..d3a8cc54a146 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -33,4 +33,5 @@ stdenv.mkDerivation (args // { (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") internalDeps} ''; + checkPhase = "NO_INTERACTON=yes make test"; }) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0f61402bb05e..c59391ce2907 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,7 +235,7 @@ lib.makeScope pkgs.newScope (self: with self; { (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") internalDeps} ''; - checkPhase = "runHook preCheck; echo n | make test; runHook postCheck"; + checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck"; outputs = [ "out" "dev" ]; installPhase = '' mkdir -p $out/lib/php/extensions From 8ed03bc71243f642a5d47cfc9b84b0592cf5d158 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 27 May 2021 10:35:24 -0500 Subject: [PATCH 246/664] kubernetes-helm: 3.5.4 -> 3.6.0 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 0508830918fd..e861ef97be35 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.5.4"; + version = "3.6.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-u8GJVOubPlIG88TFG5+OvbovMz4Q595wWo2YCwuTgG8="; + sha256 = "sha256-sVa7d69MuOjH1IhUMcXu79kEE0BKylLYx6yrOV/DExY="; }; - vendorSha256 = "sha256-zdZxGiwgx8c0zt9tQebJi7k/LNNYjhNInsVeBbxPsgE="; + vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk="; doCheck = false; From 4e9bd87f5a024a5b7cf3b94c389125732da7fb11 Mon Sep 17 00:00:00 2001 From: greaka <2805834+greaka@users.noreply.github.com> Date: Thu, 27 May 2021 19:34:05 +0200 Subject: [PATCH 247/664] terraria-server: 1.4.2.2 -> 1.4.2.3 --- pkgs/games/terraria-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index b21f1008885d..b5a8c7e486bd 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.2.2"; + version = "1.4.2.3"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/system/dedicated_servers/archives/000/000/045/original/terraria-server-${urlVersion}.zip"; - sha256 = "0jz79yidnri6hrqp2aqbi8hg0w3k4nrnfbvxgy5q612fr04g6nsw"; + url = "https://terraria.org/system/dedicated_servers/archives/000/000/046/original/terraria-server-${urlVersion}.zip"; + sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j"; }; buildInputs = [ file ]; From e3f67ccdc0653887621ebc56986c412080d237ae Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Thu, 27 May 2021 15:48:59 +0000 Subject: [PATCH 248/664] iptsd: init at 0.4 --- pkgs/applications/misc/iptsd/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/iptsd/default.nix diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix new file mode 100644 index 000000000000..c5a23840264d --- /dev/null +++ b/pkgs/applications/misc/iptsd/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }: + +stdenv.mkDerivation rec { + pname = "iptsd"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "linux-surface"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-CoPgkt7n2kk7WlQHe0RjNlxfp2Nd8BbIE2gyf0bOBy4="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ systemd inih ]; + + # Original installs udev rules and service config into global paths + postPatch = '' + substituteInPlace meson.build \ + --replace "install_dir: unitdir" "install_dir: datadir" \ + --replace "install_dir: rulesdir" "install_dir: datadir" \ + ''; + mesonFlags = [ + "-Dsystemd=true" + "-Dsample_config=false" + "-Ddebug_tool=false" + ]; + + meta = with lib; { + description = "Userspace daemon for Intel Precise Touch & Stylus"; + homepage = "https://github.com/linux-surface/iptsd"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 459617a3aa5e..34a90cfbd767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5821,6 +5821,8 @@ in ipget = callPackage ../applications/networking/ipget { }; + iptsd = callPackage ../applications/misc/iptsd { }; + ipmitool = callPackage ../tools/system/ipmitool {}; ipmiutil = callPackage ../tools/system/ipmiutil {}; From cdffcc9048bafc34938235a5b4f166b4f2770a88 Mon Sep 17 00:00:00 2001 From: 239 <239@pm.me> Date: Thu, 27 May 2021 21:14:18 +0200 Subject: [PATCH 249/664] bitwarden: 1.24.6 -> 1.26.4 --- pkgs/tools/security/bitwarden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 8f264ef942e4..daddf9a71b6a 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -2,11 +2,11 @@ , autoPatchelfHook , dpkg , fetchurl +, lib , libsecret , makeDesktopItem , makeWrapper , stdenv -, lib , udev , wrapGAppsHook }: @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.24.6"; + x86_64-linux = "1.26.4"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA="; + x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; }.${system} or ""; meta = with lib; { From 2f671ccc7a4bd8ffda8a63e7e188d246238dba64 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 May 2021 20:37:24 +0200 Subject: [PATCH 250/664] nixos/tests/{sway,cage,cagebreak}: Fix the tests on aarch64-linux Since the update to wlroots 0.13 (e03dde82a74) the default VGA card isn't supported anymore and we needed to switch to virtio (qxl didn't work either). However, as it turned out "-vga virtio" (28b8cff301f) broke the test on AArch64. Luckily there's a third option that works on all three supported platforms: virtio-gpu-pci According to [0] "This device lacks VGA compatibility mode but is otherwise identical to the virtio vga device. UEFI firmware can handle this, and if your guests has drivers too you can use this instead of virtio-vga. This will reduce the attack surface (no complex VGA emulation support) and reduce the memory footprint by 8 MB (no pci memory bar for VGA compatibility). This device can be placed in a PCI Express slot." So in the end this seems like the ideal choice :) See also [1]. [0]: https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/#virtio-gpu-pci [1]: https://patches.openembedded.org/patch/164351/ --- nixos/tests/all-tests.nix | 6 +++--- nixos/tests/cage.nix | 6 ++---- nixos/tests/cagebreak.nix | 4 ++-- nixos/tests/sway.nix | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ed0dc0b8e6d0..ab24c2c857a2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -52,8 +52,8 @@ in buildkite-agents = handleTest ./buildkite-agents.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; - cage = handleTestOn ["x86_64-linux"] ./cage.nix {}; - cagebreak = handleTestOn ["x86_64-linux"] ./cagebreak.nix {}; + cage = handleTest ./cage.nix {}; + cagebreak = handleTest ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; @@ -395,7 +395,7 @@ in sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; - sway = handleTestOn ["x86_64-linux"] ./sway.nix {}; + sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index 80ce1e0d8b3a..e6bef374d303 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -18,10 +18,8 @@ import ./make-test-python.nix ({ pkgs, ...} : }; virtualisation.memorySize = 1024; - # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std): - # machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000] - # machine # [ 14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7 - virtualisation.qemu.options = [ "-vga virtio" ]; + # Need to switch to a different GPU driver than the default one (-vga std) so that Cage can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; enableOCR = true; diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index e343cd88e7f5..242e59f5d7ab 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -36,8 +36,8 @@ in environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ]; virtualisation.memorySize = 1024; - # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: - virtualisation.qemu.options = [ "-vga virtio" ]; + # Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; enableOCR = true; diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 1d23b0e94313..0985e0b4308b 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -42,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : programs.gnupg.agent.enable = true; virtualisation.memorySize = 1024; - # Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch: - virtualisation.qemu.options = [ "-vga virtio" ]; + # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; enableOCR = true; From d4de973c917d4bdc74dd2eff3ac027c03a3b3b72 Mon Sep 17 00:00:00 2001 From: Ronan Mac Fhlannchadha Date: Thu, 27 May 2021 20:51:39 +0100 Subject: [PATCH 251/664] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 428 ++++++++++++++-------------- 1 file changed, 214 insertions(+), 214 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b213ff9089e2..51d781f97ea0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-05-04"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "bee8eccb421968d1f2628c15e9f2bfcc3d0418aa"; - sha256 = "1kfj40rfgyvzjk1ic9ax21cb8a58qhjbqh7knxgljkv7jhaclj4y"; + rev = "a02a4f2811f810877f3c3859cca963f9578ff94a"; + sha256 = "0c96zhz8ia1yfgv58jrib49kp250kilv2awr2jgnriqznkl9l4h9"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-04-11"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "bc9c3bf48961f5babb24243bd407c715ce551210"; - sha256 = "1pvjjxw3nz3s11f83rbmdhad5rvks0q2am09sfxns0x4rwiwcyrk"; + rev = "f351f0d36e1c8990d8bb1eb2f1d8c25e76ff99bb"; + sha256 = "1hsyk5zc0nmh0hv0c803giimgmx1nahs1zm4gw61bkq2dkjfb4dn"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-05-14"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "0a71b6211ff2d367f012b484e8eba9ef433b85c3"; - sha256 = "1axn0glc40kqygd50m28layk16y28ah9bi6j36id6v0czhxfi475"; + rev = "c051b0d86395c3c4c9db5ddc1b116d43b5dce6c6"; + sha256 = "1006rnpprqh3xsmlas07ay4z743g2zd7z7pqwa4n1bb97y9k89ly"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -269,12 +269,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-05-19"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "af49846c1422c454f98d3450282e02bf83d5f3bf"; - sha256 = "17hf26d2sqywkyq0j2ckfffsshjd132n3zqgr4n6qzdpnbdd668p"; + rev = "fc90a9bceba1ccacf8a5331bb7c508baac7d5110"; + sha256 = "0lwky1zbv4a4ng0bzbpz5v3b7lnk6xzj4sfzm6x5qyhagpw4812v"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-22"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "dd54a707f372bc8f631d7c70f70f1b55a0f56926"; - sha256 = "16sbhn3711hqwv3qykg5lbf09fl6pn58aclsx5r3nnifdc531sc6"; + rev = "77f56c4938b512b20c2da76a54a362dffc5bc7d4"; + sha256 = "1hyadig7f0mjj3vwz6pxyzwa155knbqd9dcpk64p215wagc08nfm"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-05-18"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "17494990ab110b70aec3d7c97707448c6d3e72c9"; - sha256 = "0krl2fn9d3kaczh124z3b1x3qkyq7vw51yim9a9v3raj6x73zynl"; + rev = "1a74bf3c57fec8442f837b3baad0d6fb75d1b97a"; + sha256 = "105jcl74k006dsslplp40yizfdjrj3p7qr23c53dgs2wlbzqc3kj"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1112,12 +1112,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-02-07"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "e526dbecda137e37c45492ce72fa92ea32314154"; - sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; + rev = "00937dd6e4270287c34cdd7f64e8dad5d16914aa"; + sha256 = "0fzp5zvwb85nx9nw1f2im1qllz7ihblgi8xi9mski19p40pgay3j"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1208,12 +1208,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-05-19"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27be5ec45cf52223b225b25517bc088cfcf3c959"; - sha256 = "0ixzly9pbgkwxghwqvpfl4smpk7875d0vwhkwcrnm1z8bhq9rypx"; + rev = "35e27c325ecf0afa28ca42bbda4793eb7ca5f383"; + sha256 = "0an2282ykdsb5v25dhd9r2f2s13pcma0i219nvfaf0qdprip57id"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1462,12 +1462,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-05-02"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "5409f2ef04e1959b5a8d177c962a57f2f2cb78ae"; - sha256 = "125bnbyjdhdj2ynrnxwn55cpq8v73zd0idlwshyk2a93w6mrxy7b"; + rev = "5fe781e4a12101871bc778b977ce6b76685c1ab0"; + sha256 = "1220sclgczaqww0d2zdgr0lfpjwrrjyscjn2j40k8h4j1axah9zi"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1559,12 +1559,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-05-20"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "5ace19a332efeb9a8a026c6647c30eff9cc4a42e"; - sha256 = "0bav74ax1841ar6g3m40vpm40n63z6rac0kx65838ls0b3yks2b8"; + rev = "01a175fb02be0097fbaea20af354e37b0586a5a3"; + sha256 = "03pxfiz2y5n8v1pych1g98k0kziajhwacx2agrr9c4wwf4rv467j"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1607,24 +1607,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; - version = "2021-02-04"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "1386cbae761415b9c7b45565d87283fb4d584aed"; - sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv"; + rev = "fdbe8e8f447870c8693d81045031fc1d5812e38e"; + sha256 = "0rygh4dxrvz7cqsjvp7ymim24hv2czamb9jn1qbbaj33vn85403b"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-05-09"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "a88311b222eb9f90fa9fa72292e61d15c6767866"; - sha256 = "1k0czvf81f8svbrsny8x57xy594pabi8yvgb3ixylx94fpb95ap3"; + rev = "e34f6c129d39b90db44df1107c8b7dfacfd18946"; + sha256 = "0rn0b48zxf46ak0a2dwbx4aas0fjiywhch0viffzhj5b61lvy218"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1727,12 +1727,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-05-13"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "77cb4e1ef26d4133ac0cdfd3d5563b1456b8bf81"; - sha256 = "1q4155rd3rs5qr8spm7lw4yavgpv67yqgy4615agmarh94syn4rx"; + rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef"; + sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1751,12 +1751,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "705d8376423bdf9aa3ef4f3237c25106ec4aa2e6"; - sha256 = "0fa1rw5zn0z6z106iy06wqnr0mksl3r7a3dl8fhwncmsil80dlg6"; + rev = "f4a4fbe04dd829317b7918367b061b54408049d5"; + sha256 = "15ma584q9s60nbi8nxg3cj10m3a1ly00y2xzxdnpy9ik4n04s911"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1775,12 +1775,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-05-06"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "7474d370ff5d9b4b62d8578c5c739f01b589767a"; - sha256 = "0kk5a3kskv3lb0143qdlshyd0phzivk7rdrh1234wdkcfw7llj8a"; + rev = "69bc59ab0bb1214234bbf06dbeb6233b21ff2fc5"; + sha256 = "0jqdalmaisj3gjlqa6kfh83va7a1gd7akggmr66vnccvfxfcdc54"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1871,12 +1871,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-10-16"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad"; - sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b"; + rev = "5f902f4f7d06ef084ffd6cddcd1ee7d3c9a793c6"; + sha256 = "0am6sip4q14v2cvf9dmq6jkh37nhdhbvs466619qyd48qxcf9k9n"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -2328,12 +2328,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "dd16432f976086603ead281db36ff9d9dcf366fc"; - sha256 = "118kpi8ccpg89hp8sx932yy663jh04ml97474q8p01z5j1p4jw20"; + rev = "78bc54d4244854c399447bf9ebd0c8af5f455dc1"; + sha256 = "1wiyqf4h00lf029533byynh6ijz6a4y8al2061wfxp6690hbl488"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2448,12 +2448,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "d70d69b3418957cdf7c4993e484f8b9d3eb1603c"; - sha256 = "1kd9qna82az80ixrwxx5c7cvjqly7ahi8b1l74fp7iaxbr0p5m8w"; + rev = "d5cea5b04841aedd6e3e46c736f2724be03a43e9"; + sha256 = "0yixqn80dh0av0kshz0dw8gbd52096bgdg7gj74rir8hh48bsngx"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2520,12 +2520,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-05-17"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "eb08dfbce1b8623faff6bb9a2c5c7aa8ac710c80"; - sha256 = "0bhq25lv40832z80q1fvyqz6p6cxw47miffq6cxacd0hzahw4agx"; + rev = "1ebfa3e9c9168d7ee9201abdcc86c07a8f9b89db"; + sha256 = "17wqqhi9fslv3b7f79cx33bgvahx9mfl9f04vpm9417b0dc77359"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2556,24 +2556,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-05-20"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "0411f1c830812f071ab8d6b6251662de21d5322a"; - sha256 = "1p76xklayzfvi7bgj90sjcwfv2p708x59znkh6x7689ij0lcx1b5"; + rev = "9726824f1dcc8907632bc7c32f9882f26340f815"; + sha256 = "0gmbv0pbswkxjd4qw7dq66gp3fj594di0pgkb47yh3b46id8vkyj"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-05-09"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "19b7cf9217abfc50c5ae9048d1cedd15e0349131"; - sha256 = "1gkng0nmis8xmfvywgv6gikjh4l0n5aqijhx0aqzi4k47pvp0cpi"; + rev = "b39af94cb4154a3f0887e94d0a4d5f4ae8f92656"; + sha256 = "015q2lkihhb8cgbxxc4f7d4w7sqc67wyaavjany3pj0528rrv97d"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3000,12 +3000,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-12-20"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "5e140db568eb2f7b88e4110cd4b651562e8878ab"; - sha256 = "0gvlpv7mfqrac10ccndl58axib42ack92m2simn78ksdap9g7n6n"; + rev = "df653c87bb04753755995579218c3b8bc1639383"; + sha256 = "1kn23xknakxx5r7n92cpzrvng0nh8gnf1kmr63d1gzsk6a3yh5aw"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3060,12 +3060,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-12-01"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "1283da9f078669593f3828e4345b68b59ee9740f"; - sha256 = "1262bxgh6mcrm1w6w47hsngsaj2fn4dw8jwp433clxvzsf2myk38"; + rev = "cae4f19aeac40037039e914932da850443b7729f"; + sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -3264,24 +3264,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-05-21"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "71d8397621d49adf28a38f362e9964a305196e92"; - sha256 = "1wsfjlnn7p6pcgw03l3balvr8gp0s7qy7syvkvc9cys5ksimp9yd"; + rev = "b5816204bd2f92f1c64dff132fbd67a1530c1751"; + sha256 = "1w0cw7pp7szqsgq734j4zv8c7jcjblpmfa6iw1r0bpi2jgplb5ha"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-19"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "08db07ed66d819f86f1e324ee245ccdd24ed378b"; - sha256 = "0vwwg9agx3j0phi6n4mjnvbwlzp4n1hb22pdhkjlyq6a89vlsjl4"; + rev = "4388bb114a9c153cbe8c5745f6c3cb92edc9bf4b"; + sha256 = "0ivgdl0biiz91g5s0riva77ybzp33driwm7p7fwl94czqgyjjqc4"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3300,12 +3300,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "1ac26a59bd6a2e76cda57a1cbdab75380ed22dbd"; - sha256 = "0f8kf513hd67vcq85lgcfvpvm1zba1xpdyhvndmd92c90sxjmw7k"; + rev = "026c12d7e4f85c570acf8be4c69c282acbe18953"; + sha256 = "0l4y15rzhjjgqkdryj399xgnmz1c3ga8li9j8m4qf98isbmqhsws"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3336,12 +3336,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-05-18"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "5001cd7632b50b65f04d59af85a9dd199ea73b3a"; - sha256 = "0zb6ckn02kd8i0pd6ds0zl369mrr3p9wf0abyba5pgyzl9k4vp42"; + rev = "c7cd3bf1380ce3c6ef2a55537ace40c3a3897c50"; + sha256 = "0pqka3wi169l8d58hlixhyi9yng62p1ic6fnl2vgbydi72xd1ngd"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3372,12 +3372,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "cf7a6bb4e7c93ef60a18097bd24a6db2baea7306"; - sha256 = "0mv7230xpcicaypmlfjsyhzwb6mp8vyp0sdzis5z2ixvm7rmh70a"; + rev = "bb291ba853759f455e421892a955d67cc8e88173"; + sha256 = "0wlfh0mgdhlnvwl7m7bdzj7kks9f5hnm2k3awnyl8a14rjl00i0i"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3396,12 +3396,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-05-15"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c2fd4d042c94d4246e583d7d0231365790fdafac"; - sha256 = "1kkq8l2c9142vbr2lbs1gc95np8mfaxyldzkaabydh99bh4z72v2"; + rev = "9a6e8268878352b9ea3087ab745b894531e5e335"; + sha256 = "1mbjsab96r99hzjh78dsk7cwmn59mgzkr0y6mm6i81g0zz9d9cya"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3420,12 +3420,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "6ca5fc6cd9fab32039a73bba4f14d33d47e87953"; - sha256 = "1fm979m1g24pk9lx34wvdm4awvr08plhxb13c55j5fq24wf00y8h"; + rev = "1ec700d81aae9369ee16b5dfb421153377c4bdee"; + sha256 = "08vi23gaccm0whswg8jsb5pvbcdci51w61m7x079yfarablz1h6c"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3444,12 +3444,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "36baba2afb7fcba25fa5c2d12421e3159e0154c1"; - sha256 = "19j6ss1z07i0669gm4rhyybxv3a225yv1yknc4c4gjls5zyzx2wn"; + rev = "f39758c426c9409ff35ef730b324bc8cd267a5ef"; + sha256 = "11md1s3yqyzr4w5ii6d2dqh9njjc6sglpfgh18mgnx8y6fk23r58"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3468,24 +3468,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2f26391ccf88cd4adff8f11e96412a3536624bd7"; - sha256 = "0y8r879lcpwjnk9rcrafkdh59gcxzpvid0rm80db22vpp6a9l9rq"; + rev = "6a25eb0d3fc77cd1b9ff11446dc52d50bc482155"; + sha256 = "0chb6d3v2n5wka4fgw49rzxqd1vwl7mwwb5z13hvylxbad098n1l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-02-05"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "b68862afee6dfb611d866818cafdba41cf51d749"; - sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm"; + rev = "f34927f8ec777f4e91e14afc709de9da1cd70116"; + sha256 = "1s1pvddgkdslh3r9p08r3xjdpi93d15i4k1jssh8apxzm37gw7lm"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -3540,60 +3540,60 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-19"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "8c4da4a877a0eb49d40fed30c4a928f011d242de"; - sha256 = "0604gdsbnwfdrqra1ch14h8x880j31jfrajydfnfqiqy9dxvsab8"; + rev = "9215c1955c30b08779bcf1043964a49a9aaf0da8"; + sha256 = "1w1bxinkn1walx4svjcjwci2h6vwn2jyiyrykvzcr55gnm5dr5kd"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "d6ab59fd5acb7c71b1a10ace5a522a720460ad6e"; - sha256 = "1vdg2kbmgshvz36j1x2ld92rmlqqdwbj4ji45kk90qvg2zjpq0cv"; + rev = "23935ff0036e26dbfe14e6aee96a7653ee704336"; + sha256 = "07pvxjijp1k932i1pzw0szd5dqxrh2g4br70z0h149252hya4fkf"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-05-22"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9d1d9b1b9438f8c5b2d4c48fe040160b0ac6b316"; - sha256 = "1slhsnkza7wrm0vybfx98r7767hjlzlymy66hh6py27a8bazr5aj"; + rev = "6c2ff319b311fed0160875b878811431399889cf"; + sha256 = "0vl782k8p5l2gm3y247a70ksrdn863gsv1z47frfnpq30ayxz0mx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-05-13"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "b497f282b3db3d3e8641d724c49aedff0d83924c"; - sha256 = "0n5mdni9pvxg1cj1ri0nch4wk28kx0sy0k2vcw7c8d0pw5hfadqb"; + rev = "af10a3251f3e826c3fb2062ddeb4c74f23a2f52d"; + sha256 = "1pl1v28wscdcns4cs2cv44rh0vrk8fwmr2banjgp5lcjynivzrwr"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2021-05-20"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "9a50e33acf6b6e711e6d5cc82456adb6f9b9dc3d"; - sha256 = "0mbd5bp2c6kxn9dmc3vn3ia0silc7kb8mwwcm3q78n866ab4vpcc"; + rev = "01185457e9c0a118d5807998de624179bc605a2a"; + sha256 = "13dhix449mvbfsmg8j1554nv6i7gdr8d6143gdy3ihp8sx66bg6k"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -3624,12 +3624,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-05-20"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0d9648af426bdfc60b1387683b43b1aca1f7c950"; - sha256 = "02g0ryianwdsmfcfai73nc4l25jw5kz0zwbfhvwmcg2px6z5aif2"; + rev = "de234084fb82ff40ac593410409c77a542456415"; + sha256 = "1nw53jxdll34xml9064cl65p33cnv2pg9bbg4697wqdhs7rm4z27"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3720,12 +3720,12 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-05-06"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "bb949122420fd4ae7b29fdc467cf3a9c39d48882"; - sha256 = "1rrx97j4n1qmqfpc1shh00vw01ivhik70s50rdk9hsc7lmxnwxxh"; + rev = "ff7b30ebd2faed7bf2de599ec9f340cffb29a4a4"; + sha256 = "0irzprhgx5l6il45zw0ivg6fp38h73cd9x10mkn74jxa0djghp76"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3768,12 +3768,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-05-20"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "b46aa481b9ab8ad9a152bda19b7f0cb3ffb0a85f"; - sha256 = "0czmv9gwv7xhmcc5dqi47dpgshavbxgqfg58dhrd10xnif7ci12s"; + rev = "a41f6abb3fd0479aab1957c7891531b933154a5f"; + sha256 = "0khylm6w46gs8j4czvfbgdbh5gdidvlgv4hm2vjglv2dblzm2vdn"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3816,12 +3816,12 @@ final: prev: pears-nvim = buildVimPluginFrom2Nix { pname = "pears-nvim"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "steelsojka"; repo = "pears.nvim"; - rev = "658f9e25f46005aa0e12de81abbfadefaad56e39"; - sha256 = "11v92n6qpy7ryhyg6yqq4b48mskzm6ypc9vgfpr2l5irppai1x1r"; + rev = "14e6c47c74768b74190a529e41911ae838c45254"; + sha256 = "04kg7g6v6k6jv2pmapaqvkvf6py1i211l822m3lsvf26jcyfs3ag"; }; meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; @@ -4105,12 +4105,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-05-22"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "c0b02c5d0884dcfdd1a4665a1eb55468f4e398d3"; - sha256 = "1z7pd77gi313asy5d2qvv8nc76rrf2zi18w6gwavygvfkpn3hf65"; + rev = "016d969788bf01dae310570868c4d1e04ab42e31"; + sha256 = "1sifwa97laaijssqnn6b691zckkybaprpschvm983k5awcswy4jd"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4345,12 +4345,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-05-17"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "8097848380b5aedb487bc20879bcb2ab3220a8bc"; - sha256 = "1cl25p3cpb5k36vpk11cr092i1hkhbd781xbfawvr42jfkx2170p"; + rev = "9ce855ab448467dc1468ef8b46bb86d38aa3d0fa"; + sha256 = "0ldz09hjck5pq0lhbk93gm1zvc0aifsfk75w5pzrwqmwidimzyid"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4550,24 +4550,24 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-04-14"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "9c692e3f17b3485969b55d76a708136e2ccaa5de"; - sha256 = "1cd4vxx0zb4xcn2yp7kl5xgl8crfr0fwifn4apkn878lqx6ni7gj"; + rev = "44eadc74ff42ced89e85300d69f8297ffe11589e"; + sha256 = "1k090cy50z6rsh26z6bqw81h60jl7pnjjdfkv8wmzncy7zna86bs"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; stan-vim = buildVimPluginFrom2Nix { pname = "stan-vim"; - version = "2020-08-05"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "eigenfoo"; repo = "stan-vim"; - rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38"; - sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc"; + rev = "0216d8eb8fba6c25a960fe940ca419e570789314"; + sha256 = "0xmkpnrn97y7fny90d57zrklyyhmh7q4ppp1dqdb9q74vikhsch5"; }; meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; @@ -4694,12 +4694,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "fd4bc0f0e4e3a3bb09d48e7176e992b0613a4c68"; - sha256 = "0p3cd9qywx5xgas7mvn0a7qvsnmmpf8gpn8yix8r3vyhcg7ah5y6"; + rev = "225e6530c2b083e37744b23bac74ae40d7639d68"; + sha256 = "0qgks9li8zp7lvagq2wzhr4ahzzalgjzps4l9laj5rq3klmc270v"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4827,24 +4827,24 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-16"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "69eb5eacff421e05aeb1e02ff97ef64bfd955c53"; - sha256 = "1yn5hzv57lld6zpxd7cqnjhj3qb5l9ngnnrb9kfp6c6gy137wlj8"; + rev = "904f84942384f988271cd40cc4b195263fe0763a"; + sha256 = "1dgzp5n6kaphhdm87k5vdbq3srj5dcp1rhnzd72d7n16x0xnki8h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-06-29"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; - sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; + rev = "7746453a045eaa97dc413a7209268345f33f3243"; + sha256 = "0yxgcnx5x82ak74nz3pvkd1z8i3c7lcl068lh5izdpx65fk7m5yh"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -4923,12 +4923,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "219bc7ef4439b6fa53bc9db1dd14b11221e83d7d"; - sha256 = "0s2gspk994d6wg09c2042v37l8v2sd6lms9zi1nidf5fw61pz4y6"; + rev = "8560546c466d1f555573d37e062e95e7ae94bbab"; + sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -4984,12 +4984,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-05-15"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "4375f1f0b2457fcbb91d32de457e6e3b3bb7eba7"; - sha256 = "1szn4fklxm23nbi30arx6qqf96v0s1v0q11vqx886y9a6c2i325m"; + rev = "cf87622d661190157dfa7e28a19ee87bb205219b"; + sha256 = "082sd2x6v8ybyy1pa5jm2mm386c1mn23h9p3nd7fmip2cw9snhd0"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5056,12 +5056,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2021-04-22"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "090e77e30e46aceafd53a3219fb2a81b79927d8d"; - sha256 = "136a8c4d4nrzvab2qa6sxc81x1mwg56nn8ajxikqgyvsr9fp1f9i"; + rev = "62f7a3558ee4402bcaaae8638e768268f1137a0f"; + sha256 = "1y5inpiaqvnq69n1dbpiwilqfq2hf56m7w5a6kj2fkav15pyczx7"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -5380,12 +5380,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4a64fbfc4bdb2cf91b2b50ca3f41b852061d614e"; - sha256 = "1w2hb1dcmc7z3snj6xhqi993g9njf3l6dwdzr9m4jg669n8064ss"; + rev = "a8b3c254d0e5c43be24298ce16cd01f740fe8d42"; + sha256 = "1rbdmwah7zxjah5c3rx71h1d6skda0y6pyz7ysasyjj1dnb2kcsi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5416,12 +5416,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-04-12"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "a3158ec78e63e4858af2704d7a8127728639981e"; - sha256 = "0rpmsf3ykg6q848f0ahp7qrr33pfp1zzxkpc32w3najyqwsfmz6a"; + rev = "ae364eb950f6409de820ceb94619a51b724433dc"; + sha256 = "1b8h4qyvsmap8c2arvp2v1cjax5mskkn382s44ppr0s2dwhcg02b"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -5476,12 +5476,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-05-07"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "58bbc3c8751ba48d1c0ecba040ce43699272d800"; - sha256 = "0ylb8jljin1g5big1lfjrfww576fcb1wakz5shial8xgpw9w1hx1"; + rev = "728d42f93054e15d260e25da0255378f171df7d2"; + sha256 = "1r86100i30jqyxz1hc4z6ykx5s44iaapffs1xbv3pg8grz8fmf6x"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -5656,12 +5656,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-05-21"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1c970361e49e974f93ef606ffd504b8e0c52f9fd"; - sha256 = "1nkqyk7q8lzgm8y4y62mm57s6hyvwfp7ia5p2vbfvls09z8qymk3"; + rev = "ff32ca1e08d3c934aadf21106b1ee623e5544912"; + sha256 = "0gkbav7icvcy411yaiav8vc4g1q6yk5gixbcwlaxib5c70zmvxlh"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5781,7 +5781,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -6352,12 +6352,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-29"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "1c63ac05e6bfe99cddcbf39dcdf84ff4660696e0"; - sha256 = "1yryf2dnkhphivnm1miakya8jq37iszgl97mjjar35819vrz7hab"; + rev = "808cb148d552d0369b0d2b74492086b1bfdbd22a"; + sha256 = "0mv56lb18zcjp18jfr9a8262bjsnsjsgirw8a2md8df60gd5jn5n"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6412,12 +6412,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-05-18"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c926aadfaf2cff0c684d305c8ff1a59378e7d7f5"; - sha256 = "00w1vdjq7hlgdq25ylxp13zdjnlf7lcl9sa4qjar8883z15z2yif"; + rev = "6ae064c5aa1cc24c78abc8d12ec236e99dc01316"; + sha256 = "017dm18dazg3svqyir1pncvnhczxcsnjdq85aypsrggf1mhd9m1a"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6460,12 +6460,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-05-06"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "0fe3f4eb4c4477d3dd09b155e20d128d99b1da3f"; - sha256 = "0viys51afhflfz3zjg769v7zxz422a3jra079ld94mn3kqan8lra"; + rev = "314fa6f289cec56d7d6e631f71b6d987832f0af4"; + sha256 = "0ar095jxrnfcfbg5gzwb82mz93hpwsdsclzam80424m0iapgl4li"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6484,12 +6484,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-04-22"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5"; - sha256 = "0h00i0b8p0mnynp7hhj2vpgj9rhqmlx14y2kcskvac8i2wlyj30c"; + rev = "10998f303cd85405e51380f6dc406dd756c105e8"; + sha256 = "0520sqya9i2ry5yfryqi1q7h6yg2vgqw1qa042f1b2r8ddgvxibk"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -6532,12 +6532,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "92328dcface63223fc7b0a1a61377e4dcf942582"; - sha256 = "1fqhif14whq8rpadx8wqmbba1rb2vwaxld2s5p87kf9kn9g12yiw"; + rev = "696c4a4ef79fc1fb8f090353cf404df95614ce46"; + sha256 = "1z811b62f5pafv3zmqjjcvmphikml8hzspdb7nvkyrr561awzwab"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6953,12 +6953,12 @@ final: prev: vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2021-05-20"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "3dc959f098029fafcb9add91397cfb65184cf066"; - sha256 = "0w4yw7d0rbbscvxxglw2kqbmnl4fi3p77053l1r45jyy6p442ybr"; + rev = "f8345cdb6734aefa5c0f9cb128c9efd005410a43"; + sha256 = "0s8bsfsjzc2djy2gvvf44g5ypsr7r3ax436xn0qpvhr58aa5m4dv"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -7519,12 +7519,12 @@ final: prev: vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; - version = "2019-05-12"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-ninja-feet"; - rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; - sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; + rev = "cb9b448dd468a338255aed474e6113ed115612c1"; + sha256 = "1aqmhqaxb72ih56mh85kv4fkxyqw5hfispd208lfyp4w3zhvli30"; }; meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; @@ -8071,12 +8071,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-05-07"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "e2c72b5cfb6a4e07e70806198c1ff491a6077fa8"; - sha256 = "1iyc8wjbr1iwch1vjzlw1x7q0vg7bnr4zwbga2rzw6lm0f8y4gkw"; + rev = "d556429fad4bf24d431be9f75322fd0d1a82bae2"; + sha256 = "0k1ffyy145nhmr9ad56vc10yy3jliyj8aahs0pm30fgi9q7qz7iy"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -8636,12 +8636,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-05-18"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0671670b1ee4bdc7552aba2972800bec66fffbe7"; - sha256 = "067sgc4qmplb3b1ddjwqzgfn4fvb7zgic330sygnbm6nq3nr0n92"; + rev = "4eb72005f87ff1bf3bc7e523b176bd6b391f6e24"; + sha256 = "1m42skcd6mn6gp5a6wrjg9zxsbdqa1qbg4d998js5chiwv2ajq4k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -8912,12 +8912,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-05-13"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "17fed1b0471e224c59b9ae1b8a3cbeea570dd14b"; - sha256 = "13ffj8jmbazw6s35ddwwfmbg33wqqpc823i45m0b4q9h4ybjn4ry"; + rev = "8041a909fc3f740e9d110dd2e95980ff4645785b"; + sha256 = "17zf839g8sr3i9amwvxx008m89m9hz3f34pbc90mpl5ksy4isdqv"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9260,12 +9260,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-20"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "99c0c4f763314851b9dd550750cedc793859f7d7"; - sha256 = "1im3d5m9jplyy8jaxd35x31rdp8fswh3av4js2abs5n1x0scg7ya"; + rev = "a51b8b23c9b7e12c2899e423037458d46dbe196e"; + sha256 = "0w49lgmg880pzblwwkkrp24pyvd8dkjbqvsx9m6n3x5n4zmz1c1f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9273,24 +9273,24 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dfec6def2d992f64411c2b4914f541b1d31f3737"; - sha256 = "0zg0fqnyph5pblramjsj7lpg0v7m09mphpi7qczqdak8mr61cwhm"; + rev = "8d3cbfff3d44e8af93948d3c7785130f54bc2386"; + sha256 = "0gwj70fxbpmwnrd78ralqq2nzk8gwqv6bd267kf64z9rxkwdhrs0"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-04-29"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "ee0dfae33062419f2c9ef6a202b3ce415adf6e6a"; - sha256 = "079pfs0hp9x2j9c7va78fjw7afp13yirgw9ajsd98lvkzrj5sflc"; + rev = "a1650d5f9bc2d617bb546bb8014a206e41089dc8"; + sha256 = "0gdhhkpcq654c7jv5ycnss3fra2mysz3zl64n46cq17vmwczbcrh"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -9369,12 +9369,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-20"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "20a85bd8bc54a11cf040aafa5d60f8a735eecfbd"; - sha256 = "03c2xwi6ids3na904f3j8x3xca73kzg9wbv5wl79vzqpvz29waw4"; + rev = "db851981595fc360e9b6196a7c3995611aceac3b"; + sha256 = "0y3mq6vrpmpxa8f42cxxf1209ardb3qraf44vgxwdaqqgphm7zk9"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -9490,12 +9490,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-05-18"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "ab73ca25467625ea71f1ee9103fca55cc10ba27a"; - sha256 = "0znj2djajmb7jcsnbpqrigvnb9dbcx1d390cn198b2zfd27kbkby"; + rev = "4df6f35f0c9f9aec21a3f567397496b5dee6acc7"; + sha256 = "1ywdxm9sy57k9wp9gkcahhsy8r75ahxsgb7xcdjpzacg4iranj99"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 9c6a4fabc7dfc006e9fa0427e8807b81de011e24 Mon Sep 17 00:00:00 2001 From: Ronan Mac Fhlannchadha Date: Thu, 27 May 2021 20:52:11 +0100 Subject: [PATCH 252/664] vimPlugins.vim-ultest: init at 2021-05-27 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 51d781f97ea0..6b100213f653 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8862,6 +8862,18 @@ final: prev: meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; + vim-ultest = buildVimPluginFrom2Nix { + pname = "vim-ultest"; + version = "2021-05-27"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "vim-ultest"; + rev = "2de66cbec0694da8f29a99e5c3167c7b9c4a7aff"; + sha256 = "0zxici08m9mk8ia1vr4pm0lgw2fg7p1v1dny89nd0x1r1xfwy4w2"; + }; + meta.homepage = "https://github.com/rcarriga/vim-ultest/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8184ee35aad6..89c6502b52f6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -531,6 +531,7 @@ ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog rcarriga/nvim-dap-ui +rcarriga/vim-ultest rhysd/committia.vim rhysd/conflict-marker.vim rhysd/devdocs.vim From 24129003fd275afb3ea7c26feaf7d6d374327e39 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Mon, 24 May 2021 20:12:36 -0700 Subject: [PATCH 253/664] lightspark: ffmpeg_3 -> ffmpeg --- pkgs/misc/lightspark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 7c9a4815e0a5..0e99767a2cb6 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm , llvm, glibmm }: @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; }; - patchPhase = '' + postPatch = '' sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt ''; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg pango xz nasm llvm glibmm ]; meta = with lib; { description = "Open source Flash Player implementation"; homepage = "https://lightspark.github.io/"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jchw ]; platforms = platforms.linux; }; From f262274b767d3fd7a92378aadce9d1942f60cc9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 May 2021 22:58:11 +0200 Subject: [PATCH 254/664] python3Packages.hstspreload: 2021.4.26 -> 2021.5.24 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 90cb27be8433..7c2c7d66350a 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.4.26"; + version = "2021.5.24"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-bjyOsZIsYE3xF2/imp+4HPOZzh5wIehAru/uqfijleE="; + sha256 = "sha256-Z1v2p8kn0IO38Cgr4tUp2n3zAiQntkskS7kYPUakC5U="; }; # tests require network connection From d35af2cae3ff0b34d5aaadb5e08b3edff285a084 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 May 2021 23:01:55 +0200 Subject: [PATCH 255/664] metasploit: 6.0.45 -> 6.0.46 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 26 +++++---- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 58 ++++++++++++++------- 4 files changed, 57 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 8b9ebc47d44d..cad1502a130c 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.45" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.46" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index c912fb8cd827..1b0c0732783c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 3854ad0ed69e231bf32e82d2d8e668030f4260c1 - ref: refs/tags/6.0.45 + revision: 7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0 + ref: refs/tags/6.0.46 specs: - metasploit-framework (6.0.45) + metasploit-framework (6.0.46) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -125,13 +125,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.460.0) + aws-partitions (1.464.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.236.0) + aws-sdk-ec2 (1.239.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.54.0) @@ -140,7 +140,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.1) + aws-sdk-s3 (1.95.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -172,16 +172,20 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.1) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) - faye-websocket (0.11.0) + faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) filesize (0.2.0) @@ -248,7 +252,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.7) - nokogiri (1.11.5) + nokogiri (1.11.6) mini_portile2 (~> 2.5.0) racc (~> 1.4) octokit (4.21.0) @@ -269,7 +273,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.3.1) + puma (5.3.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -387,7 +391,7 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) - websocket-driver (0.7.3) + websocket-driver (0.7.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) windows_error (0.1.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 82d37e8a608d..06a012eae289 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.45"; + version = "6.0.46"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-HLzjtOLqjv3hKMyPEVvHqoI0CpUexXFsI/PZyMjknJo="; + sha256 = "sha256-NZksDvlcSts1u66yhJ4BpZu5lvzp5eQxV4MscU7wQ/8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e85e06fd9a15..8c1ab823265a 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vh7vmp9hfvgx4889idpkdqr5a4bc3a26y2hybfahmvy224d3bh4"; + sha256 = "0mh8kpwwlc0s5k8yjjn6bvrrv0sqxnwpqsjsfljkjszbv1vcwksc"; type = "gem"; }; - version = "1.460.0"; + version = "1.464.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,10 +134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4gq4s5d9834n2p5gm1qchm8jvin1ipirc20z1j5lszjxxpy3c2"; + sha256 = "0995qsi717fdvv2wkpbm0iaz666q370q1a37vn3bn6g66v20m6cy"; type = "gem"; }; - version = "1.236.0"; + version = "1.239.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9"; + sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv"; type = "gem"; }; - version = "1.94.1"; + version = "1.95.1"; }; aws-sigv4 = { groups = ["default"]; @@ -354,10 +354,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi"; + sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; + }; + 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"]; @@ -394,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cwngdb41zh842y3nzz3cr7z2100pjsl7m3i05yjc1wlyrdk2sm3"; + sha256 = "14lrb065xc4mny9faf91357r8s91qsbi7zfzsfqlj202b8hsgqf8"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; filesize = { groups = ["default"]; @@ -554,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "3854ad0ed69e231bf32e82d2d8e668030f4260c1"; - sha256 = "16lwwk4cingk4dn73i8yjl5390maqxdi33yc53hzv3pawasf7g0w"; + rev = "7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0"; + sha256 = "1zs3y1772b43awqy9rg9zjbbk6x506g89cmfpcsxnjjwz472r69m"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.45"; + version = "6.0.46"; }; metasploit-model = { groups = ["default"]; @@ -736,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; + sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; type = "gem"; }; - version = "1.11.5"; + version = "1.11.6"; }; octokit = { groups = ["default"]; @@ -846,10 +866,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i"; + sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; type = "gem"; }; - version = "5.3.1"; + version = "5.3.2"; }; racc = { groups = ["default"]; @@ -1406,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + sha256 = "0l1wmvs0yf8gz64rymijx2pygwch99qdci91q8j193fwrz22bp7x"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.4"; }; websocket-extensions = { groups = ["default"]; From 005f0008a777d84885cca6a031988322d3100e1d Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Thu, 27 May 2021 22:39:23 +0100 Subject: [PATCH 256/664] fioctl: 0.16 -> 0.17 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index c27b18ac6d5d..0e0c977acd01 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw"; + sha256 = "sha256-u23BQ/sRAfUO36uqv7xY+DkseDnlVesgamsgne8N8kU="; }; - vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9"; + vendorSha256 = "sha256-6a+JMj3hh6GPuqnLknv7/uR8vsUsOgsS+pdxHoMqH5w="; runVend = true; From 1ba81f1004ccaef255c88773b43145c7310e9d8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 May 2021 23:42:01 +0200 Subject: [PATCH 257/664] python3Packages.awesomeversion: 21.4.0 -> 21.5.0 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 09a4c9460d1c..5eadd131d9ad 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.4.0"; + version = "21.5.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-ulByke1sKVcDdBhAz/fxdNFJ0PSjYVdnBcO+GYEnZUQ="; + sha256 = "sha256-0EOGWJZyvcRJyOqkcISvjL7o6lIaCwMKLftshsQCR6E="; }; postPatch = '' From 6377bc3662d4b7e1ad0bc2811933c73219d70b27 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 27 May 2021 23:46:23 +0200 Subject: [PATCH 258/664] Revert "element-desktop: set dbus default for firefox" This reverts commit becc715b8978f9fdf973da30637bbc5fc871fcf4. --- .../networking/instant-messengers/element/element-desktop.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 8c51750ad430..ea152fc22e65 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -45,8 +45,7 @@ in mkYarnPackage rec { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron" \ - --set-default MOZ_DBUS_REMOTE 1 + --add-flags "$out/share/element/electron" ''; # Do not attempt generating a tarball for element-web again. From 7233acd515546107e5902a8fef6832f4f319390c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 27 May 2021 09:59:49 +1000 Subject: [PATCH 259/664] docker: add clientOnly / docker-client Currently the docker client is only available on non-linux platforms as `docker`, this makes the client available on linux and other platforms as `docker-client`. --- pkgs/applications/virtualization/docker/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 954404e5268f..6b72653c3472 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -17,6 +17,7 @@ rec { , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests + , clientOnly ? !stdenv.isLinux }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -116,7 +117,7 @@ rec { ++ optional (libseccomp != null) "seccomp"; }); in - buildGoPackage ((optionalAttrs (stdenv.isLinux) { + buildGoPackage ((optionalAttrs (!clientOnly) { inherit docker-runc docker-containerd docker-proxy docker-tini moby; @@ -137,7 +138,7 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = optionals (stdenv.isLinux) [ + buildInputs = optionals (!clientOnly) [ sqlite lvm2 btrfs-progs systemd libseccomp ] ++ optionals (buildxSupport) [ docker-buildx ]; @@ -177,7 +178,7 @@ rec { makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" - '' + optionalString (stdenv.isLinux) '' + '' + optionalString (!clientOnly) '' # symlink docker daemon to docker cli derivation ln -s ${moby}/bin/dockerd $out/bin/dockerd @@ -204,7 +205,7 @@ rec { installManPage man/*/*.[1-9] ''; - passthru.tests = { inherit (nixosTests) docker; }; + passthru.tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; meta = { homepage = "https://www.docker.com/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db768bed3a3e..fc34e1d23531 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23058,6 +23058,7 @@ in docker = docker_20_10; docker-edge = docker_20_10; + docker-client = docker.override { clientOnly = true; }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 67a828365333e6370be98c1b1cb0301783a8cd5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 27 May 2021 10:10:50 +1000 Subject: [PATCH 260/664] .github/workflows/manual-{nixos,nixpkgs}.yml: add `repository_owner` condition We have this set in the other actions, it prevents the action from running in PRs made against forks. --- .github/workflows/manual-nixos.yml | 1 + .github/workflows/manual-nixpkgs.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index c885f6f7665c..032a456569d3 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -12,6 +12,7 @@ on: jobs: nixos: runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 6f7ad10efd90..77655c494e06 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -12,6 +12,7 @@ on: jobs: nixpkgs: runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@v2 with: From 8917ffe7232e1e9db23ec9405248fd1944d0b36f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 27 May 2021 10:13:55 +1000 Subject: [PATCH 261/664] .github/workflows/merge-staging.yml: change condition to `repository_owner` This is consistent with the other actions. --- .github/workflows/merge-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml index f28c2ddfc789..e499630a083b 100644 --- a/.github/workflows/merge-staging.yml +++ b/.github/workflows/merge-staging.yml @@ -8,7 +8,7 @@ on: jobs: sync-branch: - if: github.repository == 'NixOS/nixpkgs' + if: github.repository_owner == 'NixOS' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From e2586c992f25ddc769342d566ddfc63ee1f075d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 00:53:28 +0200 Subject: [PATCH 262/664] python3Packages.prayer-times-calculator: 0.0.4 -> 0.0.5 (#124699) --- .../python-modules/prayer-times-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index 758c52f1d4b5..9508cd0e435d 100644 --- a/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.4"; + version = "0.0.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "uchagani"; repo = pname; rev = version; - sha256 = "053wa0zzfflaxlllh6sxgnrqqx8qyv4jcj85fsiv6n608kw202d5"; + sha256 = "sha256-wm1r0MK6dx0cJvyQ7ulxvGWyIrNiPV2RXJD/IuKP3+E="; }; propagatedBuildInputs = [ From 32e85273a446c76f2da79ca99fc4ab7cef443d24 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 01:02:01 +0000 Subject: [PATCH 263/664] argo: 3.0.6 -> 3.0.7 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index fa9416f927f8..78d6ea1a1e7e 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-QD5V6Bz/wfbyNPoXizjhPGyHN7ieotsYbwLTz2ADfcY="; + sha256 = "sha256-lZTSUNtmJZKONt0Bv42dBAc+87L14HaPxvPxhFe8nyc="; }; vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; From d12e2881bcb11c00e047d9a01b10dcc671bc5160 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 25 May 2021 10:39:13 +0200 Subject: [PATCH 264/664] elpi: 1.13.1 -> 1.13.5 --- pkgs/development/ocaml-modules/elpi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 38ba8f478bda..642a249e4937 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchzip, buildDunePackage, camlp5 , ppxlib, ppx_deriving, re, perl, ncurses -, version ? "1.13.1" +, version ? "1.13.5" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; From abc154793a768ae3b7b412df9d8b118ec0331bae Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 25 May 2021 10:39:27 +0200 Subject: [PATCH 265/664] coq-elpi: 1.9.7 -> 1.10.1 --- pkgs/development/coq-modules/coq-elpi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 0aff0e3b54d4..da8f9fdc5581 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -4,7 +4,7 @@ with builtins; with lib; let elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [ { case = "8.11"; out = { version = "1.11.4"; };} { case = "8.12"; out = { version = "1.12.0"; };} - { case = "8.13"; out = { version = "1.13.1"; };} + { case = "8.13"; out = { version = "1.13.5"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -12,10 +12,11 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.13"; out = "1.9.7"; } + { case = "8.13"; out = "1.10.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.10.1".sha256 = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk"; release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1"; release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6"; release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; From 6fb5325d5cc3fc3e9c95b4b73507ab968c89da9b Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 25 May 2021 12:43:21 +0200 Subject: [PATCH 266/664] coq-elpi: clarify license --- pkgs/development/coq-modules/coq-elpi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index da8f9fdc5581..5bf0cd8f8351 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -47,6 +47,6 @@ in mkCoqDerivation { meta = { description = "Coq plugin embedding ELPI."; maintainers = [ maintainers.cohencyril ]; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; }; } From 4f7e83d1cf55d181b9d824e2b01175688a866def Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 00:55:16 +0000 Subject: [PATCH 267/664] apfel: 3.0.4 -> 3.0.5 --- pkgs/development/libraries/physics/apfel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index e3fd0a26a7fd..b0fff0c92ba5 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "apfel"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "13n5ygbqvskg3qq5n4sff1nbii0li0zf1vqissai7x0hynxgy7p6"; + sha256 = "sha256-szEtSC/NouYlHSjVoX9Hoh7yQ0W82rVccYEF1L2tXoU="; }; buildInputs = [ gfortran lhapdf python2 zlib ]; From f625036c9eb78d4c8cae069d82647628fa986f18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 01:47:59 +0000 Subject: [PATCH 268/664] brave: 1.24.86 -> 1.25.68 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe4a33e65cf4..feff2a74b14e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.24.86"; + version = "1.25.68"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg="; + sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I="; }; dontConfigure = true; From 37802cc29a38584d503ba401c34a08049ec01359 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 02:05:33 +0000 Subject: [PATCH 269/664] cargo-msrv: 0.5.0 -> 0.6.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index c6a02a4dff21..74c2d9e680f0 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; + sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY="; }; - cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; + cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek="; passthru = { updateScript = nix-update-script { From 7abfd08f2e28a6ff0b66a7ad8d7e59f07c59363f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 02:12:01 +0000 Subject: [PATCH 270/664] chezmoi: 2.0.12 -> 2.0.13 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index b4fa271ff589..b7a717b5b2f3 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-CF/Ers/w1ZGBSvRVxyNf1R4CwwidK9ItiFBCIjToYg0="; + sha256 = "sha256-ApgprU8PC5sn62D6eM1JG3s4DD2+e8SfyPpiC/6ANmQ="; }; - vendorSha256 = "sha256-tdd3uUxN+ZJ0hX4IqSM/xPZzcawtOa5xgjPhRrns5yM="; + vendorSha256 = "sha256-07v+JzOYtfaaL2M/z5FOWlhhaEwWwc0wui3RLynP5N8="; doCheck = false; From 0c54d04a5280a91d5419cbb6154244a3743183f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 03:20:06 +0000 Subject: [PATCH 271/664] earthly: 0.5.13 -> 0.5.14 --- pkgs/development/tools/earthly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 68a8d1d03523..588716b9f30c 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-XN3E1oCIlohALnaP17WOB7/1vaklmyAfVZLxrBOXhbo="; + sha256 = "sha256-XB3zfbcuEgkqQ7DGnyUJj3K+qUH2DNv3n1/0mlocqfM="; }; vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; From 4052d0ecebf6fe3cc14314fa2d5080c24f3e1b8e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 28 May 2021 04:20:00 +0000 Subject: [PATCH 272/664] gitAndTools.delta: 0.7.1 -> 0.8.0 https://github.com/dandavison/delta/releases/tag/0.8.0 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index c6a92413949b..f642a7d9afb3 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a"; + sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8"; }; - cargoSha256 = "1w1w98vhjd561mkiwv89zb8k0nf1p5fc67jb5dddwg9nj6mqjrhp"; + cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr"; nativeBuildInputs = [ installShellFiles ]; From dbb20ed05d60b74cd7656164b5bf419cfb6104fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 28 May 2021 04:20:00 +0000 Subject: [PATCH 273/664] ncspot: 0.7.1 -> 0.7.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.7.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d914b9963fc2..416bdfb90d68 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1qhdhybbgnn7ky9qdxwi07flwzjagp22qmlccbz1z3lhznm9a971"; + sha256 = "0ww7ipyvcdphbkzjpvdqs1s3bqk3rj3jdy1n3bnk76csw9vgn2zi"; }; - cargoSha256 = "1kv37ib0klykmjabm1qyz55frs7djkx225alj4rk4a92xq9m8i9v"; + cargoSha256 = "1mrjp5p3iryxzgg6ca9zjwm8n6w0ljs108ll0wkwgfih6rip7ba4"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From 172537724e7c7d4a4c12d4d15917398077dc5c9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 04:33:33 +0000 Subject: [PATCH 274/664] exoscale-cli: 1.29.0 -> 1.30.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index d717c249fee1..f9377c607219 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M="; + sha256 = "sha256-7KuQC9L9Tp4s0E2iOlhgmezzjys1UhpHEe0gaYcy8oM="; }; goPackagePath = "github.com/exoscale/cli"; From 760592a19186ae5910507649aa513d2f511237a6 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Tue, 25 May 2021 15:12:25 +0530 Subject: [PATCH 275/664] xplr: 0.10.1 -> 0.13.1 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 56553a80e912..6bd2c60b09b0 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.10.1"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - sha256 = "17x514pwbkzkkrd47a66a4iz3bxrxvm8hk5hphsfbhgzqfnf9iy7"; + sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "03y2fk174rdjvw8wdzwc0hhj0zqwpap7qcga51yhq877rgyxbxir"; + cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From bd7bc0a4b07ec8125d9e4cbf5bab9f84065311d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 05:52:38 +0000 Subject: [PATCH 276/664] gosec: 2.7.0 -> 2.8.0 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 5f0f2da2daaa..a24ec1050146 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.7.0"; + version = "2.8.0"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U7+0wXnuIDlATpVRVknwaPxib36+iYvvYUVM6d7Xf6I="; + sha256 = "sha256-AC3NHW7LYbpZGA+iaM9eXFLothhqZuvRJM1ehBByhpk="; }; - vendorSha256 = "sha256-nr1rx6GM+ETcfLreYT081xNzUz2exloogJ+gcwF2u2o="; + vendorSha256 = "sha256-QfbElEjkYdmzYhQ8TOFIb2jfG2xzbW1UL2eLxROsBfw="; doCheck = false; From 03465e588bf3ac86b30af3473b4f254305d9f61b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 28 May 2021 08:00:08 +0200 Subject: [PATCH 277/664] morph: 1.5.0 -> 1.6.0 https://github.com/DBCDK/morph/releases/tag/v1.6.0 --- pkgs/tools/package-management/morph/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 61e4a897f48d..56d824059f53 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,18 +1,17 @@ -{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: +{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "morph"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20"; + sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8"; }; - goPackagePath = "github.com/dbcdk/morph"; - goDeps = ./deps.nix; + vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; nativeBuildInputs = [ makeWrapper go-bindata ]; @@ -28,7 +27,7 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib - cp -v go/src/$goPackagePath/data/*.nix $lib + cp -v ./data/*.nix $lib wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; From 2f46d77e2806dd22f4ec4ac6ea3f9981df81dd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 May 2021 07:40:34 +0200 Subject: [PATCH 278/664] rustPlatform.importCargoLock: init This function can be used to create an output path that is a cargo vendor directory. In contrast to e.g. fetchCargoTarball all the dependent crates are fetched using fixed-output derivations. The hashes for the fixed-output derivations are gathered from the Cargo.lock file. Usage is very simple, e.g.: importCargoLock { lockFile = ./Cargo.lock; } would use the lockfile from the current directory. The implementation of this function is based on Eelco Dolstra's import-cargo: https://github.com/edolstra/import-cargo/blob/master/flake.nix Compared to upstream: - We use fetchgit in place of builtins.fetchGit. - Sync to current cargo vendoring. --- doc/languages-frameworks/rust.section.md | 31 ++++ pkgs/build-support/rust/import-cargo-lock.nix | 167 ++++++++++++++++++ .../compilers/rust/make-rust-platform.nix | 2 + 3 files changed, 200 insertions(+) create mode 100644 pkgs/build-support/rust/import-cargo-lock.nix diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index d1a6a566774c..70aced7d5cb1 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -308,6 +308,37 @@ attributes can also be used: the `Cargo.lock`/`Cargo.toml` files need to be patched before vendoring. +If a `Cargo.lock` file is available, you can alternatively use the +`importCargoLock` function. In contrast to `fetchCargoTarball`, this +function does not require a hash (unless git dependencies are used) +and fetches every dependency as a separate fixed-output derivation. +`importCargoLock` can be used as follows: + +``` +cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; +}; +``` + +If the `Cargo.lock` file includes git dependencies, then their output +hashes need to be specified since they are not available through the +lock file. For example: + +``` +cargoDeps = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; + }; +}; +``` + +If you do not specify an output hash for a git dependency, building +`cargoDeps` will fail and inform you of which crate needs to be +added. To find the correct hash, you can first use `lib.fakeSha256` or +`lib.fakeHash` as a stub hash. Building `cargoDeps` will then inform +you of the correct hash. + ### Hooks `rustPlatform` provides the following hooks to automate Cargo builds: diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix new file mode 100644 index 000000000000..244572f79e80 --- /dev/null +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -0,0 +1,167 @@ +{ fetchgit, fetchurl, lib, runCommand, cargo, jq }: + +{ + # Cargo lock file + lockFile + + # Hashes for git dependencies. +, outputHashes ? {} +}: + +let + # Parse a git source into different components. + parseGit = src: + let + parts = builtins.match ''git\+([^?]+)(\?rev=(.*))?#(.*)?'' src; + rev = builtins.elemAt parts 2; + in + if parts == null then null + else { + url = builtins.elemAt parts 0; + sha = builtins.elemAt parts 3; + } // lib.optionalAttrs (rev != null) { inherit rev; }; + + packages = (builtins.fromTOML (builtins.readFile lockFile)).package; + + # There is no source attribute for the source package itself. But + # since we do not want to vendor the source package anyway, we can + # safely skip it. + depPackages = (builtins.filter (p: p ? "source") packages); + + # Create dependent crates from packages. + # + # Force evaluation of the git SHA -> hash mapping, so that an error is + # thrown if there are stale hashes. We cannot rely on gitShaOutputHash + # being evaluated otherwise, since there could be no git dependencies. + depCrates = builtins.deepSeq (gitShaOutputHash) (builtins.map mkCrate depPackages); + + # Map package name + version to git commit SHA for packages with a git source. + namesGitShas = builtins.listToAttrs ( + builtins.map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages) + ); + + nameGitSha = pkg: let gitParts = parseGit pkg.source; in { + name = "${pkg.name}-${pkg.version}"; + value = gitParts.sha; + }; + + # Convert the attrset provided through the `outputHashes` argument to a + # a mapping from git commit SHA -> output hash. + # + # There may be multiple different packages with different names + # originating from the same git repository (typically a Cargo + # workspace). By using the git commit SHA as a universal identifier, + # the user does not have to specify the output hash for every package + # individually. + gitShaOutputHash = lib.mapAttrs' (nameVer: hash: + let + unusedHash = throw "A hash was specified for ${nameVer}, but there is no corresponding git dependency."; + rev = namesGitShas.${nameVer} or unusedHash; in { + name = rev; + value = hash; + }) outputHashes; + + # We can't use the existing fetchCrate function, since it uses a + # recursive hash of the unpacked crate. + fetchCrate = pkg: fetchurl { + name = "crate-${pkg.name}-${pkg.version}.tar.gz"; + url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download"; + sha256 = pkg.checksum; + }; + + # Fetch and unpack a crate. + mkCrate = pkg: + let + gitParts = parseGit pkg.source; + in + if pkg.source == "registry+https://github.com/rust-lang/crates.io-index" then + let + crateTarball = fetchCrate pkg; + in runCommand "${pkg.name}-${pkg.version}" {} '' + mkdir $out + tar xf "${crateTarball}" -C $out --strip-components=1 + + # Cargo is happy with largely empty metadata. + printf '{"files":{},"package":"${pkg.checksum}"}' > "$out/.cargo-checksum.json" + '' + else if gitParts != null then + let + missingHash = throw '' + No hash was found while vendoring the git dependency ${pkg.name}-${pkg.version}. You can add + a hash through the `outputHashes` argument of `importCargoLock`: + + outputHashes = { + "${pkg.name}-${pkg.version}" = ""; + }; + + If you use `buildRustPackage`, you can add this attribute to the `cargoLock` + attribute set. + ''; + sha256 = gitShaOutputHash.${gitParts.sha} or missingHash; + tree = fetchgit { + inherit sha256; + inherit (gitParts) url; + rev = gitParts.sha; # The commit SHA is always available. + }; + in runCommand "${pkg.name}-${pkg.version}" {} '' + tree=${tree} + if grep --quiet '\[workspace\]' "$tree/Cargo.toml"; then + # If the target package is in a workspace, find the crate path + # using `cargo metadata`. + crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \ + ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path') + + if [[ ! -z $crateCargoTOML ]]; then + tree=$(dirname $crateCargoTOML) + else + >&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the Cargo workspace in: $tree" + exit 1 + fi + fi + + cp -prvd "$tree/" $out + chmod u+w $out + + # Cargo is happy with empty metadata. + printf '{"files":{},"package":null}' > "$out/.cargo-checksum.json" + + # Set up configuration for the vendor directory. + cat > $out/.cargo-config < $out/.cargo/config <> $out/.cargo/config + fi + fi + done + ''; +in + vendorDir diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 584b1fdbe438..2343fd749011 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -16,6 +16,8 @@ rec { fetchCargoTarball rustc; }; + importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; + rustcSrc = callPackage ./rust-src.nix { inherit rustc; }; From b3969f3ad793ee98af14cf0c649f626520943a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 May 2021 07:44:31 +0200 Subject: [PATCH 279/664] rustPlatform.buildRustPackage: support direct use of Cargo.lock This change introduces the cargoLock argument to buildRustPackage, which can be used in place of cargo{Sha256,Hash} or cargoVendorDir. It uses the importCargoLock function to build the vendor directory. Differences compared to cargo{Sha256,Hash}: - Requires a Cargo.lock file. - Does not require a Cargo hash. - Retrieves all dependencies as fixed-output derivations. This makes buildRustPackage much easier to use as part of a Rust project, since it does not require updating cargo{Sha256,Hash} for every change to the lock file. --- doc/languages-frameworks/rust.section.md | 48 +++++++++++++++++++ pkgs/build-support/rust/default.nix | 25 ++++++---- .../compilers/rust/make-rust-platform.nix | 2 +- 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 70aced7d5cb1..008909e5c76a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -107,6 +107,54 @@ rustPlatform.buildRustPackage rec { } ``` +### Importing a `Cargo.lock` file + +Using `cargoSha256` or `cargoHash` is tedious when using +`buildRustPackage` within a project, since it requires that the hash +is updated after every change to `Cargo.lock`. Therefore, +`buildRustPackage` also supports vendoring dependencies directly from +a `Cargo.lock` file using the `cargoLock` argument. For example: + +```nix +rustPlatform.buildRustPackage rec { + pname = "myproject"; + version = "1.0.0"; + + cargoLock = { + lockFile = ./Cargo.lock; + } + + # ... +} +``` + +This will retrieve the dependencies using fixed-output derivations from +the specified lockfile. + +The output hash of each dependency that uses a git source must be +specified in the `outputHashes` attribute. For example: + +```nix +rustPlatform.buildRustPackage rec { + pname = "myproject"; + version = "1.0.0"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904"; + }; + } + + # ... +} +``` + +If you do not specify an output hash for a git dependency, building +the package will fail and inform you of which crate needs to be +added. To find the correct hash, you can first use `lib.fakeSha256` or +`lib.fakeHash` as a stub hash. Building the package (and thus the +vendored dependencies) will then inform you of the correct hash. ### Cross compilation diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ff9ca642daad..711276116a66 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -7,6 +7,7 @@ , cargoInstallHook , cargoSetupHook , fetchCargoTarball +, importCargoLock , runCommandNoCC , rustPlatform , callPackage @@ -41,6 +42,7 @@ , cargoDepsHook ? "" , buildType ? "release" , meta ? {} +, cargoLock ? null , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} @@ -55,19 +57,22 @@ , buildAndTestSubdir ? null , ... } @ args: -assert cargoVendorDir == null -> !(cargoSha256 == "" && cargoHash == ""); +assert cargoVendorDir == null && cargoLock == null -> cargoSha256 == "" && cargoHash == "" + -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; assert buildType == "release" || buildType == "debug"; let - cargoDeps = if cargoVendorDir == null - then fetchCargoTarball ({ - inherit src srcs sourceRoot unpackPhase cargoUpdateHook; - name = cargoDepsName; - hash = cargoHash; - patches = cargoPatches; - sha256 = cargoSha256; - } // depsExtraArgs) + cargoDeps = + if cargoVendorDir == null + then if cargoLock != null then importCargoLock cargoLock + else fetchCargoTarball ({ + inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + name = cargoDepsName; + hash = cargoHash; + patches = cargoPatches; + sha256 = cargoSha256; + } // depsExtraArgs) else null; # If we have a cargoSha256 fixed-output derivation, validate it at build time @@ -96,7 +101,7 @@ in # See https://os.phil-opp.com/testing/ for more information. assert useSysroot -> !(args.doCheck or true); -stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot { +stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoLock" ]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // { inherit buildAndTestSubdir cargoDeps; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 2343fd749011..2a38933df16c 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -13,7 +13,7 @@ rec { buildRustPackage = callPackage ../../../build-support/rust { inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook - fetchCargoTarball rustc; + fetchCargoTarball importCargoLock rustc; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; From d3769e43c34fe16a263938c584e6cdc92b18f6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 May 2021 11:33:29 +0200 Subject: [PATCH 280/664] rustPlatform.importCargoLock: add test cases for importCargoLock --- .../test/import-cargo-lock/basic/Cargo.lock | 83 +++ .../test/import-cargo-lock/basic/Cargo.toml | 8 + .../test/import-cargo-lock/basic/default.nix | 18 + .../test/import-cargo-lock/basic/src/main.rs | 9 + .../rust/test/import-cargo-lock/default.nix | 8 + .../git-dependency-no-rev/Cargo.lock | 79 ++ .../git-dependency-no-rev/Cargo.toml | 8 + .../git-dependency-no-rev/default.nix | 21 + .../git-dependency-no-rev/src/main.rs | 9 + .../git-dependency/Cargo.lock | 79 ++ .../git-dependency/Cargo.toml | 8 + .../git-dependency/default.nix | 21 + .../git-dependency/src/main.rs | 9 + .../test/import-cargo-lock/maturin/Cargo.lock | 682 ++++++++++++++++++ .../import-cargo-lock/maturin/default.nix | 43 ++ pkgs/test/default.nix | 1 + 16 files changed, 1086 insertions(+) create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock new file mode 100644 index 000000000000..fd1b5e42ad30 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock @@ -0,0 +1,83 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "basic" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml new file mode 100644 index 000000000000..f555bb0de62e --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "basic" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = "0.8" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix new file mode 100644 index 000000000000..d595b58109ad --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix @@ -0,0 +1,18 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "basic"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/basic + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix new file mode 100644 index 000000000000..2dd525a8ac3f --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -0,0 +1,8 @@ +{ callPackage }: + +{ + basic = callPackage ./basic { }; + gitDependency = callPackage ./git-dependency { }; + gitDependencyNoRev = callPackage ./git-dependency-no-rev { }; + maturin = callPackage ./maturin { }; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock new file mode 100644 index 000000000000..54b9c7c5739d --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock @@ -0,0 +1,79 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency-no-rev" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml new file mode 100644 index 000000000000..770dfb86f523 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency-no-rev" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix new file mode 100644 index 000000000000..fc36edc40772 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency-no-rev"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency-no-rev + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock new file mode 100644 index 000000000000..50600ef4caa5 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock @@ -0,0 +1,79 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.1" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml new file mode 100644 index 000000000000..11ee8b1763e6 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix new file mode 100644 index 000000000000..17276c5f5c3c --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock new file mode 100644 index 000000000000..5e698d4ff735 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock @@ -0,0 +1,682 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "assert_approx_eq" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "byteorder" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +dependencies = [ + "cfg-if", + "const_fn", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static", +] + +[[package]] +name = "ctor" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" +dependencies = [ + "ctor", + "ghost", + "inventory-impl", +] + +[[package]] +name = "inventory-impl" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" + +[[package]] +name = "lock_api" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "proptest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" +dependencies = [ + "bitflags", + "byteorder", + "lazy_static", + "num-traits", + "quick-error", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", +] + +[[package]] +name = "pyo3" +version = "0.13.2" +dependencies = [ + "assert_approx_eq", + "cfg-if", + "ctor", + "hashbrown", + "indoc", + "inventory", + "libc", + "num-bigint", + "num-complex", + "parking_lot", + "paste", + "proptest", + "pyo3", + "pyo3-macros", + "rustversion", + "serde", + "serde_json", + "trybuild", + "unindent", +] + +[[package]] +name = "pyo3-macros" +version = "0.13.2" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.13.2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_xorshift" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex-syntax" +version = "0.6.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" + +[[package]] +name = "rustapi-module" +version = "0.1.0" +dependencies = [ + "pyo3", +] + +[[package]] +name = "rustversion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "syn" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "word-count" +version = "0.1.0" +dependencies = [ + "pyo3", + "rayon", +] diff --git a/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix new file mode 100644 index 000000000000..af0de596b387 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3 +, rustPlatform +}: + +python3.pkgs.buildPythonPackage rec { + pname = "word-count"; + version = "0.13.2"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "PyO3"; + repo = "pyo3"; + rev = "v${version}"; + hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + buildAndTestSubdir = "examples/word-count"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + pythonImportsCheck = [ "word_count" ]; + + meta = with lib; { + description = "PyO3 word count example"; + homepage = "https://github.com/PyO3/pyo3"; + license = licenses.asl20; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b24fc539c93d..406b3191b7f7 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -40,6 +40,7 @@ with pkgs; rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; + importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; vim = callPackage ./vim {}; From f85ecdf38cb9cb375a9f0caf4bb0478de0f8e608 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 06:36:24 +0000 Subject: [PATCH 281/664] httpx: 1.0.7 -> 1.0.8 --- pkgs/tools/security/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 851cdbe0a1a4..f16a4f90fbdc 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-UrukkBY4kxAh9V4V1VoHMfBGx9rH6A+kZI0BtkT0ito="; + sha256 = "sha256-MOe/2TMUFJXdQlwkSIFEAVvOu5DbaCfTro1/WEzQkRw="; }; vendorSha256 = "sha256-yk94jD8gwgmEroxg7vzfaISVakMv3+tUoq+Auas751w="; From 5be9a1d161bd5ef37da9dd71e3545731247c5c35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 06:46:38 +0000 Subject: [PATCH 282/664] icinga2: 2.12.3 -> 2.12.4 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index e3ea1a802510..44c512196c65 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.3"; + version = "2.12.4"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "0pq6ixv7d9bqys8qjxqq0jki3zncj8jdfavkp7qw125iyfjq48xk"; + sha256 = "sha256-SJBOZzLbmW4525G3w6BVS53kOd2bJ5rEbwwb4Lo5q8I="; }; patches = [ From 9ebbbc69a9183e98eeb7a2fdd5708bb9db307151 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 07:41:47 +0000 Subject: [PATCH 283/664] kubesec: 2.11.0 -> 2.11.1 --- pkgs/tools/security/kubesec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index 3059ba9af9f5..31b76727cddc 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "0rv5qywh8107rqdly1x7wkb6dljalyn9abrkm12bxa7cqscp9b4z"; + sha256 = "sha256-vT+SiSt9QoOkGbnPdKkzE8yehNJMa/3jYC+4h4QeNmw="; }; - vendorSha256 = "0xngnx67giwp0g7c19xhb6kmc9m3bjlwk2wwp9bn9vwkmss3ysyp"; + vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc="; # Tests wants to download additional files doCheck = false; From b72c2d380687d26c899f73f29ccb08d6836ff3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 10:32:57 +0200 Subject: [PATCH 284/664] duplicati: 2.0.5.1 -> 2.0.6.1, fix nixos module --- nixos/modules/services/backup/duplicati.nix | 12 +++++++----- pkgs/tools/backup/duplicati/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 0ff720c5897d..cf5aebdecd28 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -54,11 +54,13 @@ in }; }; - users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") { - uid = config.ids.uids.duplicati; - home = "/var/lib/duplicati"; - createHome = true; - group = "duplicati"; + users.users = lib.optionalAttrs (cfg.user == "duplicati") { + duplicati = { + uid = config.ids.uids.duplicati; + home = "/var/lib/duplicati"; + createHome = true; + group = "duplicati"; + }; }; users.groups.duplicati.gid = config.ids.gids.duplicati; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 2d9124d6f51a..48ce604cd717 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "duplicati"; - version = "2.0.5.1"; + version = "2.0.6.1"; channel = "beta"; - build_date = "2020-01-18"; + build_date = "2021-05-03"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "1k3gfwcw7snxkqn4lf9rx1vzradpyq5vc48pwvaa8wwqnlykiimw"; + sha256 = "09537hswpicsx47vfdm78j3h7vvjd7nqjd2461jrln57nl7v7dac"; stripRoot = false; }; From c00957f455331c9094eed7d8c60218629e744f70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 10:34:12 +0000 Subject: [PATCH 285/664] cargo-deb: 1.29.2 -> 1.30.0 --- pkgs/tools/package-management/cargo-deb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 4ed3b21b64b8..5a1e621d12a0 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.29.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ="; + sha256 = "sha256-rAmG6Aj0D9dHVueh1BN1Chhit+XFhqGib1WTvMDy0LI="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM="; + cargoSha256 = "sha256-MEpyEdjLWNZvqE7gJLvQ169tgmJRzec4vqQI9fF3xr8="; preCheck = '' substituteInPlace tests/command.rs \ From 262658cca8ab2f94563ed30cb9a43f37f02088cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 10:51:27 +0000 Subject: [PATCH 286/664] cbonsai: 1.0.4 -> 1.1.1 --- pkgs/games/cbonsai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index c817b5d36b5b..42e89d235df7 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.1.1"; pname = "cbonsai"; src = fetchFromGitLab { owner = "jallbrit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yyvisExf4Minyr1ApJQ2SoctfjhdU6kEbgBGgHDtCg="; + sha256 = "sha256-IgtBHy6JCuTTXL0GNnaRCLrmQ9QDatK15WvrBBvux6s="; }; nativeBuildInputs = [ pkg-config ]; From 424cd7d999bb9a35ec3a545883530f9c7c9fd6c1 Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Sun, 21 Feb 2021 23:17:27 +0100 Subject: [PATCH 287/664] gnome-flashback: add option to remove gnome-panel, auto-generate wmName --- .../services/x11/desktop-managers/gnome.nix | 59 ++++++++++++------- .../services/x11/desktop-managers/gnome.xml | 1 + .../gnome/misc/gnome-flashback/default.nix | 24 ++++---- 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bacada9cbe74..c5e6caeea902 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -56,6 +56,12 @@ let ''; flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; + flashbackWms = optional cfg.flashback.enableMetacity { + wmName = "metacity"; + wmLabel = "Metacity"; + wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; + enableGnomePanel = true; + } ++ cfg.flashback.customSessions; notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages)); @@ -216,20 +222,25 @@ in debug = mkEnableOption "gnome-session debug messages"; flashback = { - enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; + enableMetacity = mkOption { + type = types.bool; + default = true; + example = "false"; + description = "Whether to enable the standard Metacity GNOME flashback session."; + }; customSessions = mkOption { type = types.listOf (types.submodule { options = { wmName = mkOption { - type = types.str; - description = "The filename-compatible name of the window manager to use."; + type = types.strMatching "[a-zA-Z0-9_-]+"; + description = "A unique identifier for the window manager."; example = "xmonad"; }; wmLabel = mkOption { type = types.str; - description = "The pretty name of the window manager to use."; + description = "The name of the window manager to show in the session chooser."; example = "XMonad"; }; @@ -238,6 +249,13 @@ in description = "The executable of the window manager to use."; example = "\${pkgs.haskellPackages.xmonad}/bin/xmonad"; }; + + enableGnomePanel = mkOption { + type = types.bool; + default = true; + example = "false"; + description = "Whether to enable the GNOME panel in this session."; + }; }; }); default = []; @@ -295,14 +313,18 @@ in }) (mkIf flashbackEnabled { - services.xserver.displayManager.sessionPackages = map - (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { - inherit (wm) wmName wmLabel wmCommand; - }) (optional cfg.flashback.enableMetacity { - wmName = "metacity"; - wmLabel = "Metacity"; - wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; - } ++ cfg.flashback.customSessions); + services.xserver.displayManager.sessionPackages = + let + wmNames = map (wm: wm.wmName) flashbackWms; + namesAreUnique = lib.unique wmNames == wmNames; + in + assert (assertMsg namesAreUnique "Flashback WM names must be unique."); + map + (wm: + pkgs.gnome.gnome-flashback.mkSessionForWm { + inherit (wm) wmName wmLabel wmCommand enableGnomePanel; + } + ) flashbackWms; security.pam.services.gnome-flashback = { enableGnomeKeyring = true; @@ -310,15 +332,12 @@ in systemd.packages = with pkgs.gnome; [ gnome-flashback - ] ++ (map - (wm: gnome-flashback.mkSystemdTargetForWm { - inherit (wm) wmName; - }) cfg.flashback.customSessions); + ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; - # gnome-panel needs these for menu applet - environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; - # TODO: switch to sessionVariables (resolve conflict) - environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; + # gnome-panel needs these for menu applet + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; + # TODO: switch to sessionVariables (resolve conflict) + environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; }) (mkIf serviceCfg.core-os-services.enable { diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml index 624d5c894e74..6c53bacacb32 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ b/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -120,6 +120,7 @@ wmName = "xmonad"; wmLabel = "XMonad"; wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; + enableGnomePanel = false; } ]; diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 7e578f27cd29..2e8662ede0c7 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -33,10 +33,9 @@ let version = "3.40.0"; # From data/sessions/Makefile.am - requiredComponentsCommon = [ - "gnome-flashback" - "gnome-panel" - ]; + requiredComponentsCommon = enableGnomePanel: + [ "gnome-flashback" ] + ++ lib.optional enableGnomePanel "gnome-panel"; requiredComponentsGsd = [ "org.gnome.SettingsDaemon.A11ySettings" "org.gnome.SettingsDaemon.Color" @@ -55,7 +54,8 @@ let "org.gnome.SettingsDaemon.Wacom" "org.gnome.SettingsDaemon.XSettings" ]; - requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; + requiredComponents = wmName: enableGnomePanel: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd)};"; + gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -77,7 +77,7 @@ let postInstall = '' # Check that our expected RequiredComponents match the stock session files, but then don't install them. # They can be installed using mkSessionForWm. - grep '${requiredComponents "metacity"}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) + grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) rm -r $out/share/gnome-session rm -r $out/share/xsessions @@ -126,7 +126,7 @@ let versionPolicy = "odd-unstable"; }; - mkSessionForWm = { wmName, wmLabel, wmCommand }: + mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }: let wmApplication = writeTextFile { name = "gnome-flashback-${wmName}-wm"; @@ -151,7 +151,7 @@ let text = '' [GNOME Session] Name=GNOME Flashback (${wmLabel}) - ${requiredComponents wmName} + ${requiredComponents wmName enableGnomePanel} ''; }; @@ -183,11 +183,11 @@ let providedSessions = [ "gnome-flashback-${wmName}" ]; }; - mkSystemdTargetForWm = { wmName }: - runCommand "gnome-flashback-${wmName}.target" { } '' + mkSystemdTargetForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }: + runCommand "gnome-flashback-${wmName}.target" {} '' mkdir -p $out/lib/systemd/user - cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \ - "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" + cp -r "${gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ + "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d" ''; }; From 9bc3e666fa74bc35d5a02f0231c0d2117a381cfc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 13:41:41 +0200 Subject: [PATCH 288/664] ugrep: 3.1.7 -> 3.2.2 --- pkgs/tools/text/ugrep/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 5806723a043e..587c15cc33fa 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -1,17 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, bzip2 +, lz4 +, pcre2 +, xz +, zlib +}: stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.1.7"; + version = "3.2.2"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nCpU4GBJ/4c/70hgVKfO1995XCyDRLVUeczsqnlkkFM="; + sha256 = "sha256-0Vc+ORHnSG9W4OaKWGs4tI5+e5TJNMbBNQ+3NZRz6Ug="; }; - buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; + buildInputs = [ + boost + bzip2 + lz4 + pcre2 + xz + zlib + ]; meta = with lib; { description = "Ultra fast grep with interactive query UI"; From 75176e353c7e9d809f8465d70c76dc96452cec70 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 28 May 2021 20:51:08 +0900 Subject: [PATCH 289/664] feedgnuplot: fix perl shebang --- pkgs/tools/graphics/feedgnuplot/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 02bb022dfb47..768d65af0510 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,5 +1,6 @@ { lib, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +, stdenv, shortenPerlShebang }: let @@ -21,7 +22,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper gawk ]; + nativeBuildInputs = [ makeWrapper gawk ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); @@ -36,7 +37,9 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = '' + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/feedgnuplot + '' + '' wrapProgram $out/bin/feedgnuplot \ --prefix "PATH" ":" "$PATH" \ --prefix "PERL5LIB" ":" "$PERL5LIB" From b9bf2ab441561e68c7e0467ba267e76bec63fcfd Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 28 May 2021 20:51:52 +0900 Subject: [PATCH 290/664] feedgnuplot: 1.51 -> 1.58 --- pkgs/tools/graphics/feedgnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 768d65af0510..51d3e1e868da 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -11,13 +11,13 @@ in perlPackages.buildPerlPackage rec { pname = "feedgnuplot"; - version = "1.51"; + version = "1.58"; src = fetchFromGitHub { owner = "dkogan"; repo = "feedgnuplot"; rev = "v${version}"; - sha256 = "0npk2l032cnmibjj5zf3ii09mpxciqn32lx6g5bal91bkxwn7r5i"; + sha256 = "1qix4lwwyhqibz0a6q2rrb497rmk00v1fvmdyinj0dqmgjw155zr"; }; outputs = [ "out" ]; From dc3054b4ae7763758392c3fa4c21142905c7b4cd Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 4 Mar 2021 21:12:42 +0100 Subject: [PATCH 291/664] paperwork: 2.0.2 -> 2.0.3 and compile user manual --- .../office/paperwork/paperwork-gtk.nix | 44 ++++++++++++++++--- pkgs/applications/office/paperwork/src.nix | 14 +++++- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index e61968391913..8f1278d99266 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -13,10 +13,24 @@ , gettext , gobject-introspection , gdk-pixbuf +, texlive +, imagemagick +, perlPackages }: +let + documentation_deps = [ + (texlive.combine { + inherit (texlive) scheme-small wrapfig was; + }) + xvfb-run + imagemagick + perlPackages.Po4a + ]; +in + python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; pname = "paperwork"; sourceRoot = "source/paperwork-gtk"; @@ -52,9 +66,16 @@ python3Packages.buildPythonApplication rec { for i in $site/data/paperwork_*.png; do ln -s $i $site/icon/out; done + + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + # build the user manual + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + for i in src/paperwork_gtk/model/help/out/*.pdf; do + install -Dt $site/model/help/out $i + done ''; - checkInputs = [ xvfb-run dbus.daemon ]; + checkInputs = [ dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook @@ -62,7 +83,7 @@ python3Packages.buildPythonApplication rec { (lib.getBin gettext) which gdk-pixbuf # for the setup hook - ]; + ] ++ documentation_deps; buildInputs = [ gnome.adwaita-icon-theme @@ -78,13 +99,20 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - # A few parts of chkdeps need to have a display and a dbus session, so we not - # only need to run a virtual X server + dbus but also have a large enough - # resolution, because the Cairo test tries to draw a 200x200 window. - preCheck = '' + checkPhase = '' + runHook preCheck + + # A few parts of chkdeps need to have a display and a dbus session, so we not + # only need to run a virtual X server + dbus but also have a large enough + # resolution, because the Cairo test tries to draw a 200x200 window. xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ $out/bin/paperwork-gtk chkdeps + + # content of make test, without the dep on make install + python -m unittest discover --verbose -s tests + + runHook postCheck ''; propagatedBuildInputs = with python3Packages; [ @@ -98,6 +126,8 @@ python3Packages.buildPythonApplication rec { setuptools ]; + disallowedRequisites = documentation_deps; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 45c05cc4962e..72293ef3903f 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,12 +1,22 @@ {fetchFromGitLab}: rec { - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; + sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9"; }; + sample_documents = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork-test-documents"; + group = "World"; + owner = "OpenPaperwork"; + # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG + rev = "1.0"; + sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr"; + }; + } From ccdd2ed3d0945745bc8d403a97a347a79e7abf80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 14:16:18 +0200 Subject: [PATCH 292/664] python3Packages.pywilight: 0.0.68 -> 0.0.70 --- pkgs/development/python-modules/pywilight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix index 4fa4c0fa8542..425cba61ce3f 100644 --- a/pkgs/development/python-modules/pywilight/default.nix +++ b/pkgs/development/python-modules/pywilight/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pywilight"; - version = "0.0.68"; + version = "0.0.70"; src = fetchPypi { inherit pname version; - sha256 = "1s1xyw5hkfr4rlni1p9z4941pp1740fsg4a3b23a618hv2p1i4ww"; + sha256 = "sha256-PLahGx75oEp4NIZB9PVRdA3cLBxhQsHTsnquy7WSEC8="; }; propagatedBuildInputs = [ From ae3d04bf55746bf7ada604e4ce288daeec6c33a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 May 2021 14:16:53 +0200 Subject: [PATCH 293/664] python3Packages.ttp: 0.7.0 -> 0.7.1 (#124746) --- pkgs/development/python-modules/ttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 4d43170cbf9a..6a557a1eff53 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "0gv1hykbxx3wy195xynqi21rxzlh4701qw01s6pmf3x54w63fz42"; + sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6"; }; propagatedBuildInputs = [ From df7eecceb5d81857284b1b6793ac4cd34c7f503e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 13:39:19 +0200 Subject: [PATCH 294/664] whipper: fix --- pkgs/applications/audio/whipper/default.nix | 53 ++++++++++++--------- pkgs/applications/audio/whipper/paths.patch | 32 ------------- 2 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/audio/whipper/paths.patch diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index b63680a8f488..a295788c117b 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,7 +1,17 @@ -{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac -, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: +{ lib +, python3 +, fetchFromGitHub +, libcdio-paranoia +, cdrdao +, libsndfile +, flac +, sox +, util-linux +}: -python3.pkgs.buildPythonApplication rec { +let + bins = [ libcdio-paranoia cdrdao flac sox util-linux ]; +in python3.pkgs.buildPythonApplication rec { pname = "whipper"; version = "0.10.0"; @@ -12,44 +22,43 @@ python3.pkgs.buildPythonApplication rec { sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5"; }; - pythonPath = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ + setuptools_scm + docutils + ]; + + propagatedBuildInputs = with python3.pkgs; [ musicbrainzngs mutagen pycdio pygobject3 - requests ruamel_yaml - setuptools - setuptools_scm + discid + pillow ]; buildInputs = [ libsndfile ]; checkInputs = with python3.pkgs; [ twisted - ]; - - patches = [ - (substituteAll { - src = ./paths.patch; - inherit cdparanoia; - }) - ]; + ] ++ bins; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) + "--prefix" "PATH" ":" (lib.makeBinPath bins) ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; - # some tests require internet access - # https://github.com/JoeLametta/whipper/issues/291 - doCheck = false; - - preCheck = '' - HOME=$TMPDIR + checkPhase = '' + runHook preCheck + # disable tests that require internet access + # https://github.com/JoeLametta/whipper/issues/291 + substituteInPlace whipper/test/test_common_accurip.py \ + --replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse" + HOME=$TMPDIR ${python3.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/applications/audio/whipper/paths.patch b/pkgs/applications/audio/whipper/paths.patch deleted file mode 100644 index 14b5384330da..000000000000 --- a/pkgs/applications/audio/whipper/paths.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/whipper/program/cdparanoia.py -+++ b/whipper/program/cdparanoia.py -@@ -280,10 +280,10 @@ - - bufsize = 1024 - if self._overread: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, "--force-overread", ] - else: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, ] - if self._device: - argv.extend(["--force-cdrom-device", self._device, ]) -@@ -560,7 +560,7 @@ - - def getCdParanoiaVersion(): - getter = common.VersionGetter('cd-paranoia', -- ["cd-paranoia", "-V"], -+ ["@cdparanoia@/bin/cdparanoia", "-V"], - _VERSION_RE, - "%(version)s %(release)s") - -@@ -585,7 +585,7 @@ - def __init__(self, device=None): - # cdparanoia -A *always* writes cdparanoia.log - self.cwd = tempfile.mkdtemp(suffix='.whipper.cache') -- self.command = ['cd-paranoia', '-A'] -+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A'] - if device: - self.command += ['-d', device] From 585f63b364460b11a25f1692678395465a8fe8b4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 28 May 2021 11:55:21 +0200 Subject: [PATCH 295/664] doc/coding-conventions: Add documentation for fetchpatch optional arguments --- doc/contributing/coding-conventions.chapter.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 6076460b893b..6516172adde9 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -526,6 +526,16 @@ If you do need to do create this sort of patch file, one way to do so is with gi $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch ``` +If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: + +- `stripLen`: Remove the first `stripLen` components of pathnames in the patch. +- `extraPrefix`: Prefix pathnames by this string. +- `excludes`: Exclude files matching this pattern. +- `includes`: Include only files matching this pattern. +- `revert`: Revert the patch. + +Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well. + ## Package tests {#sec-package-tests} Tests are important to ensure quality and make reviews and automatic updates easy. From 6c0b85cf3abefb59502093f4183cbf49a2f774a0 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sun, 16 May 2021 15:13:39 +0700 Subject: [PATCH 296/664] buildPythonPackage: add support for conda --- .github/CODEOWNERS | 14 ++++---- .../interpreters/python/conda/default.nix | 25 +++++++++++++ .../interpreters/python/default.nix | 2 ++ .../python/hooks/conda-install-hook.sh | 27 ++++++++++++++ .../python/hooks/conda-unpack-hook.sh | 18 ++++++++++ .../interpreters/python/hooks/default.nix | 15 ++++++++ .../development/interpreters/python/tests.nix | 35 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 9 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/interpreters/python/conda/default.nix create mode 100644 pkgs/development/interpreters/python/hooks/conda-install-hook.sh create mode 100644 pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d7c01b8986b6..be54040ca2ed 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -72,12 +72,14 @@ /pkgs/common-updater/scripts/update-source-version @jtojnar # Python-related code and docs -/maintainers/scripts/update-python-libraries @FRidh -/pkgs/top-level/python-packages.nix @FRidh @jonringer -/pkgs/development/interpreters/python @FRidh -/pkgs/development/python-modules @FRidh @jonringer -/doc/languages-frameworks/python.section.md @FRidh -/pkgs/development/tools/poetry2nix @adisbladis +/maintainers/scripts/update-python-libraries @FRidh +/pkgs/top-level/python-packages.nix @FRidh @jonringer +/pkgs/development/interpreters/python @FRidh +/pkgs/development/python-modules @FRidh @jonringer +/doc/languages-frameworks/python.section.md @FRidh +/pkgs/development/tools/poetry2nix @adisbladis +/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau +/pkgs/development/interpreters/python/conda @DavHau # Haskell /doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix new file mode 100644 index 000000000000..5249ccce0d9a --- /dev/null +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -0,0 +1,25 @@ +{ pkgs }: { + + # List of libraries that are needed for conda binary packages. + # When installing a conda binary package, just extend + # the `buildInputs` with `condaAutopatchLibs`. + condaPatchelfLibs = builtins.map (p: p.lib or p) ([ + pkgs.alsaLib + pkgs.cups + pkgs.gcc-unwrapped + pkgs.libGL + ] ++ (with pkgs.xorg; [ + libSM + libICE + libX11 + libXau + libXdamage + libXi + libXrender + libXrandr + libXcomposite + libXcursor + libXtst + libXScrnSaver]) + ); +} diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 328ed715baee..30134a056284 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -44,6 +44,8 @@ with pkgs; toPythonModule toPythonApplication buildSetupcfg + condaInstallHook + condaUnpackHook eggUnpackHook eggBuildHook eggInstallHook diff --git a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh new file mode 100644 index 000000000000..af9ed60a038d --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh @@ -0,0 +1,27 @@ +# Setup hook to use in case a conda binary package is installed +echo "Sourcing conda install hook" + +condaInstallPhase(){ + echo "Executing condaInstallPhase" + runHook preInstall + + # There are two different formats of conda packages. + # It either contains only a site-packages directory + # or multiple top level directories. + siteDir=@pythonSitePackages@ + if [ -e ./site-packages ]; then + mkdir -p $out/$siteDir + cp -r ./site-packages/* $out/$siteDir + else + cp -r . $out + rm $out/env-vars + fi + + runHook postInstall + echo "Finished executing condaInstallPhase" +} + +if [ -z "${installPhase-}" ]; then + echo "Using condaInstallPhase" + installPhase=condaInstallPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh new file mode 100644 index 000000000000..6204c13b7221 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh @@ -0,0 +1,18 @@ +# Setup hook to use in case a conda binary package is fetched +echo "Sourcing conda unpack hook" + +condaUnpackPhase(){ + echo "Executing condaUnpackPhase" + runHook preUnpack + + # use lbzip2 for parallel decompression (bz2 is slow) + lbzip2 -dc -n $NIX_BUILD_CORES $src | tar --exclude='info' -x + + # runHook postUnpack # Calls find...? + echo "Finished executing condaUnpackPhase" +} + +if [ -z "${unpackPhase-}" ]; then + echo "Using condaUnpackPhase" + unpackPhase=condaUnpackPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 1a64c79232bc..1a0618225a37 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -16,6 +16,21 @@ let setuppy = ../run_setup.py; in rec { + condaInstallHook = callPackage ({ gnutar, lbzip2 }: + makeSetupHook { + name = "conda-install-hook"; + deps = [ gnutar lbzip2 ]; + substitutions = { + inherit pythonSitePackages; + }; + } ./conda-install-hook.sh) {}; + + condaUnpackHook = callPackage ({}: + makeSetupHook { + name = "conda-unpack-hook"; + deps = []; + } ./conda-unpack-hook.sh) {}; + eggBuildHook = callPackage ({ }: makeSetupHook { name = "egg-build-hook.sh"; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index cfba04da9380..872123338f8c 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -121,4 +121,37 @@ let # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); }; -in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests) + condaTests = let + requests = callPackage ({ + autoPatchelfHook, + fetchurl, + pythonCondaPackages, + }: + python.pkgs.buildPythonPackage { + pname = "requests"; + version = "2.24.0"; + format = "other"; + src = fetchurl { + url = "https://repo.anaconda.com/pkgs/main/noarch/requests-2.24.0-py_0.tar.bz2"; + sha256 = "02qzaf6gwsqbcs69pix1fnjxzgnngwzvrsy65h1d521g750mjvvp"; + }; + nativeBuildInputs = [ autoPatchelfHook ] ++ (with python.pkgs; [ + condaUnpackHook condaInstallHook + ]); + buildInputs = [ + pythonCondaPackages.condaPatchelfLibs + ]; + propagatedBuildInputs = with python.pkgs; [ + chardet idna urllib3 certifi + ]; + } + ) {}; + pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); + in + { + condaExamplePackage = runCommand "import-requests" {} '' + ${pythonWithRequests.interpreter} -c "import requests" > $out + ''; + }; + +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ef62643fbcf..9dee838bb66c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12336,6 +12336,8 @@ in pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; + pythonCondaPackages = callPackage ./../development/interpreters/python/conda { }; + update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; # Should eventually be moved inside Python interpreters. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05c322bb9320..91ef14b2f782 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -112,6 +112,8 @@ in { inherit buildSetupcfg; inherit (callPackage ../development/interpreters/python/hooks { }) + condaInstallHook + condaUnpackHook eggUnpackHook eggBuildHook eggInstallHook From b2f86e66629d1d05a7da7dfff5bf18353bf7968e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 May 2021 14:56:38 +0200 Subject: [PATCH 297/664] nixos/gnome: Do not enable metacity by default Did not realize this is not conditional on gnome-flashback being enabled. Partially reverts https://github.com/NixOS/nixpkgs/pull/113957 --- nixos/modules/services/x11/desktop-managers/gnome.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c5e6caeea902..37e61f32823d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -222,12 +222,7 @@ in debug = mkEnableOption "gnome-session debug messages"; flashback = { - enableMetacity = mkOption { - type = types.bool; - default = true; - example = "false"; - description = "Whether to enable the standard Metacity GNOME flashback session."; - }; + enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; customSessions = mkOption { type = types.listOf (types.submodule { From 9e0ed182aa86add5fecf6d575405687eb7c61f70 Mon Sep 17 00:00:00 2001 From: pmenke Date: Mon, 24 May 2021 17:12:31 +0200 Subject: [PATCH 298/664] sdrplay: init at 3.07.1 this adds support for software defined radio (SDR) devices by SDRplay. SDRplay provides an unfree binary library and api-service as well as a MIT licensed adapter library for SoapySDR for integration with many popular SDR applications. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/sdrplay.nix | 35 +++++++++++++ pkgs/applications/radio/sdrplay/default.nix | 51 +++++++++++++++++++ .../radio/soapysdrplay/default.nix | 29 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 5 files changed, 120 insertions(+) create mode 100644 nixos/modules/services/misc/sdrplay.nix create mode 100644 pkgs/applications/radio/sdrplay/default.nix create mode 100644 pkgs/applications/radio/soapysdrplay/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index aa4e2ccc46bc..e51c833a01ca 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -547,6 +547,7 @@ ./services/misc/ripple-data-api.nix ./services/misc/serviio.nix ./services/misc/safeeyes.nix + ./services/misc/sdrplay.nix ./services/misc/sickbeard.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix diff --git a/nixos/modules/services/misc/sdrplay.nix b/nixos/modules/services/misc/sdrplay.nix new file mode 100644 index 000000000000..2801108f0828 --- /dev/null +++ b/nixos/modules/services/misc/sdrplay.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: +with lib; +{ + options.services.sdrplayApi = { + enable = mkOption { + default = false; + example = true; + description = '' + Whether to enable the SDRplay API service and udev rules. + + + To enable integration with SoapySDR and GUI applications like gqrx create an overlay containing + soapysdr-with-plugins = super.soapysdr.override { extraPackages = [ super.soapysdrplay ]; }; + + ''; + type = lib.types.bool; + }; + }; + + config = mkIf config.services.sdrplayApi.enable { + systemd.services.sdrplayApi = { + description = "SDRplay API Service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.sdrplay}/bin/sdrplay_apiService"; + DynamicUser = true; + Restart = "on-failure"; + RestartSec = "1s"; + }; + }; + services.udev.packages = [ pkgs.sdrplay ]; + + }; +} diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix new file mode 100644 index 000000000000..d12b12ecc13c --- /dev/null +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, fetchurl, autoPatchelfHook, udev }: +let + arch = if stdenv.isx86_64 then "x86_64" + else if stdenv.isi686 then "i686" + else throw "unsupported architecture"; +in stdenv.mkDerivation rec { + name = "sdrplay"; + version = "3.07.1"; + + src = fetchurl { + url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run"; + sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ udev stdenv.cc.cc.lib ]; + + unpackPhase = '' + sh "$src" --noexec --target source + ''; + + sourceRoot = "source"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/{bin,lib,include,lib/udev/rules.d} + majorVersion="${lib.concatStringsSep "." (lib.take 1 (builtins.splitVersion version))}" + majorMinorVersion="${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}" + libName="libsdrplay_api" + cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/ + ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion" + ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so" + cp "${arch}/sdrplay_apiService" $out/bin/ + cp -r inc/* $out/include/ + cp 66-mirics.rules $out/lib/udev/rules.d/ + ''; + + meta = with lib; { + description = "SDRplay API"; + longDescription = '' + Proprietary library and api service for working with SDRplay devices. For documentation and licensing details see + https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf + ''; + homepage = "https://www.sdrplay.com/downloads/"; + license = licenses.unfree; + maintainers = [ maintainers.pmenke ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/applications/radio/soapysdrplay/default.nix new file mode 100644 index 000000000000..dbee593bd0d6 --- /dev/null +++ b/pkgs/applications/radio/soapysdrplay/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, soapysdr, sdrplay }: + +stdenv.mkDerivation { + name = "soapysdr-sdrplay3"; + version = "20210425"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapySDRPlay3"; + rev = "e6fdb719b611b1dfb7f26c56a4df1e241bd10129"; + sha256 = "0rrylp3ikrva227hjy60v4n6d6yvdavjsad9kszw9s948mwiashi"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ soapysdr sdrplay ]; + + cmakeFlags = [ + "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" + ]; + + meta = with lib; { + description = "Soapy SDR module for SDRplay"; + homepage = "https://github.com/pothosware/SoapySDRPlay3"; + license = licenses.mit; + maintainers = [ maintainers.pmenke ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470034df6d21..f2800b031f56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17833,6 +17833,8 @@ in sdnotify-wrapper = skawarePackages.sdnotify-wrapper; + sdrplay = callPackage ../applications/radio/sdrplay {}; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; @@ -17938,6 +17940,8 @@ in soapyremote = callPackage ../applications/radio/soapyremote { }; + soapysdrplay = callPackage ../applications/radio/soapysdrplay { }; + soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { extraPackages = [ limesuite From 81abd8d0acc938f147ce98176b6cf679d398d2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 16:08:20 +0200 Subject: [PATCH 299/664] mediatomb: use ffmpeg instead of ffmpeg_3 (#123487) --- pkgs/servers/mediatomb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index d84aa954a00f..6294f9df2bd3 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file +, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file , pkg-config, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac pkg-config autoreconfHook ]; meta = with lib; { From 95fa2dda186b637fd4e798fa5bac5f24bf4fda61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 16:35:13 +0200 Subject: [PATCH 300/664] backport: set correct permissions --- .github/workflows/backport.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 69da652ba598..39c8a34bf9d6 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,10 +1,10 @@ name: Backport on: - pull_request: + pull_request_target: types: [closed] jobs: backport: - name: Create backport PRs + name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true runs-on: ubuntu-latest steps: @@ -12,6 +12,7 @@ jobs: with: # required to find all branches fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs # should be kept in sync with `version` uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd From 9a80dbab1fdd6715662a9097f2cafa8fa1c6b4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 16:36:02 +0200 Subject: [PATCH 301/664] backport: trigger also if label is set after the merge --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 39c8a34bf9d6..766b5aa831a3 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,7 +1,7 @@ name: Backport on: pull_request_target: - types: [closed] + types: [closed, labeled] jobs: backport: name: Backport Pull Request From 854c4ad2d9c7fed0ade1ec4048d10c28afae9bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Fri, 28 May 2021 16:37:48 +0200 Subject: [PATCH 302/664] softmaker-office: 1030 -> 1032 --- pkgs/applications/office/softmaker/softmaker_office.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 9228037e8bf8..68f92c74a87c 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -6,9 +6,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. , officeVersion ? { - version = "1030"; + version = "1032"; edition = "2021"; - hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE="; + hash = "sha256-LchSqLVBdkmWJQ8hCEvtwRPgIUSDE0URKPzCkEexGbc="; } , ... } @ args: From 698d79fd76d24ac12dbb081117eeb19fe686a6d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 14:41:21 +0000 Subject: [PATCH 303/664] exploitdb: 2021-05-22 -> 2021-05-26 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 1c5a3fdd4734..50cc54f9c30d 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-05-22"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-cpzAdRAtF47j92u8GHyu6V1ycqtNld+9saCqoboAu+o="; + sha256 = "sha256-LYCUPIoqgU5IPtUew+orY1e2NfmefZFoWnvsZ9erohE="; }; installPhase = '' From 57f67a8ec02025cd4e562bbfb9f0f6924e755544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9B=87=E5=B4=A9=E4=B9=83=E9=9F=B3?= Date: Fri, 28 May 2021 16:47:33 +0200 Subject: [PATCH 304/664] tailscale: 1.8.3 -> 1.8.5 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index bd75a45154d6..be3b4209eb9e 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0wr6zb8v5082gbh0isz8inmndvqfqgmh5bgaz8ij2id5qwx5znx6"; + sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2"; }; nativeBuildInputs = [ makeWrapper ]; From ab2e8afb29a81c40b89e9771301be3423ebcc6f6 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 28 May 2021 17:01:58 +0200 Subject: [PATCH 305/664] zellij: 0.12.0 -> 0.12.1 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 72b2a2742318..93d5bfc9dee3 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c79n/gNMAg+Eb+ZJcG+H+GSB0hI9FyyqkZGDcfz0ahA="; + sha256 = "sha256-OgpSVyXvJeRpxHWfIoJjQbbkt2RSze0IL5za3igGE6s="; }; - cargoSha256 = "sha256-m7hYDnZBBcrSHL2s+NwD/Z9+gpFvfZmnoLwgOXqc3mw="; + cargoSha256 = "sha256-LgJPhwOuzlKIw5smy4WJvC0CFoylnMlx6Re7gVPtiq8="; nativeBuildInputs = [ installShellFiles ]; From 5cd69bbe7c050047b16d69fda9e063fa1599b676 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 28 May 2021 17:21:10 +0200 Subject: [PATCH 306/664] promscale: 0.3.0 -> 0.4.1 --- pkgs/servers/monitoring/prometheus/promscale.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 81240072d42d..5b0b308c5ec5 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-kZYFOuY6FFM35mP+o/YU5SM5H9ziOq9BQ8T1RX7rhGE="; + sha256 = "sha256-RdhsQtrD+I8eAgFNr1hvW83Ho22aNhWBX8crCM0b8jU="; }; - vendorSha256 = "sha256-1VOhDOfFE4BpDR4XfhLoXJFuTDkG1nx88tVvTF3ZVxU="; + vendorSha256 = "sha256-82E82O0yaLbu+oSTX7AQoYXFYy3wYVdBCevV7pHZVOA="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; From 5d873fde2352061fa487e7c4b73c0d1f840c77c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 17:46:29 +0200 Subject: [PATCH 307/664] libxlsxwriter: 1.0.5 -> 1.0.6 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.6 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index d323c2d962e5..4bb80cb04a45 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v"; + sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; }; nativeBuildInputs = [ From 1e4c81cc693ad0b0a602c2dcd43962df8541a8f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 15:57:52 +0000 Subject: [PATCH 308/664] gnomeExtensions.freon: 40 -> 44 --- pkgs/desktops/gnome/extensions/freon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 7734558eb20b..9a884ac78ac7 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; - version = "40"; + version = "44"; uuid = "freon@UshakovVasilii_Github.yahoo.com"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "UshakovVasilii"; repo = "gnome-shell-extension-freon"; rev = "EGO-${version}"; - sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl"; + sha256 = "sha256-4DYAIC9N5id3vQe0WaOFP+MymsrPK18hbYqO4DjG+2U="; }; nativeBuildInputs = [ glib ]; From 0bd3af3778acae4b5d899f5f9adabffed68c9ad2 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 28 May 2021 12:17:01 -0400 Subject: [PATCH 309/664] itk: 5.1.2 -> 5.2.0 --- pkgs/development/libraries/itk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index ac899ce26f10..d84b9f1df625 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.1.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0db91pm1zy40h4qr5zsdfl94znk16w9ysddz5cxbl198iyyqii8f"; + sha256 = "19f65fc9spwvmywg43lkw9p2inrrzr1qrfzcbing3cjk0x2yrsnl"; }; postPatch = '' From bb4f70db9bc0d34d79d55d8f2d473116aa81cdfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 16:38:48 +0000 Subject: [PATCH 310/664] cascadia-code: 2102.25 -> 2105.24 --- pkgs/data/fonts/cascadia-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index e09ad70f1468..a78bf6b4a785 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2102.25"; + version = "2105.24"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx"; + sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8="; postFetch = '' mkdir -p $out/share/fonts/ From b45d3f813a0acfaf1f7c7c0466136fceddaf7d50 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Fri, 28 May 2021 09:36:56 -0700 Subject: [PATCH 311/664] cue: 0.3.2 -> 0.4.0 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index f48b54471b14..08dada094ff4 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.3.2"; + version = "0.4.0"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "0rfgpq4dyd3zm07vcjzn5vv0dhvvryrarxc50sd2pxagbq5cqc8l"; + sha256 = "sha256-rcGEl+CMFyxZKsOKhVimhv5/ONo3xS6FjgKModZGR2o="; }; - vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp"; + vendorSha256 = "sha256-eSKVlBgnHR1R0j1lNwtFoIgRuj8GqoMbvuBl/N1SanY="; doCheck = false; From 4fc765ed03ea529601a7f33c7093be76c833ed11 Mon Sep 17 00:00:00 2001 From: Ron B Date: Fri, 28 May 2021 20:56:13 +0300 Subject: [PATCH 312/664] zthrottle: init at unstable-2017-7-24 --- pkgs/tools/misc/zthrottle/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/zthrottle/default.nix diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/tools/misc/zthrottle/default.nix new file mode 100644 index 000000000000..66209ead6fa7 --- /dev/null +++ b/pkgs/tools/misc/zthrottle/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, zsh }: + +stdenv.mkDerivation rec { + pname = "zthrottle"; + version = "unstable-2017-7-24"; + + src = fetchFromGitHub { + owner = "anko"; + repo = pname; + rev = "f62066661e49375baeb891fa8e43ad4527cbd0a0"; + sha256 = "1ipvwmcsigzmxlg7j22cxpvdcgqckkmfpsnvzy18nbybd5ars9l5"; + }; + + buildInputs = [ zsh ]; + + installPhase = '' + install -D zthrottle $out/bin/zthrottle + ''; + + meta = with lib; { + description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds."; + homepage = "https://github.com/anko/zthrottle"; + license = licenses.unlicense; + maintainers = [ maintainers.ronthecookie ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 974595bb1192..6c6e55f85bd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31643,5 +31643,7 @@ in xcolor = callPackage ../tools/graphics/xcolor { }; + zthrottle = callPackage ../tools/misc/zthrottle { }; + zktree = callPackage ../applications/misc/zktree {}; } From 38cfb84ff0cef3e680be150eda5d06ac1b4a1c05 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Fri, 24 Jul 2020 07:53:40 +0200 Subject: [PATCH 313/664] mediatomb/gerbera: Add release note information for 21.03 Note that it made into 2 entries, one about new options in the first section. Another in the breaking compatibility section due to the openFirewall option which changes the behavior. Co-authored-by: schmittlauch --- nixos/doc/manual/release-notes/rl-2105.xml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 7364151ef666..fa100290460e 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -305,6 +305,24 @@ /var/lib/powerdns to /run/pdns. + + + The mediatomb service is + now using by default the new and maintained fork + gerbera package instead of the unmaintained + mediatomb package. If you want to keep the old + behavior, you must declare it with: + + services.mediatomb.package = pkgs.mediatomb; + + One new option openFirewall has been introduced which + defaults to false. If you relied on the service declaration to add the + firewall rules itself before, you should now declare it with: + + services.mediatomb.openFirewall = true; + + + xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. @@ -844,6 +862,29 @@ environment.systemPackages = [ All services should use or StartLimitIntervalSec in instead. + + + The mediatomb service + declares new options. It also adapts existing options so the + configuration generation is now lazy. The existing option + customCfg (defaults to false), when enabled, stops + the service configuration generation completely. It then expects the + users to provide their own correct configuration at the right location + (whereas the configuration was generated and not used at all before). + The new option transcodingOption (defaults to no) + allows a generated configuration. It makes the mediatomb service pulls + the necessary runtime dependencies in the nix store (whereas it was + generated with hardcoded values before). The new option + mediaDirectories allows the users to declare autoscan + media directories from their nixos configuration: + + services.mediatomb.mediaDirectories = [ + { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } + { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; } + ]; + + + The Unbound DNS resolver service (services.unbound) has been refactored to allow reloading, control sockets and to fix startup ordering issues. From d1fe6418cc9b0a4cea3484671a60249d27abacf1 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Wed, 26 May 2021 15:14:07 -0400 Subject: [PATCH 314/664] piston-cli: 1.3.0 -> 1.4.1 --- pkgs/tools/misc/piston-cli/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 97506c709df1..df244063b1b8 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.3.0"; + version = "1.4.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "XzKXHZHYZRT3t4ZonM+Ngx1jIT1nmz4k34VSw29GFoM="; + sha256 = "o8GPtSQ119AKB64hAH8VY6iJmhXcSFqjOanmXQl0tHo="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470034df6d21..f072e2b6ee51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25899,7 +25899,7 @@ in pistol = callPackage ../tools/misc/pistol { }; - piston-cli = callPackage ../tools/misc/piston-cli { }; + piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; plater = libsForQt5.callPackage ../applications/misc/plater { }; From cc855b133100a956d4587079e27c5704cbc8342b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 27 May 2021 12:38:28 -0500 Subject: [PATCH 315/664] =?UTF-8?q?pgsync:=200.6.6=20=E2=86=92=200.6.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/database/pgsync/Gemfile.lock | 4 ++-- pkgs/development/tools/database/pgsync/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 5ee736430af5..d147a5a74546 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -3,12 +3,12 @@ GEM specs: parallel (1.20.1) pg (1.2.3) - pgsync (0.6.6) + pgsync (0.6.7) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.8.2) + slop (4.9.0) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index 18a833970722..0240300ff052 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr"; + sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6"; type = "gem"; }; - version = "0.6.6"; + version = "0.6.7"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3"; + sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj"; type = "gem"; }; - version = "4.8.2"; + version = "4.9.0"; }; tty-cursor = { groups = ["default"]; From 39b4c8f9af93f8e72f87cd78df97f948e834ea34 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Fri, 28 May 2021 14:14:48 -0400 Subject: [PATCH 316/664] corerad: 0.3.0 -> 0.3.1 Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index a7e5026d83af..f5b0875e6ffb 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1q4wcliifas8xvwy7kcq4fbc1iv7dha3k6j1nbwl7pjqmyggs3f4"; + sha256 = "0ky4zfmxzgxidsizfj2lwm5z3zl666khw9cgsxfgbzn3cjgr33c3"; }; - vendorSha256 = "07khxs15z9xzcmp4gyggdwqyz361y96h6ib92qax8k83cr0l494p"; + vendorSha256 = "0ddni8hl8fv0m9kinwfnhcj3k51fk8h61yksv7ws6agdx0bl1rwh"; doCheck = false; From f830b000fc8aafd14bf3151178919378584e87c9 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:03:37 +0300 Subject: [PATCH 317/664] maintainers: add mikroskeem --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a7fbc13e621..aac8166ef389 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6615,6 +6615,16 @@ githubId = 1387206; name = "Mike Sperber"; }; + mikroskeem = { + email = "mikroskeem@mikroskeem.eu"; + github = "mikroskeem"; + githubId = 3490861; + name = "Mark Vainomaa"; + keys = [{ + longkeyid = "rsa4096/0xDA015B05B5A11B22"; + fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; + }]; + }; milesbreslin = { email = "milesbreslin@gmail.com"; github = "milesbreslin"; From 2980b1c4f4bbf0e15e709abd769613bcbe83839b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:05:07 +0300 Subject: [PATCH 318/664] imgcrypt: init at 1.1.1 --- .../virtualization/imgcrypt/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/virtualization/imgcrypt/default.nix diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix new file mode 100644 index 000000000000..c985632b9ebc --- /dev/null +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "imgcrypt"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "containerd"; + repo = pname; + rev = "v${version}"; + sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; + }; + + buildFlagsArray = [ + "-ldflags=-X github.com/containerd/containerd/version.Version=${version}" + ]; + + vendorSha256 = null; + subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ]; + + postFixup = '' + mv $out/bin/ctr $out/bin/ctr-enc + ''; + + meta = with lib; { + description = "Image encryption library and command line tool"; + homepage = "https://github.com/containerd/imgcrypt"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikroskeem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f072e2b6ee51..78186f6dd1d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1571,6 +1571,8 @@ in imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; + imgcrypt = callPackage ../applications/virtualization/imgcrypt { }; + ipgrep = callPackage ../tools/networking/ipgrep { }; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; From 24507d7346f825d4f513113a52e2921624a8b304 Mon Sep 17 00:00:00 2001 From: Reed Date: Thu, 27 May 2021 06:41:37 -0400 Subject: [PATCH 319/664] nq: fix tq --- pkgs/tools/system/nq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index e92016f85a6f..239ac1368ad6 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -i tq \ - -e 's|\bfq\b|'$out'/bin/fq|g' \ - -e 's|\bnq\b|'$out'/bin/nq|g' + -e 's|\bnq\b|'$out'/bin/nq|g' \ + -e 's|\bfq\b|'$out'/bin/fq|g' ''; meta = with lib; { description = "Unix command line queue utility"; From 5826e9020636c8ba3bc311294ce78b6466fd2b24 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:29:16 +0300 Subject: [PATCH 320/664] dnsname-cni: init at 1.1.1 --- .../cluster/dnsname-cni/default.nix | 32 +++++++++++++++++++ .../dnsname-cni/hardcode-dnsmasq-path.patch | 19 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/dnsname-cni/default.nix create mode 100644 pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix new file mode 100644 index 000000000000..91ef8b68fb63 --- /dev/null +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule, fetchFromGitHub, lib, dnsmasq }: + +buildGoModule rec { + pname = "cni-plugin-dnsname"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "dnsname"; + rev = "v${version}"; + sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3"; + }; + + patches = [ ./hardcode-dnsmasq-path.patch ]; + + postPatch = '' + substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq' + ''; + + vendorSha256 = null; + subPackages = [ "plugins/meta/dnsname" ]; + + doCheck = false; # NOTE: requires root privileges + + meta = with lib; { + description = "DNS name resolution for containers"; + homepage = "https://github.com/containers/dnsname"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikroskeem ]; + }; +} diff --git a/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch b/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch new file mode 100644 index 000000000000..24ef5eb85d13 --- /dev/null +++ b/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch @@ -0,0 +1,19 @@ +diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go +index fc05f75..f6b4caf 100644 +--- a/plugins/meta/dnsname/service.go ++++ b/plugins/meta/dnsname/service.go +@@ -16,10 +16,14 @@ import ( + + // newDNSMasqFile creates a new instance of a dnsNameFile + func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) { ++ /* + dnsMasqBinary, err := exec.LookPath("dnsmasq") + if err != nil { + return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH") + } ++ */ ++ _ = errors.Errorf // XXX(mikroskeem): reduce diff ++ dnsMasqBinary := "@DNSMASQ@" + masqConf := dnsNameFile{ + ConfigFile: makePath(networkName, confFileName), + Domain: domainName, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78186f6dd1d1..c16369993438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22897,6 +22897,8 @@ in cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {}; + multus-cni = callPackage ../applications/networking/cluster/multus-cni {}; cntr = callPackage ../applications/virtualization/cntr { }; From 9868aa60504d90d76ac86492ce1c7691fd234951 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 16 May 2021 23:45:37 +0300 Subject: [PATCH 321/664] docker: 20.10.2 -> 20.10.6 --- .../virtualization/docker/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6b72653c3472..54db586187a8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -163,8 +163,6 @@ rec { postPatch = '' patchShebangs . substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" - substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man '' + optionalString buildxSupport '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} @@ -222,20 +220,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.2"; + version = "20.10.6"; rev = "v${version}"; - sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; + sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 - runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; - containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 - containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; - tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 + runcRev = "v1.0.0-rc94"; + runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; + containerdRev = "v1.5.1"; + containerdSha256 = "1jwz53cpi9sxjsd1qr3sji1jai9wh3kfwspsgxnijhjs0bz8gvyn"; + tiniRev = "v0.19.0"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } From 8baf7189b0be37c8e19f0d79af869d2ea2479223 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Tue, 18 May 2021 14:43:05 +0300 Subject: [PATCH 322/664] docker: drop unused argument, use pname instead of name --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 54db586187a8..de57e5f51ee7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,7 +10,7 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? false # package dependencies - , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx @@ -124,7 +124,7 @@ rec { }) // rec { inherit version rev; - name = "docker-${version}"; + pname = "docker"; src = fetchFromGitHub { owner = "docker"; From beab9f03224507375434d6223dca824eb0149820 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 19 May 2021 01:55:31 +0300 Subject: [PATCH 323/664] docker: use commit hashes instead of tags, fix containerd sha256 --- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index de57e5f51ee7..863ca59ed22a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -229,11 +229,11 @@ rec { rev = "v${version}"; sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "v1.0.0-rc94"; + runcRev = "2c7861bc5e1b3e756392236553ec14a78a09f8bf"; # v1.0.0-rc94 runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; - containerdRev = "v1.5.1"; - containerdSha256 = "1jwz53cpi9sxjsd1qr3sji1jai9wh3kfwspsgxnijhjs0bz8gvyn"; - tiniRev = "v0.19.0"; + containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 + containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; + tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } From ad256a077b352cde225844002c087d4a3862e748 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Thu, 20 May 2021 00:37:33 +0300 Subject: [PATCH 324/664] docker: bump runc to 1.0-rc95, fixing CVE-2021-30465 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 863ca59ed22a..bec51af81aca 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -229,8 +229,8 @@ rec { rev = "v${version}"; sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "2c7861bc5e1b3e756392236553ec14a78a09f8bf"; # v1.0.0-rc94 - runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; + runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 + runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 From c79e3ded4b34c848b93db307ffaa8c8dcedf0c2b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 28 May 2021 13:09:30 +0300 Subject: [PATCH 325/664] gmnisrv: fix security vulnerability --- pkgs/servers/gemini/gmnisrv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 4a8e187561c4..e3b4179fcf59 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "gmnisrv"; - version = "unstable-2021-03-26"; + version = "unstable-2021-05-16"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "gmnisrv"; - rev = "f23ec10a6d66c574bbf718c4b10f2cf91ea8daef"; - sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n"; + rev = "b9a92193e96bbe621ebc8430d8308d45a5b86cef"; + sha256 = "sha256-eMKsoq3Y+eS20nxI7EoDLbdwdoB6shbGt6p8wS+uoPc="; }; MIMEDB = "${mime-types}/etc/mime.types"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl mime-types scdoc ]; + nativeBuildInputs = [ pkg-config scdoc ]; + buildInputs = [ openssl mime-types ]; meta = with lib; { description = "A simple Gemini protocol server"; homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; license = licenses.gpl3Only; maintainers = with maintainers; [ bsima jb55 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 184b453090ea663f98d29cb8a18479e0e9570891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 14:54:47 +0200 Subject: [PATCH 326/664] pythonPackages.google-api-python-client: 2.0.2 -> 2.6.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 39ed8d68345f..f5c8bcc6c31c 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.0.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28"; + sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va"; }; # No tests included in archive From 4758dd48140070052212e57941dc7dd3ded1c603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 14:55:44 +0200 Subject: [PATCH 327/664] patray: Yet another tray pulseaudio frontend --- .../python-modules/cock/default.nix | 19 ++++++++ pkgs/tools/audio/patray/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/cock/default.nix create mode 100644 pkgs/tools/audio/patray/default.nix diff --git a/pkgs/development/python-modules/cock/default.nix b/pkgs/development/python-modules/cock/default.nix new file mode 100644 index 000000000000..c11646decd74 --- /dev/null +++ b/pkgs/development/python-modules/cock/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook, click, sortedcontainers, pyyaml }: + +buildPythonPackage rec { + pname = "cock"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3"; + }; + + propagatedBuildInputs = [ click sortedcontainers pyyaml ]; + + meta = with lib; { + homepage = "https://github.com/pohmelie/cock"; + description = "Configuration file with click"; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix new file mode 100644 index 000000000000..5f86f1b88557 --- /dev/null +++ b/pkgs/tools/audio/patray/default.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, qt5 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "patray"; + version = "0.1.1"; + + src = python3.pkgs.fetchPypi { + inherit version pname; + sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g"; + }; + + patchPhase = '' + sed -i '30i entry_points = { "console_scripts": [ "patray = patray.__main__:main" ] },' setup.py + sed -i 's/production.txt/production.in/' setup.py + sed -i '/pyside2/d' requirements/production.in + ''; + + propagatedBuildInputs = with python3.pkgs; [ + pulsectl + loguru + cock + pyside2 + ]; + + doCheck = false; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + postFixup = '' + wrapQtApp $out/bin/patray + ''; + + + + meta = with lib; { + description = "Yet another tray pulseaudio frontend"; + homepage = "https://github.com/pohmelie/patray"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c16369993438..d5f9018676de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7159,6 +7159,8 @@ in pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + patray = callPackage ../tools/audio/patray { }; + pasystray = callPackage ../tools/audio/pasystray { }; pcmsolver = callPackage ../development/libraries/pcmsolver { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91ef14b2f782..2fed68c691b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1397,6 +1397,8 @@ in { clf = callPackage ../development/python-modules/clf { }; + cock = callPackage ../development/python-modules/cock { }; + click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; From fd2e675e7c5205c0c6e3bcdad7f10a2db8fe25d0 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 28 May 2021 16:09:13 +0000 Subject: [PATCH 328/664] diffoscope: 175 -> 176 Signed-off-by: Arthur Gautier --- pkgs/tools/misc/diffoscope/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f59e8bb430a1..21a02f1e99c7 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "175"; + version = "176"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk="; + sha256 = "sha256-Hr3GNgpvKCLs+HA8QLOewh5nz9npZr5MZ65wRrat7l0="; }; outputs = [ "out" "man" ]; @@ -35,10 +35,6 @@ python3Packages.buildPythonApplication rec { # When generating manpage, use the installed version substituteInPlace doc/Makefile --replace "../bin" "$out/bin" - - # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/258 - substituteInPlace tests/data/mp3_expected_diff \ - --replace " Stream" "Stream" ''; nativeBuildInputs = [ docutils help2man installShellFiles ]; From c6f22908106542da243ec48eaa1b1f8d89b66b75 Mon Sep 17 00:00:00 2001 From: Serval Date: Sat, 29 May 2021 02:56:04 +0800 Subject: [PATCH 329/664] v2ray: 4.38.3 -> 4.39.2 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 89e2f0f320df..4c4b46c25206 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.38.3"; + version = "4.39.2"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c"; + sha256 = "0rgwxsix2qy5w44s2ramalsn1bqznj2yra8bakcms8yl9yh0gbvd"; }; - vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ="; + vendorSha256 = "sha256-1LEKg9kyF4QBrzLP5TyKmFLPBprJRNqGxtkAI1mHx4Y="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202104300531"; - geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401"; + geoipRev = "202105270041"; + geoipSha256 = "0g67lggc41himpnbbghm4xlnbv4dl2fyidxplh3pl6ajqb4wxwd5"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210430100800"; - geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb"; + geositeRev = "20210527065138"; + geositeSha256 = "1335zyc5zrwws46ldv0sqn51kpkfwfksbfw6hd53fakz0whxki0g"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From f451461e9dee2d19e04512ee91b622f1dcb40391 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 28 May 2021 20:00:48 +0800 Subject: [PATCH 330/664] fetchutils: remove DESTDIR, use PREFIX, change owner --- pkgs/tools/misc/fetchutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/tools/misc/fetchutils/default.nix index bda9175724f1..e9ee3fba516d 100644 --- a/pkgs/tools/misc/fetchutils/default.nix +++ b/pkgs/tools/misc/fetchutils/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec { version = "unstable-2021-03-16"; src = fetchFromGitHub { - owner = "lptstr"; + owner = "kiedtl"; repo = pname; rev = "882781a297e86f4ad4eaf143e0777fb3e7c69526"; sha256 = "sha256-ONrVZC6GBV5v3TeBekW9ybZjDHF3FNyXw1rYknqKRbk="; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ bash scdoc ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + installFlags = [ "PREFIX=$(out)/" ]; postPatch = '' patchShebangs --host src/* From 534558827a48924ebca03da963e8ea292b417195 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 19 May 2021 19:34:09 -0500 Subject: [PATCH 331/664] kops: 1.19.2 -> 1.20.1 --- pkgs/applications/networking/cluster/kops/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6358a7565c0d..483b2b6faf94 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -73,4 +73,10 @@ rec { sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9"; rev = "v${version}"; }; + + kops_1_20 = mkKops rec { + version = "1.20.1"; + sha256 = "sha256-k6ODXbh7Bh+rBw6bjSNLxLY0fz7JLnrmJibnXz5qnSc="; + rev = "v${version}"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc34e1d23531..49da8bd86a0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30401,8 +30401,9 @@ in kops_1_17 kops_1_18 kops_1_19 + kops_1_20 ; - kops = kops_1_19; + kops = kops_1_20; lguf-brightness = callPackage ../misc/lguf-brightness { }; From 07de30ff81149c3cc02702f7a8cab2c217d44f1e Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 28 May 2021 01:10:37 -0500 Subject: [PATCH 332/664] kops: keep only three latest versions --- pkgs/applications/networking/cluster/kops/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 483b2b6faf94..5566854a325f 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -53,16 +53,6 @@ rec { mkKops = generic; - kops_1_16 = mkKops { - version = "1.16.4"; - sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; - }; - - kops_1_17 = mkKops { - version = "1.17.2"; - sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz"; - }; - kops_1_18 = mkKops { version = "1.18.2"; sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49da8bd86a0a..6ea0658f055e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30397,8 +30397,6 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_16 - kops_1_17 kops_1_18 kops_1_19 kops_1_20 From d6cbf3a701eaae13d562cc8371f9bc2559e6763a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 28 May 2021 19:19:57 +0000 Subject: [PATCH 333/664] electron_13: init at 13.0.1 https://github.com/electron/electron/releases/tag/v13.0.0 https://github.com/electron/electron/releases/tag/v13.0.1 --- pkgs/development/tools/electron/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 5ecec0059a02..3d850698b0fc 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -22,7 +22,7 @@ let in rec { - electron = electron_12; + electron = electron_13; electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; @@ -114,4 +114,14 @@ rec { aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488"; headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; }; + + electron_13 = mkElectron "13.0.1" { + x86_64-linux = "05c6cfc2804d426d6c2af15cc16e0265782917e76fb2c4e87b7469d0f3ab0f81"; + x86_64-darwin = "a65a44bfafcdfcdee0bb2b3515dab57e884e0700830ccd142e15f01e6c3a4976"; + i686-linux = "3f3b358879523b10e6341a5c74842f8c09a1073f6064410f3495143733663f8d"; + armv7l-linux = "b6657862bf4b1f61f5c1e0c836401f82822fc5ebd69ecb2efd0777255fefc813"; + aarch64-linux = "ccc581dc5ddf9d2adefb60d8bc495b5a04363a80614d617094c142b8c5aa95de"; + aarch64-darwin = "e58e3ea3fffc8c3b280b0b6c22c685f9ecd82ef0340a5207d8b9c6f20e7c0197"; + headers = "0idlap698vqz7i2by3g9k4yqhm87fqc34pgzxcidzan9qvyd0njx"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5f9018676de..6f20edc53ce8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12672,7 +12672,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11 electron_12; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11 electron_12 electron_13; autobuild = callPackage ../development/tools/misc/autobuild { }; From a0426609c8cbf16e8ef1bbae34faa060fec6fe05 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 28 May 2021 19:20:03 +0000 Subject: [PATCH 334/664] electron_12: 12.0.7 -> 12.0.9 https://github.com/electron/electron/releases/tag/v12.0.8 https://github.com/electron/electron/releases/tag/v12.0.9 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 3d850698b0fc..5fbea8c50a2b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; }; - electron_12 = mkElectron "12.0.7" { - x86_64-linux = "335b77b35361fac4e2df1b7e8de5cf055e0a1a2065759cb2dd4508e8a77949fa"; - x86_64-darwin = "c3238c9962c5ad0f9de23c9314f07e03410d096d7e9f9d91016dab2856606a9e"; - i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06"; - armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a"; - aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71"; - aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488"; - headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; + electron_12 = mkElectron "12.0.9" { + x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d"; + x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872"; + i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6"; + armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898"; + aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9"; + aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb"; + headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66"; }; electron_13 = mkElectron "13.0.1" { From 505298f812a263244c2189549933c02d810965a7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 28 May 2021 19:20:06 +0000 Subject: [PATCH 335/664] electron_11: 11.4.6 -> 11.4.7 https://github.com/electron/electron/releases/tag/v11.4.7 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 5fbea8c50a2b..39a47f6d58a3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,14 +95,14 @@ rec { headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk"; }; - electron_11 = mkElectron "11.4.6" { - x86_64-linux = "03932a0b3328a00e7ed49947c70143b7b3455a3c1976defab2f74127cdae43e9"; - x86_64-darwin = "47de03b17ab20213c95d5817af3d7db2b942908989649202efdcd1d566dd24c3"; - i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace"; - armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857"; - aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc"; - aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5"; - headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; + electron_11 = mkElectron "11.4.7" { + x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539"; + x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043"; + i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc"; + armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7"; + aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323"; + aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622"; + headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; }; electron_12 = mkElectron "12.0.9" { From f8fbfa538bcb8a8c187f4d60946cf8f0dc9dc6a7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 28 May 2021 19:20:08 +0000 Subject: [PATCH 336/664] electron_10: 10.4.5 -> 10.4.7 https://github.com/electron/electron/releases/tag/v10.4.6 https://github.com/electron/electron/releases/tag/v10.4.7 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 39a47f6d58a3..e3cd9d2cf905 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,13 +86,13 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.5" { - x86_64-linux = "d7f6203d09b4419262e985001d4c4f6c1fdfa3150eddb0708df9e124bebd0503"; - x86_64-darwin = "e3ae7228010055b1d198d8dbaf0f34882d369d8caf76206a59f198301a3f3913"; - i686-linux = "dd6abc0dc00d8f9d0e31c8f2bb70f7bbbaec58af4c446f8b493bbae9a9428e2f"; - armv7l-linux = "86bc5f9d3dc94d19e847bf10ab22d98926b616d9febcbdceafd30e35b8f2b2db"; - aarch64-linux = "655b36d68332131250f7496de0bb03a1e93f74bb5fc4b4286148855874673dcd"; - headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk"; + electron_10 = mkElectron "10.4.7" { + x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995"; + x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb"; + i686-linux = "dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79"; + armv7l-linux = "56f11ed14f8a620650d31c21ebd095ce59ef4286c98276802b18f9cc85560ddd"; + aarch64-linux = "0550584518c8e98fe1113706c10fd7456ec519f7aa6867fbff17c8913327d758"; + headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; electron_11 = mkElectron "11.4.7" { From 42d671a80d2cf80b25adb3d296dc36df2136c93c Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 28 May 2021 22:13:52 +0300 Subject: [PATCH 337/664] b3sum: 0.3.7 -> 0.3.8 --- pkgs/tools/security/b3sum/cargo-lock.patch | 513 ------------------ pkgs/tools/security/b3sum/default.nix | 18 +- .../tools/security/b3sum/update-cargo-lock.sh | 19 - 3 files changed, 6 insertions(+), 544 deletions(-) delete mode 100644 pkgs/tools/security/b3sum/cargo-lock.patch delete mode 100755 pkgs/tools/security/b3sum/update-cargo-lock.sh diff --git a/pkgs/tools/security/b3sum/cargo-lock.patch b/pkgs/tools/security/b3sum/cargo-lock.patch deleted file mode 100644 index 1f8494089477..000000000000 --- a/pkgs/tools/security/b3sum/cargo-lock.patch +++ /dev/null @@ -1,513 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..1dff162 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,507 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.34" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+ -+[[package]] -+name = "b3sum" -+version = "0.3.7" -+dependencies = [ -+ "anyhow", -+ "blake3", -+ "clap", -+ "duct", -+ "hex", -+ "memmap", -+ "rayon", -+ "tempfile", -+ "wild", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "blake3" -+version = "0.3.7" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "cc", -+ "cfg-if 0.1.10", -+ "constant_time_eq", -+ "crypto-mac", -+ "digest", -+ "rayon", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.62" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "2.33.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "const_fn" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -+ -+[[package]] -+name = "crossbeam-channel" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-deque" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "crossbeam-epoch", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-epoch" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "const_fn", -+ "crossbeam-utils", -+ "lazy_static", -+ "memoffset", -+ "scopeguard", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" -+dependencies = [ -+ "autocfg", -+ "cfg-if 1.0.0", -+ "const_fn", -+ "lazy_static", -+] -+ -+[[package]] -+name = "crypto-mac" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -+dependencies = [ -+ "generic-array", -+ "subtle", -+] -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "duct" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f90a9c3a25aafbd538c7d40a53f83c4487ee8216c12d1c8ef2c01eb2f6ea1553" -+dependencies = [ -+ "libc", -+ "once_cell", -+ "os_pipe", -+ "shared_child", -+] -+ -+[[package]] -+name = "either" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+ -+[[package]] -+name = "generic-array" -+version = "0.14.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" -+ -+[[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.80" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" -+ -+[[package]] -+name = "memmap" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "memoffset" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" -+ -+[[package]] -+name = "os_pipe" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "rayon" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -+dependencies = [ -+ "autocfg", -+ "crossbeam-deque", -+ "either", -+ "rayon-core", -+] -+ -+[[package]] -+name = "rayon-core" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -+dependencies = [ -+ "crossbeam-channel", -+ "crossbeam-deque", -+ "crossbeam-utils", -+ "lazy_static", -+ "num_cpus", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.57" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" -+ -+[[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 = "scopeguard" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+ -+[[package]] -+name = "shared_child" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "subtle" -+version = "2.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "libc", -+ "rand", -+ "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 = "typenum" -+version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[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.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wild" -+version = "2.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020" -+dependencies = [ -+ "glob", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 9cfc68146f95..1d9b2f66debf 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -1,21 +1,15 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "0.3.7"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "BLAKE3-team"; - repo = "BLAKE3"; - rev = version; - sha256 = "0r3nj7jbrpb2gkkfa9h6nv6blrbv6dlrhxg131qnh340q1ysh0x7"; + src = fetchCrate { + inherit version pname; + sha256 = "1a42kwbl886yymm3v7h6y957x5f4yi9j40jy4szg9k0iy8bsdfmh"; }; - sourceRoot = "source/b3sum"; - - cargoSha256 = "18l6j756s6qfmiy3z2cai7i62wskf04xi7y4dlcv4aiv4sv3nx9r"; - - cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0v7ric12agicppg5ax5q0vwbslw7kmxpinafvdjj5sc2ysinw1zm"; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/tools/security/b3sum/update-cargo-lock.sh b/pkgs/tools/security/b3sum/update-cargo-lock.sh deleted file mode 100755 index 8c52ad5cf6c0..000000000000 --- a/pkgs/tools/security/b3sum/update-cargo-lock.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# This updates cargo-lock.patch for the b3sum version listed in default.nix. - -set -eu -o verbose - -here=$PWD -version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) -checkout=$(mktemp -d) -git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout" -cd "$checkout" - -(cd b3sum && cargo generate-lockfile) -mv b3sum/Cargo.lock ./ -git add -f Cargo.lock -git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch - -cd "$here" -rm -rf "$checkout" From 2aa7662279727652dd326d5e7fc2a9aa50a73eef Mon Sep 17 00:00:00 2001 From: David Birks Date: Fri, 28 May 2021 16:11:44 -0400 Subject: [PATCH 338/664] tilt: 0.18.10 -> 0.20.5 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ccbe9d9a7ac0..d717bd42652b 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.10"; + version = "0.20.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY="; + sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38="; }; vendorSha256 = null; From 16fc720da38ac57d5d3a3953b32cb8ba9bf5a28a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 00:02:55 +0200 Subject: [PATCH 339/664] python3Packages.pyroon: init at 0.0.37 --- .../python-modules/pyroon/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/pyroon/default.nix diff --git a/pkgs/development/python-modules/pyroon/default.nix b/pkgs/development/python-modules/pyroon/default.nix new file mode 100644 index 000000000000..c27c70be5895 --- /dev/null +++ b/pkgs/development/python-modules/pyroon/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, ifaddr +, poetry-core +, pythonOlder +, requests +, six +, websocket_client +}: + +buildPythonPackage rec { + pname = "pyroon"; + version = "0.0.37"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pavoni"; + repo = pname; + rev = version; + sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + ifaddr + requests + six + websocket_client + ]; + + patches = [ + # Switch to poetry-core, https://github.com/pavoni/pyroon/pull/43 + (fetchpatch { + name = "use-peotry-core.patch"; + url = "https://github.com/pavoni/pyroon/commit/16f890314683a6c2700fa4da5c937559e2e24bea.patch"; + sha256 = "047bhimr72rwqqyjy7jkfzacdc2ycy81wbmgnvf7xyhgjw1jyvh5"; + }) + ]; + + # Tests require access to the Roon API + doCheck = false; + + pythonImportsCheck = [ "roonapi" ]; + + meta = with lib; { + description = "Python library to interface with the Roon API"; + homepage = "https://github.com/pavoni/pyroon"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2fed68c691b4..03ffc1a6bda4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6202,6 +6202,8 @@ in { pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; + pyroon = callPackage ../development/python-modules/pyroon { }; + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; pyrr = callPackage ../development/python-modules/pyrr { }; From 0aa2c0c6a3d48f6779942abce5a51885f92b4f62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 00:05:24 +0200 Subject: [PATCH 340/664] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7d1b5e162189..0e952c444deb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -701,7 +701,7 @@ "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ rokuecp ]; "roomba" = ps: with ps; [ roombapy ]; - "roon" = ps: with ps; [ ]; # missing inputs: roonapi + "roon" = ps: with ps; [ pyroon ]; "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; From fe9f49ec5660da02344482970ce9fc8e432e541e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 May 2021 00:07:09 +0200 Subject: [PATCH 341/664] home-assistant: enable roon tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 13413a840753..f0c00550381d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -521,6 +521,7 @@ in with py.pkgs; buildPythonApplication rec { "rmvtransport" "roku" "roomba" + "roon" "rss_feed_template" "ruckus_unleashed" "safe_mode" From d86a0722bea9d526532c5034505ce6951e657650 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 21:20:38 +0000 Subject: [PATCH 342/664] kind: 0.11.0 -> 0.11.1 --- pkgs/development/tools/kind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index d0ce0c83c90b..88bc30943c38 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "kind"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "020s1fr92lv9yiy5kbnrfb8n0lpslriwyh5z31aym3x44qpc6jaj"; + sha256 = "sha256-pjg52ONseKNw06EOBzD6Elge+Cz+C3llPvjJPHkn1cw="; }; - vendorSha256 = "08cjvhk587f3aar4drn0hq9q1zlsnl4p7by4j38jzb4r8ix5s98y"; + vendorSha256 = "sha256-HiVdekSZrC/RkMSvcwm1mv6AE4bA5kayUsMdVCbckiE="; doCheck = false; From d60e79d11307aa497a86e2311da5a8be2837e6ae Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 28 May 2021 23:21:50 +0200 Subject: [PATCH 343/664] markdownlint-cli: init at 0.27.1 --- pkgs/development/node-packages/default.nix | 4 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 10869 ++++++++-------- 3 files changed, 5561 insertions(+), 5313 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 6f5223ad61c9..71eb3727c6a4 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -119,6 +119,10 @@ let ''; }; + markdownlint-cli = super.markdownlint-cli.override { + meta.mainProgram = "markdownlint"; + }; + mirakurun = super.mirakurun.override rec { nativeBuildInputs = with pkgs; [ makeWrapper ]; postInstall = let diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ab616609c1a5..268ca2409ed2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -152,6 +152,7 @@ , "livedown" , {"lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" +, "markdownlint-cli" , "markdown-link-check" , "mastodon-bot" , "mathjax" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3b2e68016823..be075bfdb04a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,22 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1102.10" = { + "@angular-devkit/architect-0.1200.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.10"; + version = "0.1200.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.10.tgz"; - sha512 = "jb/Df6l7XHU7b2hu5gG1WItMo9cDjrqY0i6UzntUQ/QsSMqbnU6yWoRT6orLgN9tGdA4AjIyv+9mfMXHwM2maw=="; - }; - }; - "@angular-devkit/core-11.2.10" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.10.tgz"; - sha512 = "3QBluhsnXsntbl0ybHuXtuH/HBChqibXKmzrENj2n+SKlHFOYhE9PJCSfE6q1kwKN+zg6avOETVziI2pP5xtJQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.2.tgz"; + sha512 = "Vy/dE1iwEiV63cxcU+SC+Lf5SUnY64vg9J3YA3jxFlJnELbxxN+T7xDfjMEMPoLzTY02K9XNb8ZGLStZxVmZLg=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -85,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/schematics-11.2.10" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.2.10"; + "@angular-devkit/core-12.0.2" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.10.tgz"; - sha512 = "T1V6mCwc2GYKAWMtCy2HaCxLw1kydu36tGV+dKjKHEwE+8cDgRRT5FhQ+XZzehVDeK9GvDu8Znur1F6i/WmKgw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.2.tgz"; + sha512 = "n7BmZAW0nx4pEigdAsibvtIm4Vjk1IwY3Bbc8fqD+AQpdYCo+Ake1Eu6fL2XoW8Yco7U4JYYdn/uodWEgBdroQ=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -112,6 +103,15 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; + "@angular-devkit/schematics-12.0.2" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.2.tgz"; + sha512 = "PS+SrRhAc/lyRfuBsi6Rt2yV7IA34B7T6J0K8/Av0GABZ83x+0vLiZC39eSPS1X8qcM/U09pCfDT8Q6ZQPCICA=="; + }; + }; "@angular-devkit/schematics-cli-0.1102.6" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -238,22 +238,22 @@ let sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; }; }; - "@apollo/protobufjs-1.2.0" = { + "@apollo/protobufjs-1.2.2" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.0.tgz"; - sha512 = "TBgsADig/K4Hx71uQO6KPLxgoE/ORhPGh/HgouHru+cum8RLDfAfEY5Dde+cNala+luGI2X4Rs42pLWRud7/WA=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.2.tgz"; + sha512 = "vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ=="; }; }; - "@apollographql/apollo-tools-0.4.12" = { + "@apollographql/apollo-tools-0.5.1" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.12"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.12.tgz"; - sha512 = "JdC7aBzMUO6SaGH5g6MvIG8TWd+7cU/G9cyjKS/woYVtqyICLamyG21R8SmjiBnd5c1UgPWOxjSIxYBL2ln8Mg=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz"; + sha512 = "ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA=="; }; }; "@apollographql/graphql-playground-html-1.6.27" = { @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.13.16" = { + "@babel/cli-7.14.3" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.13.16"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.13.16.tgz"; - sha512 = "cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.3.tgz"; + sha512 = "zU4JLvwk32ay1lhhyGfqiRUSPoltVDjhYkA3aQq8+Yby9z30s/EsFw1EPOHxWG9YZo2pAGfgdRNeHZQAYU5m9A=="; }; }; "@babel/code-frame-7.10.4" = { @@ -346,13 +346,13 @@ let sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.13.15" = { + "@babel/compat-data-7.14.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.13.15"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz"; - sha512 = "ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz"; + sha512 = "i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ=="; }; }; "@babel/core-7.10.5" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.13.16" = { + "@babel/core-7.14.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.13.16"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.13.16.tgz"; - sha512 = "sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz"; + sha512 = "jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.13.16" = { + "@babel/generator-7.14.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.13.16"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz"; - sha512 = "grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz"; + sha512 = "bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA=="; }; }; "@babel/helper-annotate-as-pure-7.12.13" = { @@ -409,40 +409,40 @@ let sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.13.16" = { + "@babel/helper-compilation-targets-7.14.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.13.16"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha512 = "3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; + sha512 = "JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA=="; }; }; - "@babel/helper-create-class-features-plugin-7.13.11" = { + "@babel/helper-create-class-features-plugin-7.14.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.13.11"; + version = "7.14.4"; 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=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; + sha512 = "idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.17" = { + "@babel/helper-create-regexp-features-plugin-7.14.3" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.17"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; - sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz"; + sha512 = "JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA=="; }; }; - "@babel/helper-define-polyfill-provider-0.2.0" = { + "@babel/helper-define-polyfill-provider-0.2.3" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.2.0"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; - sha512 = "JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"; + sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; }; }; "@babel/helper-explode-assignable-expression-7.13.0" = { @@ -454,13 +454,13 @@ let sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; }; }; - "@babel/helper-function-name-7.12.13" = { + "@babel/helper-function-name-7.14.2" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.13"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; + sha512 = "NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ=="; }; }; "@babel/helper-get-function-arity-7.12.13" = { @@ -499,13 +499,13 @@ let sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; }; }; - "@babel/helper-module-transforms-7.13.14" = { + "@babel/helper-module-transforms-7.14.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.13.14"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz"; - sha512 = "QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; + sha512 = "OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA=="; }; }; "@babel/helper-optimise-call-expression-7.12.13" = { @@ -544,13 +544,13 @@ let sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; }; }; - "@babel/helper-replace-supers-7.13.12" = { + "@babel/helper-replace-supers-7.14.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.13.12"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; + sha512 = "zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ=="; }; }; "@babel/helper-simple-access-7.13.12" = { @@ -580,13 +580,13 @@ let sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; }; - "@babel/helper-validator-identifier-7.12.11" = { + "@babel/helper-validator-identifier-7.14.0" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.12.11"; + version = "7.14.0"; 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.14.0.tgz"; + sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; }; }; "@babel/helper-validator-option-7.12.17" = { @@ -607,31 +607,31 @@ let sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; }; }; - "@babel/helpers-7.13.17" = { + "@babel/helpers-7.14.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.13.17"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz"; - sha512 = "Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz"; + sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; }; }; - "@babel/highlight-7.13.10" = { + "@babel/highlight-7.14.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.13.10"; + version = "7.14.0"; 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.14.0.tgz"; + sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; }; }; - "@babel/parser-7.13.16" = { + "@babel/parser-7.14.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.16"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz"; - sha512 = "6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz"; + sha512 = "ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { @@ -652,13 +652,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.13.15" = { + "@babel/plugin-proposal-async-generator-functions-7.14.2" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.13.15"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; - sha512 = "VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; + sha512 = "b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ=="; }; }; "@babel/plugin-proposal-class-properties-7.12.13" = { @@ -679,13 +679,22 @@ let sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.13.8" = { + "@babel/plugin-proposal-class-static-block-7.14.3" = { + name = "_at_babel_slash_plugin-proposal-class-static-block"; + packageName = "@babel/plugin-proposal-class-static-block"; + version = "7.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; + sha512 = "HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.14.2" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.13.8"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; + sha512 = "oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA=="; }; }; "@babel/plugin-proposal-export-default-from-7.12.13" = { @@ -697,49 +706,49 @@ let sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.13" = { + "@babel/plugin-proposal-export-namespace-from-7.14.2" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.13"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; + sha512 = "sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.13.8" = { + "@babel/plugin-proposal-json-strings-7.14.2" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.13.8"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; + sha512 = "w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.2" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.13.8"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; + sha512 = "1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.13.8"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; + sha512 = "ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.13" = { + "@babel/plugin-proposal-numeric-separator-7.14.2" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.13"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; + sha512 = "DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.10.4" = { @@ -751,31 +760,31 @@ let sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.13.8" = { + "@babel/plugin-proposal-object-rest-spread-7.14.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.13.8"; + version = "7.14.4"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; + sha512 = "AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.2" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.13.8"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; + sha512 = "XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.13.12" = { + "@babel/plugin-proposal-optional-chaining-7.14.2" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.13.12"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; - sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; + sha512 = "qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA=="; }; }; "@babel/plugin-proposal-private-methods-7.13.0" = { @@ -787,6 +796,15 @@ let sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; }; }; + "@babel/plugin-proposal-private-property-in-object-7.14.0" = { + name = "_at_babel_slash_plugin-proposal-private-property-in-object"; + packageName = "@babel/plugin-proposal-private-property-in-object"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; + sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; + }; + }; "@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"; @@ -823,6 +841,15 @@ let sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; + "@babel/plugin-syntax-class-static-block-7.12.13" = { + name = "_at_babel_slash_plugin-syntax-class-static-block"; + packageName = "@babel/plugin-syntax-class-static-block"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; + sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; + }; + }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; @@ -949,6 +976,15 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; + "@babel/plugin-syntax-private-property-in-object-7.14.0" = { + name = "_at_babel_slash_plugin-syntax-private-property-in-object"; + packageName = "@babel/plugin-syntax-private-property-in-object"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; + sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; + }; + }; "@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"; @@ -994,22 +1030,22 @@ let sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.13.16" = { + "@babel/plugin-transform-block-scoping-7.14.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.13.16"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz"; - sha512 = "ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; + sha512 = "5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g=="; }; }; - "@babel/plugin-transform-classes-7.13.0" = { + "@babel/plugin-transform-classes-7.14.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.13.0"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; + sha512 = "p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ=="; }; }; "@babel/plugin-transform-computed-properties-7.13.0" = { @@ -1021,13 +1057,13 @@ let sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; }; }; - "@babel/plugin-transform-destructuring-7.13.17" = { + "@babel/plugin-transform-destructuring-7.14.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.13.17"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; - sha512 = "UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; + sha512 = "JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA=="; }; }; "@babel/plugin-transform-dotall-regex-7.12.13" = { @@ -1102,22 +1138,22 @@ let sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.13.0" = { + "@babel/plugin-transform-modules-amd-7.14.2" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.13.0"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; - sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; + sha512 = "hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.13.8" = { + "@babel/plugin-transform-modules-commonjs-7.14.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.13.8"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; - sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; + sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; }; }; "@babel/plugin-transform-modules-systemjs-7.13.8" = { @@ -1129,13 +1165,13 @@ let sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; }; }; - "@babel/plugin-transform-modules-umd-7.13.0" = { + "@babel/plugin-transform-modules-umd-7.14.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.13.0"; + version = "7.14.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=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; + sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { @@ -1174,13 +1210,13 @@ let sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.13.0" = { + "@babel/plugin-transform-parameters-7.14.2" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.13.0"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; + sha512 = "NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A=="; }; }; "@babel/plugin-transform-property-literals-7.12.13" = { @@ -1192,22 +1228,22 @@ let sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; }; - "@babel/plugin-transform-react-display-name-7.12.13" = { + "@babel/plugin-transform-react-display-name-7.14.2" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.12.13"; + version = "7.14.2"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz"; + sha512 = "zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw=="; }; }; - "@babel/plugin-transform-react-jsx-7.13.12" = { + "@babel/plugin-transform-react-jsx-7.14.3" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.13.12"; + version = "7.14.3"; 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=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz"; + sha512 = "uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.12.17" = { @@ -1228,13 +1264,13 @@ let sha512 = "FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.12.13" = { + "@babel/plugin-transform-react-jsx-source-7.14.2" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.12.13"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; - sha512 = "O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.2.tgz"; + sha512 = "OMorspVyjxghAjzgeAWc6O7W7vHbJhV69NeTGdl9Mxgz6PaweAuo7ffB9T5A1OQ9dGcw0As4SYMUhyNC4u7mVg=="; }; }; "@babel/plugin-transform-react-pure-annotations-7.12.1" = { @@ -1264,13 +1300,13 @@ let sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.13.15" = { + "@babel/plugin-transform-runtime-7.14.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.13.15"; + version = "7.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz"; - sha512 = "d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; + sha512 = "t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.12.13" = { @@ -1318,13 +1354,13 @@ let sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.13.0" = { + "@babel/plugin-transform-typescript-7.14.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.13.0"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; - sha512 = "elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.4.tgz"; + sha512 = "WYdcGNEO7mCCZ2XzRlxwGj3PgeAr50ifkofOUC/+IN/GzKLB+biDPVBUAQN2C/dVZTvEXCp80kfQ1FFZPrwykQ=="; }; }; "@babel/plugin-transform-unicode-escapes-7.12.13" = { @@ -1354,13 +1390,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.13.15" = { + "@babel/preset-env-7.14.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.13.15"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.15.tgz"; - sha512 = "D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz"; + sha512 = "GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA=="; }; }; "@babel/preset-flow-7.13.13" = { @@ -1435,15 +1471,6 @@ let sha512 = "dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg=="; }; }; - "@babel/runtime-7.13.17" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.13.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz"; - sha512 = "NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA=="; - }; - }; "@babel/runtime-7.13.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1453,6 +1480,15 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; + "@babel/runtime-7.14.0" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz"; + sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + }; + }; "@babel/runtime-7.9.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1462,22 +1498,13 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.13.17" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.13.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz"; - sha512 = "RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw=="; - }; - }; - "@babel/standalone-7.13.17" = { + "@babel/standalone-7.14.4" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.13.17"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.13.17.tgz"; - sha512 = "Y9P198T45MIIu+AvGOCcjsdKl79+BCL2nA+6ODA5p/DhGzymvzaTgtzvNcjZDcJmbPszcmohjLLgvma3tmvVtg=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.4.tgz"; + sha512 = "oBvBtSdACtNeH2YAg2kyZhfbqfKQK7lgudfHo8IC03JiBrfuvvMlfkBaSrqxrpf9DmUCZJnDZH3uLNVN5QoXog=="; }; }; "@babel/template-7.12.13" = { @@ -1489,22 +1516,22 @@ let sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.13.17" = { + "@babel/traverse-7.14.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.13.17"; + version = "7.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz"; - sha512 = "BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz"; + sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; }; }; - "@babel/types-7.13.17" = { + "@babel/types-7.14.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.13.17"; + version = "7.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz"; - sha512 = "RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz"; + sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1516,22 +1543,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.9.2" = { + "@bugsnag/browser-7.10.1" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.9.2"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.9.2.tgz"; - sha512 = "vD0UEpInqoOWxqSdXhDN7wbt8hUnaqmHF/nyQK6pVYlPmBOaseexwjGBWQ1BCa4QWwK1CDDBy6sS9onUvWKsnw=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.10.1.tgz"; + sha512 = "Yxm/DheT/NHX2PhadBDuafuHBhP547Iav6Y9jf+skBBSi1n0ZYkGhtVxh8ZWLgqz5W8MsJ0HFiLBqcg/mulSvQ=="; }; }; - "@bugsnag/core-7.9.2" = { + "@bugsnag/core-7.10.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.9.2"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.9.2.tgz"; - sha512 = "iz18qkEhrF0Bra0lpEP4VC0EJa48R+3QDDiTtfHW9fiZGKw+ADrUhwW7pHJn+LDqWfq4kMqJNuQC+8s4dV3MYg=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.10.0.tgz"; + sha512 = "sDa2nDxwsxHQx2/2/tsBWjYqH0TewCR8N/r5at6B+irwVkI0uts7Qc2JyqDTfiEiBXKVEXFK+fHTz1x9b8tsiA=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1543,22 +1570,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.9.2" = { + "@bugsnag/js-7.10.1" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.9.2"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.9.2.tgz"; - sha512 = "RkajX7cnlYKm4uWclf4oQKZL69A9Vo5jNyQiE7u8uFXhotHoDyHi5QLkdHOSIOZHkBGkgoRV9tkbPAJKcnJSuQ=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.10.1.tgz"; + sha512 = "1/MK/Bw2ViFx1hMG2TOX8MOq/LzT2VRd0VswknF4LYsZSgzohkRzz/hi6P2TSlLeapRs+bkDC6u2RCq4zYvyiA=="; }; }; - "@bugsnag/node-7.9.2" = { + "@bugsnag/node-7.10.1" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.9.2"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.9.2.tgz"; - sha512 = "e+tEyUBQ6e5z4WJlPAi962rnbR0f+0wxPjSoUHV5uVFg5Dkjg3ioXDdzKVbxfOEv3nVpXlMD8DrQqYe5g0O6sA=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.10.1.tgz"; + sha512 = "kpasrz/im5ljptt2JOqrjbOu4b0i5sAZOYU4L0psWXlD31/wXytk7im11QlNALdI8gZZBxIFsVo8ks6dR6mHzg=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1570,13 +1597,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.3.0" = { + "@cdktf/hcl2json-0.4.0" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.3.0.tgz"; - sha512 = "iZ5eKhlZSpoWM0+ULUEkxY+qzBGhr3EVkXoYdUbNf/nPx8bd2Qqgk87x4uvqFK8+uNMuINR0HCbCdHFgkfho4A=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.0.tgz"; + sha512 = "etFW1+DoAwQ7ENtdvpuKxmosJDDJ2rnQUDkJPZnNIqLUAXcGG3MdU6PWTnLQX/xwDMQq7xfCZlDK/hrV7g2rhA=="; }; }; "@chemzqm/neovim-5.2.13" = { @@ -1723,175 +1750,175 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.2" = { + "@discoveryjs/json-ext-0.5.3" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz"; - sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.54" = { + "@electron-forge/async-ora-6.0.0-beta.57" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.54.tgz"; - sha512 = "OCoHds0BIXaB54HgKw6pjlHC1cnaTcfJfVVkPSJl1GLC3VShZ5bETJfsitwbiP2kbfKLUQFayW27sqbwnwQR2w=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.57.tgz"; + sha512 = "pinf6bB5etIKNwFgMx2V+kwsFlkjU4mApALv0Jn/lmcH5dlAB4zPwuKTccC44xVO4pp/bV1HWb1XJ4lHVxYaJg=="; }; }; - "@electron-forge/core-6.0.0-beta.54" = { + "@electron-forge/core-6.0.0-beta.57" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz"; - sha512 = "yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.57.tgz"; + sha512 = "pLYG0QefjAEjxRazgEjryb4TrxVeebGTqXqZsKOpABAlDaKU4EmBq06SeSu8H9IAzMPwzpDIa6PaXdkMclqhnA=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.54" = { + "@electron-forge/installer-base-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz"; - sha512 = "q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.57.tgz"; + sha512 = "qeQMUos0WADEddSGhViCUeMswsFz1IL+elIy5h06AxgjoRtOU75VVy9RgVfDAMIN0iKvEWNKLQz1CBUtVAt0fA=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.54" = { + "@electron-forge/installer-darwin-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz"; - sha512 = "kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.57.tgz"; + sha512 = "3dsa948r3gCkD+ooKeGwWSUyh5GEJ7ngi9t1dRD+f1jUnkU1e3SqcGXH68dr5NYn3OcsFDWreK3xvx/1qdEQAg=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.54" = { + "@electron-forge/installer-deb-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz"; - sha512 = "UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.57.tgz"; + sha512 = "Dnm68RUwR0UEe1hq1OPWso0LwdkZTa7Rpv0m9bHl+IvXTmrU//S5fdHEtjHAmto8f8PD5VadsLQcxsc3bQVNGQ=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.54" = { + "@electron-forge/installer-dmg-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz"; - sha512 = "F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.57.tgz"; + sha512 = "kmAYga2yY5JcrRI3Dtpau5Ldsebzs4pGkCCBJqq5asqgDGdCpw+8Cky6ouJDaZMl853C0CEnqxeoGYDTAlVBKA=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.54" = { + "@electron-forge/installer-exe-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz"; - sha512 = "PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.57.tgz"; + sha512 = "hVh4vh2q7BxJ8npsVCSxSdoUMwQwcs0LidbanXK8CqHmTgnb9MNDSHomCxOnX+kMQX85mCj9Nc5ROviXnLN4Xg=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.54" = { + "@electron-forge/installer-linux-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz"; - sha512 = "WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.57.tgz"; + sha512 = "MTK4wLCWxYctzo/htghNhZ5ptIf46AE3UdeQItjiEhL4+KjJjQN8JAVkl40WeM+rUDA53WRQ35HeykNBmspb6A=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.54" = { + "@electron-forge/installer-rpm-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz"; - sha512 = "8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.57.tgz"; + sha512 = "cTzL6mwkhKEkl4v7NE2ATaEsptf5OhTbtwb/tRVIuEOblYKTxw3x9nnH8iGJ73xPW/54awGiU1kHJTKA6UhcUA=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.54" = { + "@electron-forge/installer-zip-6.0.0-beta.57" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz"; - sha512 = "KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.57.tgz"; + sha512 = "ip/mlC32/mdUzFsM/39cZWshLN1B1f6atYHd2OpXlyAz6IZWrRHdsrJGtYsGdpgeoV/wMm09MTyuKXku3ehPaQ=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.54" = { + "@electron-forge/maker-base-6.0.0-beta.57" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.54.tgz"; - sha512 = "4y0y15ieb1EOR5mibtFM9tZzaShbAO0RZu6ARLCpD5BgKuJBzXRPfWvEmY6WeDNzoWTJ+mQdYikLAeOL2E9mew=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.57.tgz"; + sha512 = "VnoSCeyCHBv9q0Bz9JRgKC1b4k3z/Qb2T9DrpMqEVW6ClZVkOAZVmjyEtb+Xn8DnRPc4UtSjpAquycC/AZJ4MQ=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.54" = { + "@electron-forge/plugin-base-6.0.0-beta.57" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz"; - sha512 = "8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.57.tgz"; + sha512 = "lErdgdSGd+HcIzXsZC1Pf6VuLYsDVHTwFUzuZqUPdl28AOWKfwW+XpIZoPMDt2/Mdd5K0mCcYSylikcSa8RHYA=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.54" = { + "@electron-forge/publisher-base-6.0.0-beta.57" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.54.tgz"; - sha512 = "Dny0jW0N8QcNYKHTtzQFZD4pBWJ7tclJWf3ZCX031vUKG7RhThdA06IPNzV6JtWJswrvAE9TPndzZONMza2V7g=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.57.tgz"; + sha512 = "eJFVt4JI/zCw86PMu/LERMAMVcPchyFfZ9upFec4YuOOMLaJH1NvbO3gGgYj7vavH1hQWZA6Yn7u8b+E8y8Byw=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.54" = { + "@electron-forge/shared-types-6.0.0-beta.57" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.54.tgz"; - sha512 = "6CzWKFR17rxxeIqm1w5ZyT9uTAHSVAjhqL8c+TmizF2703GyCEusUkjP2UXt/tZNY4MJlukZoJM66Bct6oZJ+w=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.57.tgz"; + sha512 = "8jRAf7HsfQC5BA8MTOwh8cXmqJ8JJqzO7WzDW9A50tHOKbpBxPW9YM8036SZzZ4GNZYBSWmJt3d3vW+KFLeYXg=="; }; }; - "@electron-forge/template-base-6.0.0-beta.54" = { + "@electron-forge/template-base-6.0.0-beta.57" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz"; - sha512 = "LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.57.tgz"; + sha512 = "3Nc7ik99VHQK8eTUrO/lA2tMRM5a0fLX+GgjR32yzkaAv081qd6t/XWS7MfU3k5Ld5cYMturUywJnEP/QdxOvA=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.54" = { + "@electron-forge/template-typescript-6.0.0-beta.57" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz"; - sha512 = "7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.57.tgz"; + sha512 = "NhcyTaLjbBGtdCTkAJgazKR4B9+yNFNH8QiXm3u6bg0cv2MhPWydmPuiEjFRLqG+Vz6jS4sW6jSIyCjFRK42ow=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.54" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.57" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz"; - sha512 = "1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.57.tgz"; + sha512 = "S9AzVLB02AvOwEOtQvtSJlv7BPZPSX3gdqwhoxPcTP6Pi/hOvVeEweptkwwRzGsZmSI7/ifi1bq7avhnzjasZw=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.54" = { + "@electron-forge/template-webpack-6.0.0-beta.57" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz"; - sha512 = "4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.57.tgz"; + sha512 = "df4/jHKcZ6+8qIE+h2U9Ej5P36uGQZjI8+CcIPDE/46avHT+BwCmlMA/ZTGUQ787U9WkoMiI7122jdd7GNyuCQ=="; }; }; "@electron/get-1.12.4" = { @@ -1975,13 +2002,13 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@eslint/eslintrc-0.4.0" = { + "@eslint/eslintrc-0.4.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; + sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; }; }; "@exodus/schemasafe-1.0.0-rc.3" = { @@ -1993,13 +2020,13 @@ let sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; }; }; - "@expo/apple-utils-0.0.0-alpha.17" = { + "@expo/apple-utils-0.0.0-alpha.20" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "0.0.0-alpha.17"; + version = "0.0.0-alpha.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.17.tgz"; - sha512 = "ecpC6e3xTtMVVKWpp231L8vptoSPqwtKSmfJ8sXfMlQRtWbq8Bu1pCHR/pdAx9X4IYzygjrTa9IDAPpbGuSaMg=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.20.tgz"; + sha512 = "L/M9NPNlT1e38whA3M4QdnIDCClj6Y2GPXFOxBxuwzlmh847RHwZ/ojJpVP8sLVC+is54DS1hU9vtDkiPHGPRw=="; }; }; "@expo/bunyan-4.0.0" = { @@ -2011,22 +2038,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.38" = { + "@expo/config-4.0.0" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.38"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.38.tgz"; - sha512 = "0SsvF7yTy+kdJaAc2W75yhwnaXIRasnA1Vygna83tlPhCx6ynIBzTbJAvdkddSk5euUTJpXc5nePaflGvNboXw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-4.0.0.tgz"; + sha512 = "Hy2/49BMMzziDhJFf+N0gG5znLuhoorS9/+OFO7wqDbRV4LRraNx4UuGdyY06yLI7F0BgEJBGy109pZ4LZoKrA=="; }; }; - "@expo/config-plugins-1.0.28" = { + "@expo/config-plugins-2.0.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.28"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.28.tgz"; - sha512 = "i5SpC6U3LjRQlwi1xM4SRj8dR2Qm+0dykPo0GeesByB7IvT36AT1ZjI7VjecuoZ6yKbLpaa5tWvU3JGObxIPSw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.0.tgz"; + sha512 = "MyD9cdoVuXEw/xzpHiFNzRvMFi1DWTU2oShTTviA8xt1U1gyuBTa9aBwFSyvZmpMoCEscOsC8ED0sZl7LM5wNw=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -2038,31 +2065,31 @@ let sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; }; }; - "@expo/configure-splash-screen-0.3.4" = { + "@expo/configure-splash-screen-0.4.0" = { name = "_at_expo_slash_configure-splash-screen"; packageName = "@expo/configure-splash-screen"; - version = "0.3.4"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.4.tgz"; - sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw=="; + url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.4.0.tgz"; + sha512 = "IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g=="; }; }; - "@expo/dev-server-0.1.64" = { + "@expo/dev-server-0.1.70" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.64"; + version = "0.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.64.tgz"; - sha512 = "6yRkV0qVyz0bZsfPkpPsDRmMIHQQ9Lw3Nn5BAgCNvo7SzjINeNfcpWJXvwcxrU76kKUS+r5NaXNCRlDUkqGTHg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.70.tgz"; + sha512 = "6OytCPP8krQwjhJeluzDZd1dBb9oIptpkskSsrZHQTHyCGK9m3CLILu/hSiUffN73vINscnUXwCusfbKU+g3yQ=="; }; }; - "@expo/dev-tools-0.13.94" = { + "@expo/dev-tools-0.13.100" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.94"; + version = "0.13.100"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.94.tgz"; - sha512 = "T3jIIGB1yLk+1JVcOG3VJI5CTFcOoWEOT4e0/3hONp6CnDQG0L2qpuzd4ypWO411iZ5q3aCyYKNN10AIEZLqzA=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.100.tgz"; + sha512 = "S/kI8boX8cc8pSkLApARxeW3ukdOMXFDBS02bQYx7+oZsY6hqfefUX2gvAnWatzCSOUBnRRdmrDAcFuZRnRP3w=="; }; }; "@expo/devcert-1.0.0" = { @@ -2074,58 +2101,67 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.13" = { + "@expo/image-utils-0.3.14" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.13.tgz"; - sha512 = "BpKoFVJBjG9H5AU040Skrm3R2uDGpWXBU/4TivB5H10cyJphoJKp3GNJVPHYLOVc70OtAxjWDIhLMW6xsWfrgw=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.14.tgz"; + sha512 = "n+JkLZ71CWuNKLVVsPTzMGRwmbeKiVQw/2b99Ro7znCKzJy3tyE5T2C6WBvYh/5h/hjg8TqEODjXXWucRIzMXA=="; }; }; - "@expo/json-file-8.2.29" = { + "@expo/json-file-8.2.30" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.29"; + version = "8.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.29.tgz"; - sha512 = "9C8XwpJiJN9fyClnnNDSTh034zJU9hon6MCUqbBa4dZYQN7OZ00KFZEpbtjy+FndE7YD+KagDxRD6O1HS5vU0g=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.30.tgz"; + sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A=="; }; }; - "@expo/metro-config-0.1.64" = { + "@expo/metro-config-0.1.70" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.64"; + version = "0.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.64.tgz"; - sha512 = "ooD+XOVGnKPIIZbyfVTvMeQ3p9HpRt4aNCehSM6H1ueQm8+IpVwrhw8sJjL5xr+FVxFqj0+Ga9DI8d0AXS8U4g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.70.tgz"; + sha512 = "zegpHSI0EedKSXkBg0wtU99YYA6OY8qCgm0urdKszDJ9c8Oea26b2+x2j0PBqspUiTC4kY+t/pzZkKWDEFAquQ=="; }; }; - "@expo/osascript-2.0.26" = { + "@expo/osascript-2.0.28" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.26"; + version = "2.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.26.tgz"; - sha512 = "DJXmVZsAbScxQ3sfSFQrLERwsmJ4x/Tk8yXmtJZKqO4hplcGa2xLwjKUEh8nSRV5RX/v40yWr9J7aK5cHxTy0A=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.28.tgz"; + sha512 = "+0R/+DK/kTjFmkFShPlwowO3Ro0X0nQ3F7uRaOsXomZVjvrjSaOQOlFYRDr0Ci3pbEWS8MGUhlC7GXlba4VsTw=="; }; }; - "@expo/package-manager-0.0.41" = { + "@expo/package-manager-0.0.43" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.41"; + version = "0.0.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.41.tgz"; - sha512 = "QkKH2AIwbw3wdmkZpw9DwFBQn1E3w/oDKfwPxFXtrwi+7OWonJXzkmYnj26KnVkh4Ajzu7Cwj/zTQ5aBrhwDfw=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.43.tgz"; + sha512 = "Keguxd7fH1JbFd/4fU3PuN3h4usZ3NyRFXgi7ZjAYul8uKt+/XB2HBvliukdThGJKhypMeVWcNYWuLCUm74B1Q=="; }; }; - "@expo/plist-0.0.12" = { + "@expo/plist-0.0.13" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.12.tgz"; - sha512 = "anGvLk58fxfeHY2PbtH79VxhrLDPGd+173pHYYXNg9HlfbrEVLI2Vo0ZBOrr/cYr7cgU5A/WNcMphRoO/KfYZQ=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.13.tgz"; + sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; + }; + }; + "@expo/prebuild-config-1.0.1" = { + name = "_at_expo_slash_prebuild-config"; + packageName = "@expo/prebuild-config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.1.tgz"; + sha512 = "A0MBD5NceJWwRO8dKe+yMjV5LMJX0CXGRX5q57XuV/UJ4RkdX0ZuRdiVpAPpkHXWU5lJAHwtebV0swuDMkWKMQ=="; }; }; "@expo/results-1.0.0" = { @@ -2137,13 +2173,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.28" = { + "@expo/schemer-1.3.29" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.28"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.28.tgz"; - sha512 = "9wmnhlD1X1ro8FTFzM/J3nSxaFpI9X+bcaimP3hKkc3flIR8cGjQcLmE+MOEgE2LET0ScxRBtM3hteernFI6Ww=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.29.tgz"; + sha512 = "7Ch3c39xZunAo/yv8lj62pc9m5jmKKeyCrz7wKe4p3dETvcvLpqaaxl8ylWm//Nok27D290y1q/pE5i12KA+Pg=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -2164,22 +2200,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.68" = { + "@expo/webpack-config-0.12.74" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.68"; + version = "0.12.74"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.68.tgz"; - sha512 = "GS15Vd/VkaITWnQYe4qROGHi95R6HF8x8vDZ1msxfYEVSjdXMU9eo8BPiyTtLTIAaCyNUQEOX5N+91mKHXJPeQ=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.74.tgz"; + sha512 = "xYyiin5uvRwRC3ehqRxb+MSzv9ArJSb3spOgl4yNZPkojXUbNjgyC3xfliVAH7ZuRMlEgL1Is7miixVe69ftYw=="; }; }; - "@expo/xcpretty-2.0.0" = { + "@expo/xcpretty-2.0.1" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.0.tgz"; - sha512 = "bukgcPcsiZq7dYxpSVPQ/qvSDrwpUVSkgEf8NQJS9UcClPakgpM+e5XIzYWe2WXLmHtskVJUPruoEX6zWUm8LA=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.1.tgz"; + sha512 = "fyQbzvZpLiKpx68QDzeLlL1AtFhhEW35dqxIqb4QQ6e3iofu57NdWBQTmIAQzDOPcNNXUR9SFncu3M4iyWwQ7Q=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2227,13 +2263,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.168.0" = { + "@fluentui/react-7.170.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.168.0"; + version = "7.170.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.168.0.tgz"; - sha512 = "eM+vt4RDRnI/IGZtenxYp7cTssMOkXVY3GqFLJkiK/gHTRI3goMWPpLA9tux0lbuiB3zvnvgLrJ2k0ihWa3FCw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.170.1.tgz"; + sha512 = "v43+TQ+zcjzW3vPOebIIUQpj4j1p4McDVwrVGplUmIVgxXPg9wBvXGB0CcBvpaFRZq6tKG95uUdanRsEStBMxQ=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2299,13 +2335,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.11.0" = { + "@google-cloud/pubsub-2.12.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.11.0.tgz"; - sha512 = "j9sIjVLFqSEVrAZdrGbmu4GVVuCW70Sg6/EBKSMjNKhN/ctQsgcP6kUVLVnnrrTWVF0+FfdlfuCHtdYxGy7mfw=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.12.0.tgz"; + sha512 = "SF+y7sKX9Jo2ZoVqzwEuSReUyb6O4mwxzxP1B+dP3j0ArUk0XXSC/tFLQhYM7lC2ViLxGWoIbEZbRIw8SrIQnw=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2326,22 +2362,22 @@ let sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw=="; }; }; - "@graphql-tools/batch-execute-7.1.0" = { + "@graphql-tools/batch-execute-7.1.2" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.1.0.tgz"; - sha512 = "Yb4QRpHZqDk24+T4K3ARk/KFU26Dyl30XcbYeVvIrgIKcmeON/p3DfSeiB0+MaxYlsv+liQKvlxNbeC2hD31pA=="; - }; - }; - "@graphql-tools/delegate-7.1.2" = { - name = "_at_graphql-tools_slash_delegate"; - packageName = "@graphql-tools/delegate"; version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.1.2.tgz"; - sha512 = "XvmIod9ZYKMLk2vV5ulbUyo1Va4SCvvp/VNq4RTae2SEvYwNewc1xs1Klmz8khV+c2V30xKSccNWGA6BWyTTog=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.1.2.tgz"; + sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; + }; + }; + "@graphql-tools/delegate-7.1.5" = { + name = "_at_graphql-tools_slash_delegate"; + packageName = "@graphql-tools/delegate"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.1.5.tgz"; + sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -2353,13 +2389,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.3.0" = { + "@graphql-tools/import-6.3.1" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.3.0.tgz"; - sha512 = "zmaVhJ3UPjzJSb005Pjn2iWvH+9AYRXI4IUiTi14uPupiXppJP3s7S25Si3+DbHpFwurDF2nWRxBLiFPWudCqw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.3.1.tgz"; + sha512 = "1szR19JI6WPibjYurMLdadHKZoG9C//8I/FZ0Dt4vJSbrMdVNp8WFxg4QnZrDeMG4MzZc90etsyF5ofKjcC+jw=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2380,31 +2416,31 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.13" = { + "@graphql-tools/merge-6.2.14" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.13"; + version = "6.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.13.tgz"; - sha512 = "Qjlki0fp+bBQPinhdv7rv24eurvThZ5oIFvGMpLxMZplbw/ovJ2c6llwXr5PCuWAk9HGZsyM9NxxDgtTRfq3dQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.14.tgz"; + sha512 = "RWT4Td0ROJai2eR66NHejgf8UwnXJqZxXgDWDI+7hua5vNA2OW8Mf9K1Wav1ZkjWnuRp4ztNtkZGie5ISw55ow=="; }; }; - "@graphql-tools/schema-7.1.3" = { + "@graphql-tools/schema-7.1.5" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.3"; + version = "7.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.3.tgz"; - sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.5.tgz"; + sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/url-loader-6.8.3" = { + "@graphql-tools/url-loader-6.10.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.8.3"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.3.tgz"; - sha512 = "X1IxyURTbynqBPBJJeSW3hvvc+Pgw/P5IpT/yyTkA7utjRRiNCaGdLbBQO5MaXvD1HpVzBiMgdKG8v7Um3ft7w=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.10.1.tgz"; + sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2416,22 +2452,22 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.7.3" = { + "@graphql-tools/utils-7.10.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.7.3"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.3.tgz"; - sha512 = "zF8Ll1v7DOFfCsZVYGkJqvi3Zpwfga8NutOZkToXrumMlTPaMhEDFkiuwoIK4lV2PMVUke5ZCmpn9pc5pqy4Tw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.10.0.tgz"; + sha512 = "d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w=="; }; }; - "@graphql-tools/wrap-7.0.5" = { + "@graphql-tools/wrap-7.0.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "7.0.5"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.5.tgz"; - sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.8.tgz"; + sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; "@grpc/grpc-js-1.2.11" = { @@ -2452,6 +2488,24 @@ let sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw=="; }; }; + "@grpc/grpc-js-1.3.1" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.1.tgz"; + sha512 = "zyFq9eW0U4vGyhJS/oeW3mIeKTzB13we9rBclcisfRHxGQbC9FCOKQ5BBA2129yZwRVMt4hQia1igGzECeuY9g=="; + }; + }; + "@grpc/grpc-js-1.3.2" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.2.tgz"; + sha512 = "UXepkOKCATJrhHGsxt+CGfpZy9zUn1q9mop5kfcXq1fBkTePxVNPOdnISlCbJFlCtld+pSLGyZCzr9/zVprFKA=="; + }; + }; "@grpc/proto-loader-0.5.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -2470,6 +2524,24 @@ let sha512 = "JwWZwGuN1nQuPdeL1d94hNGtnRtiOuy+SkdVUU8IwwQzksvdWvgKHyGDCesvAD0tndQTm1YUZHJw+JDTIDALyQ=="; }; }; + "@grpc/proto-loader-0.6.1" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz"; + sha512 = "4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw=="; + }; + }; + "@grpc/proto-loader-0.6.2" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.2.tgz"; + sha512 = "q2Qle60Ht2OQBCp9S5hv1JbI4uBBq6/mqSevFNK3ZEgRDBCAkWqZPUhD/K9gXOHrHKluliHiVq2L9sw1mVyAIg=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -3037,67 +3109,67 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.23" = { + "@joplin/fork-htmlparser2-4.1.24" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.23"; + version = "4.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.23.tgz"; - sha512 = "nTbOVZJbF02d32AhvwhWME2uQbbCZsFYulMgqRZ/I4realfJgqkaUfXclLxYcyOPAjzngXd+Wb1/M/Pz6luXGw=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.24.tgz"; + sha512 = "lggBrPT0Lg/WcD7oe166HbpAS+ajQwSNAzUl8pYBhNChJzjbngJxm5hs94xYJ3qDzyxHRMU+x4iTZAn0/SNFDQ=="; }; }; - "@joplin/fork-sax-1.2.27" = { + "@joplin/fork-sax-1.2.28" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.27"; + version = "1.2.28"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.27.tgz"; - sha512 = "ON/8pg90WCRHKj8HttziC7Rtef+DKSSDZD9J3zjHYUvrXB0pu+7eZvRP8vF3Y2MSZnlshtFGQqiIRbwk3GVA+Q=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.28.tgz"; + sha512 = "oWUpaBZlfUC+dGJqmb8hwwgjk3dSHcKL7e8n1LpmkUBqqdh1lxLrrFoGqYpKiSBgDY0KTIdyB8S8INBMlY+l7A=="; }; }; - "@joplin/lib-1.0.18" = { + "@joplin/lib-1.8.2" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "1.0.18"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.18.tgz"; - sha512 = "r0Z+bolszlPUsanaQIUk/tog3jHw0rGtUxXTHDMtycFWkWYVpjlT3bvxiYrV5MwLjyn/xnfUCIdHeUi/Lz3LPQ=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.8.2.tgz"; + sha512 = "e/uEdz3PbxQQ8XUT6y1HNSM3LdpMjTEJbY+61E7LwC1PguyvAuQgr3tLS0/5OS/PJ1FP4Jm7gU61OJ28g4i4wA=="; }; }; - "@joplin/renderer-1.0.26" = { + "@joplin/renderer-1.8.2" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "1.0.26"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.26.tgz"; - sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.8.2.tgz"; + sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ=="; }; }; - "@joplin/turndown-4.0.45" = { + "@joplin/turndown-4.0.46" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.45"; + version = "4.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.45.tgz"; - sha512 = "u4J/ka4szy34ioQ5UVaCdLlfzfOxEQH/lDReHauYoNhH+H+EWt1qOwMh9A8fuTfoK2vnUUiPKHsWhOYCe+LRiw=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.46.tgz"; + sha512 = "OqI9DFEKdEOxfQUkbfRiWpNfDXf+/E4u9c9hXVRK66xFrVkZww7FBmoGqIMHzOrKeQBIPZQuHCav31cFl7oMCQ=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.27" = { + "@joplin/turndown-plugin-gfm-1.0.28" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.27.tgz"; - sha512 = "4BPgTSkhvxPI3tbjG4BPiBq0VuNZji1Y77DRWHb09GnzsrgwBI+gpo3EI6obkyIeRuN/03wzf98W5u1iau2vpQ=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.28.tgz"; + sha512 = "CAmcFWK2bgAgQq3h+xEKjjk8/7v8ZaY2ixHDoiSCRiSqv868EuAQLCks6Ox4rq35R2yX8FK/pHeciRpZo5wNcg=="; }; }; - "@josephg/resolvable-1.0.0" = { + "@josephg/resolvable-1.0.1" = { name = "_at_josephg_slash_resolvable"; packageName = "@josephg/resolvable"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.0.tgz"; - sha512 = "OfTtjoqB2doov5aTJxkyAMK8dXoo7CjCUQSYUEtiY34jbWduOGV7+168tmCT8COMsUEd5DMSFg/0iAOPCBTNAQ=="; + url = "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz"; + sha512 = "CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -3109,13 +3181,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.29.0" = { + "@jsii/spec-1.30.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.29.0.tgz"; - sha512 = "Y0ouCaYVPy7KjQ8di6Hu4xizKYp4klqqDf08BaEgqd38TzqBuO0abgcd9OJFUQyoDnCCWTdGBfqTo2xfvW9Pbw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.30.0.tgz"; + sha512 = "oXIwvZyHHc/TrwA/3pzQ3gkqBe916EWBvaexNI3rnKZujlHZT4vVVHMCjQ/kUJhcR0GEaahvwlNhiPTu6roC2g=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3676,6 +3748,15 @@ let sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; }; + "@mapbox/node-pre-gyp-1.0.5" = { + name = "_at_mapbox_slash_node-pre-gyp"; + packageName = "@mapbox/node-pre-gyp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz"; + sha512 = "4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA=="; + }; + }; "@mark.probst/typescript-json-schema-0.32.0" = { name = "_at_mark.probst_slash_typescript-json-schema"; packageName = "@mark.probst/typescript-json-schema"; @@ -3721,13 +3802,22 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.165" = { + "@microsoft/fetch-event-source-2.0.1" = { + name = "_at_microsoft_slash_fetch-event-source"; + packageName = "@microsoft/fetch-event-source"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz"; + sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; + }; + }; + "@microsoft/load-themed-styles-1.10.173" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.165"; + version = "1.10.173"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.165.tgz"; - sha512 = "3xMvFn1q27wctE701ZmdKDKgkj4b4DMHaJ8hnKk+c/E3Zvoo/5lviPZ0IGkD+zyfe7GMSp2kONalvX7Ez7HaKA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.173.tgz"; + sha512 = "Bi4U2IQr5uWl1RVhCZduWO04em4CbYcH6cvmgvkN2K09kFW9VSQ4qAQYnnZ6w8HOCOsa3BJaHtGq+TTOP4eYkg=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3793,13 +3883,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-11.2.5" = { + "@netlify/build-11.29.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "11.2.5"; + version = "11.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-11.2.5.tgz"; - sha512 = "VjBtlEnCTjrYN9tTrgJdRjkauqN1gQ+fdtoVsZ0Lyz1Ja1LUnIPkCUHhsOmupMlvW/Yyl/QHTSPojg/wpMf1Zw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.0.tgz"; + sha512 = "e5tmKxHORmJABpgSdlylXBnhibwHZGdSTZWJa3eVIHSMwRC5xK37TLi+HmSL+AeCEqaHozFhHedsdgkKB9figw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3811,67 +3901,67 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-6.2.0" = { + "@netlify/config-6.7.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "6.2.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-6.2.0.tgz"; - sha512 = "CK8GpGf8v10GlY/gLhb27PEc9cWQaVpLi9/KQZhsEiLCmwVV+oLkfev2wOuIuPakTaCWJbwDbNGtCF+o3f3Crg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-6.7.1.tgz"; + sha512 = "4DyiSauSFaorJ46l4tBu+nbvPKY9i1gOQvw9L4yql7gd7qqJsHJi2zivdJ50+MPedQn0cgcs5lk303UBEfFsBQ=="; }; }; - "@netlify/framework-info-3.3.0" = { + "@netlify/framework-info-5.0.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "3.3.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-3.3.0.tgz"; - sha512 = "oWlP+sWfnr0tXSqd3nfma9Abq1NvZc4lFbHPMvxU6UhAcrBOpizsMaVT9sUK0UcMwzR8xwESdskZajtFoHA28g=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.0.0.tgz"; + sha512 = "EVyCVfSi9SKI7siVqAggQ4gsgkjzIxpUgUwh6ChNw7wQ8UykZ4gqYJjtw81VrxNqGV37yyI3Upy1u3MeusLLig=="; }; }; - "@netlify/functions-utils-1.3.28" = { + "@netlify/functions-utils-1.3.35" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.28"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.28.tgz"; - sha512 = "8swtLIVmzsokQfgr/2qZGf8C6GmrhP/okPzFZjmoDbfaHKqkkXthg0G/iY83CwRiofAuwMUkLtsrf1g3+aDiuA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.35.tgz"; + sha512 = "b607BKWwh81DDDLEW+430v0MJka71Rr5aIeEUtkWqPe6Io+ei6DjqIJJrHsBnNh0vWXeo0Stf3f1kMAA2P+fUA=="; }; }; - "@netlify/git-utils-1.0.9" = { + "@netlify/git-utils-1.0.11" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.9.tgz"; - sha512 = "qdkbEK3jRhfCbCqHAJGyQmBXxa66Kx1zwkm4dXBS8Wimv0zFGuyWWkMQomo6t2VGGoJyC+Ocy+E4ubTC13MUqA=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.11.tgz"; + sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; }; }; - "@netlify/open-api-1.3.0" = { + "@netlify/open-api-2.4.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "1.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.3.0.tgz"; - sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.4.0.tgz"; + sha512 = "ffNpGiJulY4is1pWkrs1dn3/ytNoqJxyAD/N70cnkIVNpOWMnPGSPKGBk/TBpaZhispgSBBQ+JZXEMJAGMDZ6Q=="; }; }; - "@netlify/plugin-edge-handlers-1.11.6" = { + "@netlify/plugin-edge-handlers-1.11.12" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.6"; + version = "1.11.12"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.6.tgz"; - sha512 = "7L5pkXlwPfyUrmm9cu2+nOQYW1FMx6waMbl2Uj5SmxjLz5Dvt2zkUYbNU2ImNmJ10mxziv3LABSFn2k2qy2nLw=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.12.tgz"; + sha512 = "zbQkQHho/SkTTTOsRBvVvx74IEMsLHL/FxJYhkfgMXwXTQSsq35/pRRYq6TfQyRBSlUkllDRmTOB+f2DQCvQrw=="; }; }; - "@netlify/plugins-list-2.8.0" = { + "@netlify/plugins-list-2.14.2" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.8.0"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.8.0.tgz"; - sha512 = "bjmObzm6qrZigS6ht85zgyHGTsk8dk3OspvQ3BED4VWFMDhl323WwswSJIQg2j7EdxEEOvGsM+gbh0FFWl6pqg=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.14.2.tgz"; + sha512 = "WbLQ0X1cnryXzWeV03dA3BHw0CEPDTrj3IvjbeOB45A5/dxvTgQVjAeFbmqgRj6A8GPHgSLoNN0kteoXBojHhw=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3919,67 +4009,67 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-3.7.0" = { + "@netlify/zip-it-and-ship-it-4.2.1" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "3.7.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.7.0.tgz"; - sha512 = "WPdJ8UulZxv+Niobjp49v8TO2+7V7Kks+1me4Zl4zuv09z8ZTE2/6b8bOCnB+tysTINrmTfi8ZMweB44gyLFLg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.1.tgz"; + sha512 = "IWh/VhLOH1412Mm1eBBKktV1SeSJHAiBehhdFMTrKJfFdK7vh+TylNImc/wuGCAdci85FXOWQ+YpnMOibhGvng=="; }; }; - "@node-red/editor-api-1.3.3" = { + "@node-red/editor-api-1.3.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.3.tgz"; - sha512 = "PafnnsKUYDQy+bQfk7THSCTy0zncDMvbn4HXGkavqN4nEuvm0bdvA6ZhBNa5G/WaKPt0srptl2KKCsavd3O8jA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.5.tgz"; + sha512 = "IJyfyVhEvkf2YNRPoR+1SPSi76evVV/boAKhOeVoIMBBeuYd1wM1ihMM3rnNWDYXjN/7CbTKz2DVmdMQ5aCIeQ=="; }; }; - "@node-red/editor-client-1.3.3" = { + "@node-red/editor-client-1.3.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.3.tgz"; - sha512 = "08vlp1s5yrUSidgjUg6/3sQIZ/c7r08oUNYZaN9kEgKVhYBRizet0fHBev8OWEO7nrMJAs8nQmYQGTRg4P/2uA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.5.tgz"; + sha512 = "B/JB7KuSeTHkiwzrQtCgmkUfHN5nP2htUoE4wkTt118IA/1xUWXEtl+WnT5aDLiFUyFI21q9Fl4BnDOa7JqLEw=="; }; }; - "@node-red/nodes-1.3.3" = { + "@node-red/nodes-1.3.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.3.tgz"; - sha512 = "ztCxN5ZWlUf8YkMD9NZd+izrnFVkIgv1ayzZzwCx8gsqLyGIQkzESgfKnqqU4ID8ih/r5Xs2SNl+XP9+OJEO6w=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.5.tgz"; + sha512 = "kLZOn8YDiDemJ/ufx0eagpmPPbUzLifgvoF1fHq9Jzf+K/xWtzDLHqNyLM6VSzo6QlCAnS939dU9kDb5G3fs3Q=="; }; }; - "@node-red/registry-1.3.3" = { + "@node-red/registry-1.3.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.3.tgz"; - sha512 = "JaHsvXxz9/DJ02NwlBLeUTYPGZEpRvOFR99D34YHF753bw8ocROnYAJemNTmNbua/jW4RRL0tCXuJlrOQZNSGA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.5.tgz"; + sha512 = "wy74xMnD87v/oB5P/HnUiJ6kTgdcCTgIJadeRBh0DSwcMjG3MhSxe8QCk3U9BxLH1fxw0IwxWbNgGwzuM8EOdw=="; }; }; - "@node-red/runtime-1.3.3" = { + "@node-red/runtime-1.3.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.3.tgz"; - sha512 = "+tjva7c1lI+87ho1XTS5Lj0t+OapuA+/W3hRb1zXUTNfflUrkVcMMSujMw5v+V2Z5/cMNJBRgEYj38svj9pG3w=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.5.tgz"; + sha512 = "4Cz83wX9trvhhPxFkF5HfYzqYQEcVOYf4f1lSDHP2xYowE22+x4BTCs8gZA4hCI4kbon3eyaU5NrzlrKd+nZbQ=="; }; }; - "@node-red/util-1.3.3" = { + "@node-red/util-1.3.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.3.tgz"; - sha512 = "xB76cff/HlXJcbZlOe1duqBiCoqJTHM4KKFElcSJGNVjQSeOhZgxMsuECFHCCCh8Y9TVkL96VFwWybq2fKonew=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.5.tgz"; + sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -4018,13 +4108,13 @@ let sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; - "@npmcli/arborist-2.4.0" = { + "@npmcli/arborist-2.6.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.4.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.0.tgz"; - sha512 = "rCoRrUSmXdBDBBgL/O0oehIR53ey99Pds8dId7gztARZmx6/NBoeiUOu9RnvXSe15XZLc3JSz9sHPcbQ9NQ53Q=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.1.tgz"; + sha512 = "OOlntFIOAo7RplEQaYXlA5U5NXE+EwZtnTCsit4Wtme5+llGiea6GBytuV8dOzdPMPlNx3fQQjBUE9E8k76yjQ=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4036,13 +4126,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.8" = { + "@npmcli/git-2.0.9" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.8.tgz"; - sha512 = "LPnzyBZ+1p7+JzHVwwKycMF8M3lr1ze3wxGRnxn/QxJtk++Y3prSJQrdBDGCxJyRpFsup6J3lrRBVYBhJVrM8Q=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.9.tgz"; + sha512 = "hTMbMryvOqGLwnmMBKs5usbPsJtyEsMsgXwJbmNrsEuQQh1LAIMDU77IoOrwkCg+NgQWl+ySlarJASwM3SutCA=="; }; }; "@npmcli/installed-package-contents-1.0.7" = { @@ -4189,15 +4279,6 @@ let sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw=="; }; }; - "@oclif/plugin-help-2.2.3" = { - name = "_at_oclif_slash_plugin-help"; - packageName = "@oclif/plugin-help"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.3.tgz"; - sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; - }; - }; "@oclif/plugin-help-3.2.2" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; @@ -4270,22 +4351,22 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/graphql-4.6.1" = { + "@octokit/graphql-4.6.2" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.1.tgz"; - sha512 = "2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz"; + sha512 = "WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q=="; }; }; - "@octokit/openapi-types-6.1.1" = { + "@octokit/openapi-types-7.2.3" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "6.1.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.1.1.tgz"; - sha512 = "ICBhnEb+ahi/TTdNuYb/kTyKVBgAM0VD4k6JPzlhJyzt3Z+Tq/bynwCD+gpkJP7AEcNnzC8YO5R39trmzEo2UA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.2.3.tgz"; + sha512 = "V1ycxkR19jqbIl3evf2RQiMRBvTNRi+Iy9h20G5OP5dPfEF6GJ1DPlUeiZRxo2HJxRr+UA4i0H1nn4btBDPFrw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4297,15 +4378,6 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-1.1.2" = { - name = "_at_octokit_slash_plugin-paginate-rest"; - packageName = "@octokit/plugin-paginate-rest"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz"; - sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; - }; - }; "@octokit/plugin-paginate-rest-2.13.3" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; @@ -4324,22 +4396,13 @@ let sha512 = "4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ=="; }; }; - "@octokit/plugin-rest-endpoint-methods-2.4.0" = { + "@octokit/plugin-rest-endpoint-methods-5.3.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "2.4.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz"; - sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; - }; - }; - "@octokit/plugin-rest-endpoint-methods-5.0.1" = { - name = "_at_octokit_slash_plugin-rest-endpoint-methods"; - packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz"; - sha512 = "vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.1.tgz"; + sha512 = "3B2iguGmkh6bQQaVOtCsS0gixrz8Lg0v4JuXPqBcFqLKuJtxAUf3K88RxMEf/naDOI73spD+goJ/o7Ie7Cvdjg=="; }; }; "@octokit/request-5.4.15" = { @@ -4351,15 +4414,6 @@ let sha512 = "6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag=="; }; }; - "@octokit/request-error-1.2.1" = { - name = "_at_octokit_slash_request-error"; - packageName = "@octokit/request-error"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz"; - sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; - }; - }; "@octokit/request-error-2.0.5" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; @@ -4369,40 +4423,22 @@ let sha512 = "T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg=="; }; }; - "@octokit/rest-16.43.2" = { + "@octokit/rest-18.5.5" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.43.2"; + version = "18.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz"; - sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.5.tgz"; + sha512 = "Py9sWvxBGeAwNY8UnhxP6jnq7aflvQ0uQ6gmZObyJLR9hmd5NEz9piu/A77cxV6+0l9UNACJVXX6FOnl5LIcPw=="; }; }; - "@octokit/rest-18.5.3" = { - name = "_at_octokit_slash_rest"; - packageName = "@octokit/rest"; - version = "18.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.3.tgz"; - sha512 = "KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA=="; - }; - }; - "@octokit/types-2.16.2" = { + "@octokit/types-6.16.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.16.2"; + version = "6.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz"; - sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; - }; - }; - "@octokit/types-6.13.2" = { - name = "_at_octokit_slash_types"; - packageName = "@octokit/types"; - version = "6.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.2.tgz"; - sha512 = "jN5LImYHvv7W6SZargq1UMJ3EiaqIz5qkpfsv4GAb4b16SGqctxtOU2TQAZxvsKHkOw2A4zxdsi5wR9en1/ezQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.2.tgz"; + sha512 = "wWPSynU4oLy3i4KGyk+J1BLwRKyoeW2TwRHgwbDz17WtVFzSK2GOErGliruIx8c+MaYtHSYTx36DSmLNoNbtgA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4459,310 +4495,310 @@ let sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A=="; }; }; - "@ot-builder/bin-composite-types-1.0.4" = { + "@ot-builder/bin-composite-types-1.0.7" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.4.tgz"; - sha512 = "mza6bLi18CosKPWDxbK+4BZqfzWRSVoiXmW9Z+UN/YvqRmUJD+Dc5C+t1M9KgtLAwKjsNSLPSqbPeOJwcBxQnw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.7.tgz"; + sha512 = "JGXpefpLj/FDhhTldcVbw4tXW5OBBbHalfOCiR7Af6SOdHD2Fy3gXSrkuULFS/4t8lw0byREhjCHZ3mKbOdCjw=="; }; }; - "@ot-builder/bin-util-1.0.4" = { + "@ot-builder/bin-util-1.0.7" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.4.tgz"; - sha512 = "MKlDHSyKNV8WKWLa9pL8pw1OIJ3lWO8zOjnYM/Had3RgqJMDtk98j1eYuB8VrX8Hbq3ur9NQ7Ycq+xDaGGjiyA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.7.tgz"; + sha512 = "diiALKLHQwiyQJ1hDrLdPNfZXs0GXtOm5QDYn1U/gJWewCfgWr1LVwX8+QzwgVEI/QuZi+A3G0I6qqvegPrEGg=="; }; }; - "@ot-builder/cli-help-shower-1.0.4" = { + "@ot-builder/cli-help-shower-1.0.7" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.4.tgz"; - sha512 = "Yz27agTVcxA4jblNqaiy6ULcx49c2CxIhOZdbL90d95d0ehDDiODeUuH2FlGcHE//KTUIOYGmM4KkOIE4iRVzQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.7.tgz"; + sha512 = "SsipXPTXTAWlxXVFvWd+TY01gWC/3VSp8l4Cs1p1PguzourRyWtLD6y8prQV+zvuARDJ+XLjn3Fy1RoL3PMjiA=="; }; }; - "@ot-builder/cli-proc-1.0.4" = { + "@ot-builder/cli-proc-1.0.7" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.4.tgz"; - sha512 = "6J2QTTHd4CkJqmwyooYZpAc6czWo4O+Fp+7SRGcFPrR2PdvprafxPv+vFkonnLLuRtiZguEt6LjCgkYK3oReoA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.7.tgz"; + sha512 = "cDCfKjsnu0iGrEoAR2XCoZfIjo9WXu8Xdhc3VTyBfV9tmrUpyh9t/9YCRyq6haFU69l9BzoDC3Vsl32vh27eSQ=="; }; }; - "@ot-builder/cli-shared-1.0.4" = { + "@ot-builder/cli-shared-1.0.7" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.4.tgz"; - sha512 = "tmngc7PhETp+cwMWl7Jwxg90X9ArMdFNvAt2CMg/TPnz0wGV91PQaYdOLa8Z2spRAqg6CBsKv2P85UopeypImA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.7.tgz"; + sha512 = "BPBEpZQ04KFHFMlR/xDGLYjGihwI6b22UfgQolckpySKduk328Li4dE7kUBKPpoLsWAF6Z+SMImHifrcNkOwOQ=="; }; }; - "@ot-builder/common-impl-1.0.4" = { + "@ot-builder/common-impl-1.0.7" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.4.tgz"; - sha512 = "0yxLwOblp3AsyCtov7UQhAY+brguEVy8ilfpETOlkAmLSjruhsvjqjF8u7BkaBRQ4Uf13J2/15jQcAghMXLR3g=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.7.tgz"; + sha512 = "alYW8r3tH33cK87Dnmz4TaPxOR6ViA249OZYhkdbMVKz4Dj1LBceXdpJp7NgcQbLDSIqzB+yI4/zEQEYFIg4cQ=="; }; }; - "@ot-builder/errors-1.0.4" = { + "@ot-builder/errors-1.0.7" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.4.tgz"; - sha512 = "xS7D4uP5Ri0lzcRbsfh6s3+g33zXHd/7NrQ5lg4paPksoEUmwGRooJTP+plSTLSaKQxd58d8V5SkYCXd3wf2AA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.7.tgz"; + sha512 = "iHBTQuIzgoojViqQlduL8LJhX+hUpvQZb34oV0foTBMLBUL444q9WgBoOq1YfE34eizxuEXi2tUf2wHI1Lsw0g=="; }; }; - "@ot-builder/io-bin-cff-1.0.4" = { + "@ot-builder/io-bin-cff-1.0.7" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.4.tgz"; - sha512 = "bUurjiAADRPRfzqb9eQK+AqpIfGCDFhJ+E+i+Ok29lfrkeE5RjnTu4Tsmvl7rcSJlawWLGG6ZWI4NT//TMDlEw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.7.tgz"; + sha512 = "bnI4ZTTzZkx70KjVBlMv4LrarFKV8mDGcYOY2ZreWGDg0netY9lMUNmCXvEOOx1g4SX619wf1UWx599vepsZcQ=="; }; }; - "@ot-builder/io-bin-encoding-1.0.4" = { + "@ot-builder/io-bin-encoding-1.0.7" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.4.tgz"; - sha512 = "QxrM/J3UTqHG5AtbR6VpbFeKo89Wj8jaGUUaZu0ifht81om9dfcuf/TVQ0D78eqeN7VqUXoP6uSYj4ECSo1uAg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.7.tgz"; + sha512 = "HWybHlIZfD/lsC9XjCmkq4EHNV8jv7/TBKZBC61DZuqe2P1IldKVSTg73si133/IHGP49qMyVplmF3ihq29hUQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.4" = { + "@ot-builder/io-bin-ext-private-1.0.7" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.4.tgz"; - sha512 = "c46Oa8LKEu8ULgCSYRCoToDA1LXuvb137TT6UugXJIl6JM53vMzbAQqFrMMlr5FY0RrItYumiS2YWQL8Vr9viw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.7.tgz"; + sha512 = "McugROG+MkmqDqJGIh6zHNO2s7k/gido1T4Ow/dmNQBRYUSikRLOm+eusUP7X2dV1H148fIGbIJYXjldTVwyKw=="; }; }; - "@ot-builder/io-bin-font-1.0.4" = { + "@ot-builder/io-bin-font-1.0.7" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.4.tgz"; - sha512 = "6gS5lEyAlz/DQi83roUap5buRDiublVwIqUJlvQ5qWF2hp9xQel6HoVHsdL4hfOhMBBqHBTgiM64cqeK+MV5KA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.7.tgz"; + sha512 = "gN6QQ90Kg29GQS5DW9HSk7z/BHccdZTFIPA7z2xbhb94b+r7gvkt+MGFFTpPdh+7JEFUGhKkHcv05fRh1kDOGw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.4" = { + "@ot-builder/io-bin-glyph-store-1.0.7" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.4.tgz"; - sha512 = "gAYsXuTzV9Xt87AI35tD0ZxLgF/20qgmITZXBW2fe8yR6lSzZX+zsU38w+2/6zW2UoYRyitck9Hikkw3TJ7VAw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.7.tgz"; + sha512 = "AI0/pOqaWxhvuKIk5Rm1aRVCuVDJj/F34L9t6F5fvUhkOha6+FOwkZdXaVzUF82396CdVYY7X4D6m+YOjDCQXA=="; }; }; - "@ot-builder/io-bin-layout-1.0.4" = { + "@ot-builder/io-bin-layout-1.0.7" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.4.tgz"; - sha512 = "Iscx7nHRLeQHxVdlbb7nj+xTq3gZf6dftKT3EtjCBz9KtYYSqAkEi4Wq2UEBrkrlajz+z/ivvrwmv42hqOQTYw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.7.tgz"; + sha512 = "Y0UOiIkNPlbzUcJ4yccTrgS8lwLGHlleJkntTKnMIcYbXhMYTARhiJOZYJ7RjSzZ5n01bpejzGeXYCt4YpfwNw=="; }; }; - "@ot-builder/io-bin-metadata-1.0.4" = { + "@ot-builder/io-bin-metadata-1.0.7" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.4.tgz"; - sha512 = "Hvd39Yut521rd09pI4zYQMeXTeOagiTEjDCE+3dzON6Prakb+tyA8E4M7itRY9dp+13kkLGDHF1CYZRLyAkb0g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.7.tgz"; + sha512 = "Ze5D2ngX6bSM1Rjm9/0OWUKWVEJRE69ck/aIt1b3cAkreu8p1ldsPMFSL02LcmUpUhGTUCgUzqfhyq3eDC/46Q=="; }; }; - "@ot-builder/io-bin-metric-1.0.4" = { + "@ot-builder/io-bin-metric-1.0.7" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.4.tgz"; - sha512 = "wF6EtrR1g2uJz8f/bdAWTpcaaDFpPi52QcdW7gruw5mPx53H0wWZTaDT3S4MaJGtx0hxkQjELeJt2zN9VPjiwg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.7.tgz"; + sha512 = "DILo1KPj6ZP8VOZIeXCLGXRwgzSmxwGlqjv5b36j+Z+YoOs3pUqrpGz1KK1hWR/URQvDjEXMIWI3bFsiVFgxXw=="; }; }; - "@ot-builder/io-bin-name-1.0.4" = { + "@ot-builder/io-bin-name-1.0.7" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.4.tgz"; - sha512 = "3mjxpyTVcffSiKLQqHdMwMNe9dyE/mCYexKi7LZkxLyXk/ZsYBOapZKld9jXmpF5KVXJO37FopoheTZGW44RHw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.7.tgz"; + sha512 = "NmIXTMXGJ4kP8eIKx99u620b9XSSUinZT47KKxjqtYLLuZcsmaToh/eUN7Z4XSMDKO33PeNwWlXNcDAkC82K6g=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.4" = { + "@ot-builder/io-bin-sfnt-1.0.7" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.4.tgz"; - sha512 = "/24bZ7oXS3G4nOOxxapGmvq2bQF9E5k3zybsO9ettu2632ZYkLP2s4imwzTVfHk6dpikEgzhxwXCumdbTOnZjw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.7.tgz"; + sha512 = "CtjuqqR+QjEXwo630PPtvW7RYxqfekFGqIZkYHbHI8SnBXGv70jB62itEszuJcipAqfcHBO7ndCCQU9dY/7N3g=="; }; }; - "@ot-builder/io-bin-ttf-1.0.4" = { + "@ot-builder/io-bin-ttf-1.0.7" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.4.tgz"; - sha512 = "ZtEDJYgS/Q/ag7Zw3/HbLJJtQJhgxtewmpUCXaPlIATxiZkwnmGJu4pTfzxr+ji2H/je2hBRZRPKLL9eKzyokg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.7.tgz"; + sha512 = "47ZXRatZFx4E7WeFPMOhndkWxeW5uIgUCMu6bVZTxUnw8qRIHXfl+Vgcw9SPxBEod1/9RL0koFcbWIQj5RoE6Q=="; }; }; - "@ot-builder/ot-1.0.4" = { + "@ot-builder/ot-1.0.7" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.4.tgz"; - sha512 = "xwZJ0MEv9vsx4f/88a5ZwX5bsgEg6h5WLXxoCxAZwzTnzbIS0m2WYJ8OqBhJcBK5VZ56C13exFkvIS8l5lgVkg=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.7.tgz"; + sha512 = "kHdj0NcWHx+UetLZL+aVfMMTs+tQ/jEp3p+aaWGUI77lJF7ChRWpHdZx7TxnNaoz5/C4WkthHL9pcL0dr0DuPA=="; }; }; - "@ot-builder/ot-encoding-1.0.4" = { + "@ot-builder/ot-encoding-1.0.7" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.4.tgz"; - sha512 = "7TPdtXtRaZ49j2Ho2+L54/eR728Pwvu+fvSqva8Ly7KzH1epyGm2NixgvaSqs/tRpwydnvvqp2odtCwTSzOAbA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.7.tgz"; + sha512 = "rM8bYLy+fAAqtO4lKNkpE6UdXlenJiKG7buGD/GwIcTyCLdmIh8V1iJkMm6g2EJ/CkSR9+6b+YnR38TeU2CFwA=="; }; }; - "@ot-builder/ot-ext-private-1.0.4" = { + "@ot-builder/ot-ext-private-1.0.7" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.4.tgz"; - sha512 = "eAu9kMaAGwgMxWYtl7XMpzEFlO5PLeuCxdIhR2QSG/JVSD6HpHMqxMUHM5qgP2o58PjkTUPiuEiTMvi5tMRWDg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.7.tgz"; + sha512 = "P/+ZsjPRyR2tyKrUOXdXOfY1KrmeNo0zQ78jE5LVuOzv5DfC8+rIMnZlmlCwPmUS9mk6up5AapxFaJ+6REjhPw=="; }; }; - "@ot-builder/ot-glyphs-1.0.4" = { + "@ot-builder/ot-glyphs-1.0.7" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.4.tgz"; - sha512 = "MWa871aCDPaA+2+tThDq7JdNLEeYQvO7yJOYmsKoA4pBxbGSE4PpI8FJL/NtRizShNxsjRmbYbnprm72NBiTOw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.7.tgz"; + sha512 = "JRg/9XwgyrTZOHSeA9oe11FUKC4ho4o9PZq6QtfQ2kyoRtsvHGeQNuBdJ50GOFz1AypMCowfSo6qPHly15IKnQ=="; }; }; - "@ot-builder/ot-layout-1.0.4" = { + "@ot-builder/ot-layout-1.0.7" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.4.tgz"; - sha512 = "Qxy7F/fX1fD4ZyCdPb7gFBhpeOA3d2G94HK32mlVlQPXcXOkXJOT4z0fvMraWch14a/eVr29IEDeOK/uhyYmug=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.7.tgz"; + sha512 = "vg7AIL6HtsrdRfPi8HIP3UdikG3WB9nawSb1MOd9/wCjYvln/elikzxCDVxcMaV9ojrzqQYTa53PBZFTSGaR3g=="; }; }; - "@ot-builder/ot-metadata-1.0.4" = { + "@ot-builder/ot-metadata-1.0.7" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.4.tgz"; - sha512 = "OZbrRtmSQte/OuL3pjUaIhD3Ono+W42hC7iQziLO0eP34uNeSEQNbNUNI6W3h8HuMSttbtJaLpJpDdmCPFi8sw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.7.tgz"; + sha512 = "y7p6yZ5anIrK2SpU4zLrgFZUWzYTUJzN2kvOVl7hCGLnRWLoQKmyGZ3cMF93BsuHiTRuAv2LoASrDIzup2uL2A=="; }; }; - "@ot-builder/ot-name-1.0.4" = { + "@ot-builder/ot-name-1.0.7" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.4.tgz"; - sha512 = "I4RU5F5XCCvkWHNa8uJ+bx282QVQ0n0jadAGZLcl5YIUwWkJ6Ih6kZNlkMfTsw/YMVakv3CHrCfh7GfxWMbbJA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.7.tgz"; + sha512 = "0y6hkn3v2Z6DgJwy1jjt0mXg+O6DNXbq0sZxKVN3iGvEo2dW9MVCIdDvFT3uEIeaA8Etbr7p2gMmUXh+7SWomQ=="; }; }; - "@ot-builder/ot-sfnt-1.0.4" = { + "@ot-builder/ot-sfnt-1.0.7" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.4.tgz"; - sha512 = "m8ted+UhMW2tlccQ8+N0xzlN6lmKs/NBO93/BTaaxQt7CEjJcOYAncffa0TrFPQbCoAR4hyliNrogkLK81gUgg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.7.tgz"; + sha512 = "1DZQoSqirRPHOHpUcVBOo3M3s1DefEyLYVURwNQEH9HmJkcaNNAaZpBcqW2NtqGLQ/fUVeuM3cOI3Ek+4L+QGQ=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.4" = { + "@ot-builder/ot-standard-glyph-namer-1.0.7" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.4.tgz"; - sha512 = "cyMmKxbkFaGDoj6qTjykniMDAhihyHYJGjhrkCMyiYWbV259doWl476lGANI/AyPQsDbjS4bXF8QJOUpQBM6dA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.7.tgz"; + sha512 = "9Icp+Bb6g6Su+7Q9thSiLtmzbHDU5dOlhAUFnrKmHBu13UGYXJBHoe2F6GQ7kDooSrIBvO7b3v61beY+Pi2fwg=="; }; }; - "@ot-builder/prelude-1.0.4" = { + "@ot-builder/prelude-1.0.7" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.4.tgz"; - sha512 = "3SF8Y7WP5su2bCpzCbmKJv0zh6GRSbFQTGgk6KvZYt33ruZGpHyjJnlZUhSO9LsCyzR4B72/UnQK2UoZNcaI5g=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.7.tgz"; + sha512 = "bh+7Tp847MvnwZYV7ghSJkekprxsEAPlCgGopTwBWhgk7So/8+RZK+a24VSK4qSNDCr8lNoYh9PSMO4mAR0j/Q=="; }; }; - "@ot-builder/primitive-1.0.4" = { + "@ot-builder/primitive-1.0.7" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.4.tgz"; - sha512 = "RO+s4TXioRd+BQadkyhEizu6/1sqDkbpvtwz4uLT6ncutB7QYYutCIC9N2BrArUHy6j30lWhv7mQuUjJsgzQOw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.7.tgz"; + sha512 = "rvIDdf+20reSTbZWro6RcBwmIoeLE0r8wprUWEWP/hBEzbIvfTw4cik188zBjRXKhZUsAnLUynjeqokhP51Txw=="; }; }; - "@ot-builder/rectify-1.0.4" = { + "@ot-builder/rectify-1.0.7" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.4.tgz"; - sha512 = "hHvlBACzKLDT/4bixeacWzdAXi7WbGzn/gJim0q5FhrJ6wuy6jMqcASUgfuxDu/tn4mLVL5BglKSr1xcS8C87g=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.7.tgz"; + sha512 = "RNQxUMGkcqeoYirAjJjVfUIofZzR9ZPmwD1BnQPznabCgC1cuIXCgDdYzjANh72hJeOhhN9ewVA3WM013llZRA=="; }; }; - "@ot-builder/stat-glyphs-1.0.4" = { + "@ot-builder/stat-glyphs-1.0.7" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.4.tgz"; - sha512 = "Dn6BxqpJaLC0dz73OsxEYV99zjc2hkY0FPt1u9SYgN5zWpmZeDqDLo18UOH5WsWJCd0AI6pRagSAROHA9/c1jw=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.7.tgz"; + sha512 = "KVW+RS5DJwWvrrbe2zO+p60kaYeDMlf+zN2D8JrpCr5pbVumOWtgBHMInD9HU4Qnng2DW5X1IPy4dEMyGLla6w=="; }; }; - "@ot-builder/trace-1.0.4" = { + "@ot-builder/trace-1.0.7" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.4.tgz"; - sha512 = "vQKQtK6WbaSTUbr6h18bWyOSRpynVgo6WPPmq3xv4HGWc/hv+61bOwFrNl0KHeoZCWmlATVRdiyWOr6et5zPMA=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.7.tgz"; + sha512 = "jO5Op3OHs18erCA3jv2/fmfht9jyiXYqbGtfssWC5vZuwtC4h998nj07PRh+MT4L+tsIbJfgj6WuG2K9rwSy9Q=="; }; }; - "@ot-builder/var-store-1.0.4" = { + "@ot-builder/var-store-1.0.7" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.4.tgz"; - sha512 = "EiPpjeD1SownKU9e5T0+Fja/zuTuDPP5m+bSVMTPW77ROOFJMIbUseZmoG+Y4PqF3V43Kue9WRPLl9eipnHpcg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.7.tgz"; + sha512 = "z47s+cbzRtI4coWgdVgjSX+lktYUenL0k+z+pIwKU6nI+ASpnJtgfczB7FpqvDhLw3fYV9U4K5bSAUC+z8KYmw=="; }; }; - "@ot-builder/variance-1.0.4" = { + "@ot-builder/variance-1.0.7" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.4.tgz"; - sha512 = "X4a/zUGeDq6HlVD2jln1+Eb0uWs6Jhm4nRmX5/Ny9MYSa6kImQczika3gdU2qRg8+hnf182gqsDiXueiSukflw=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.7.tgz"; + sha512 = "7yHCMLolNIlR4QsXYvNNoSAagSg8niSoXWo/43YSWlsdU6O1/osJhGOPBMA+LcDj1Gl2SLSaQfDr92e3Wk7dRQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -4855,13 +4891,13 @@ let sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; }; }; - "@primer/octicons-12.1.0" = { + "@primer/octicons-14.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "12.1.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-12.1.0.tgz"; - sha512 = "jayKLMTCx/0zh4fjYmkxdlEgQ8STwevn5S48fkvi/03asITmBkaYAMPrUgO8VNSQkSPHIEuc3oTLXgh+JwH0UQ=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-14.1.0.tgz"; + sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -4954,13 +4990,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.15.3" = { + "@putdotio/api-client-8.16.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.15.3"; + version = "8.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.3.tgz"; - sha512 = "Z1MK912OTC+InURygDElVFAbnAdA8x9in+6GSHb/8rzWmp5iDA7PjU85OCOYH8hBfAwKlWINhR372tUUnUHImg=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.16.0.tgz"; + sha512 = "9a00sd5aArb5s1R8MBsHULP3gcRsD9ivokRUCtS3oBf8M53u9XUAx/D79sehhiWbMR20DYxwUFfSoEvM/daq3Q=="; }; }; "@reach/router-1.3.4" = { @@ -5008,13 +5044,13 @@ let sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; }; }; - "@redocly/openapi-core-1.0.0-beta.44" = { + "@redocly/openapi-core-1.0.0-beta.48" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.44"; + version = "1.0.0-beta.48"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.44.tgz"; - sha512 = "9HNnh1MzvMsLK1liuidFBqWiAsZ2Yg3RY58fcEsy0QruSMdDbn7SoeI1qnXe6O+BkBS+vAP4oVzZDMHCMKGsOQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.48.tgz"; + sha512 = "rlus9qQC4Pkzz2Ljcv+jQjFdKOYSWnsYXWN6zNik9iiiQtMmGEdszsERCbSAYw/CZ5DRCAHMeKrh8f4LBCpx1A=="; }; }; "@redocly/react-dropdown-aria-2.0.11" = { @@ -5044,6 +5080,15 @@ let sha512 = "PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew=="; }; }; + "@rollup/plugin-commonjs-18.1.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "18.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-18.1.0.tgz"; + sha512 = "h3e6T9rUxVMAQswpDIobfUHn/doMzM9sgkMrsMWCFLmB84PSoC8mV8tOloAJjSRwdqhXBqstlX2BwBpHJvbhxg=="; + }; + }; "@rollup/plugin-inject-4.0.2" = { name = "_at_rollup_slash_plugin-inject"; packageName = "@rollup/plugin-inject"; @@ -5107,13 +5152,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.10" = { + "@schematics/angular-12.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.10"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.10.tgz"; - sha512 = "WcqiUl2HcE5E6HbAFKhFOUeqQEqNL++o6UsKcgk8rQkx5RM7ZkT6uksxiwhfpKzSIqUjwx+xe66fP6pweNZ/yQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.2.tgz"; + sha512 = "DMUfp7226QY2FkJeBm1xAUUKRX9umVCRhqEcku4Zaig6PylVd9LZFLjZvGKA4Vq2DkYRtClll3z5FIhAOSY3SQ=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5125,15 +5170,6 @@ let sha512 = "x77kbJL/HqR4gx0tbt35VCOGLyMvB7jD/x7eB1njhQRF8E/xynEOk3i+7A5VmK67QP5NJxU8BQKlPkJ55tBDmg=="; }; }; - "@schematics/update-0.1102.10" = { - name = "_at_schematics_slash_update"; - packageName = "@schematics/update"; - version = "0.1102.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.10.tgz"; - sha512 = "aU5fUT9ddw3n5ZOzx/x1W4Xo2fz+sDtDnrRdKI0Jip/9HE1PaoKxWT6gB5ouDnKETrvgDOArn68zIM8eOAVarg=="; - }; - }; "@segment/loosely-validate-event-2.0.0" = { name = "_at_segment_slash_loosely-validate-event"; packageName = "@segment/loosely-validate-event"; @@ -5161,13 +5197,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.9.0" = { + "@serverless/components-3.10.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.9.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.9.0.tgz"; - sha512 = "70RIPd9eW/T6vZ7y4Rn7xVBCqPlN7cPq0NRAkxlT6sa7efgSkVDb+JCtKzST2EJpz7w2V/G+eWZjIbbYw6ueMw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.10.1.tgz"; + sha512 = "Kgs9sBcsgxW4l0j8H5Bh8ROV4MmeFEiEwcj8OjFI4MyGj/nNw8dQA5ArpF2COJCgVDLwYVqnRGOCR+tEF0TlnA=="; }; }; "@serverless/core-1.1.2" = { @@ -5179,13 +5215,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.5.3" = { - name = "_at_serverless_slash_enterprise-plugin"; - packageName = "@serverless/enterprise-plugin"; - version = "4.5.3"; + "@serverless/dashboard-plugin-5.1.4" = { + name = "_at_serverless_slash_dashboard-plugin"; + packageName = "@serverless/dashboard-plugin"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.3.tgz"; - sha512 = "/JwlHoBSmxP8bAaWD3dIGePkJU1sLRHhEgvMyXuDo9i9tN5D6kyZypM2GUVNx4MpUR/XPJtCUgCSp5xI4aSsxg=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.1.4.tgz"; + sha512 = "f6uSdUSfZmUhVxLjqwYMNUYi3EShakPQwzipCpVEChcB0AKZG6mhu2NBfTFeSBASvR2l1Mq8tqVgHoTXp9yq4Q=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5206,13 +5242,13 @@ let sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg=="; }; }; - "@serverless/platform-client-china-2.1.10" = { + "@serverless/platform-client-china-2.1.13" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.10"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.10.tgz"; - sha512 = "+ckY3WfN+J4gCYKK25VnoZ20b0jVmnb/v9UKG48YTPoS6MWDud6nbAUUQuNbL5UK4dbDFKEVsnFK42XEsBjfkg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.13.tgz"; + sha512 = "kQuWjHiBeslZ1SkIFzXRoEi+CCunUEBOyJRU7Zeg5l4vV4U63G8Ax1waMXxoBILgYK5cDG0F/y+UoSAvEhJmZw=="; }; }; "@serverless/template-1.1.4" = { @@ -5242,22 +5278,31 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-china-1.0.15" = { - name = "_at_serverless_slash_utils-china"; - packageName = "@serverless/utils-china"; - version = "1.0.15"; + "@serverless/utils-5.2.0" = { + name = "_at_serverless_slash_utils"; + packageName = "@serverless/utils"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.15.tgz"; - sha512 = "+fSVqyhiITJZ/9wz7fNA6QsJ0XLq3k+UQi8iX7TQNmXdWEtjfslKv2cbnW3A19jbuG2rQ0jzwNShnuLeMuqnSw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.2.0.tgz"; + sha512 = "QXBZO0W2da0AtROpg8H1c4YWMSl56+nef0Kukd+40Q4jEaY3a0dtpVzvGps3aLFDXer3kWZ3LtlhS5HGXLficw=="; }; }; - "@sideway/address-4.1.1" = { + "@serverless/utils-china-1.1.0" = { + name = "_at_serverless_slash_utils-china"; + packageName = "@serverless/utils-china"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.0.tgz"; + sha512 = "4iul4BaS6wi8c4fhRahkxt8IDSGB9swVyK3SpVqP4LJNGJ5UtKvStxa6pMC4OMVWs0LDCaLGlfFqOgBUo3VxRQ=="; + }; + }; + "@sideway/address-4.1.2" = { name = "_at_sideway_slash_address"; packageName = "@sideway/address"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz"; - sha512 = "+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ=="; + url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz"; + sha512 = "idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA=="; }; }; "@sideway/formula-3.0.0" = { @@ -5368,13 +5413,13 @@ let sha512 = "mPZe3gBAV4ZDeYZbEs6WpNZuHHj7Hse9p44z6lrKBcbAMWnvApVOC7zZUpeQsUuWPTOWQRu/QSYElDKNajQ2oA=="; }; }; - "@skorfmann/terraform-cloud-1.10.0" = { + "@skorfmann/terraform-cloud-1.10.1" = { name = "_at_skorfmann_slash_terraform-cloud"; packageName = "@skorfmann/terraform-cloud"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.10.0.tgz"; - sha512 = "Yd5WWmmUjFYBpQpsAnAntwQMerilNRpHILNPA7x0EkwHhf+5KTSKYZwzYL/bOY1QfGJX6DTnOSHXIRStHZDUgg=="; + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.10.1.tgz"; + sha512 = "yQpxfH1VbwIcsyRQ8eN8qLJ76pZ4CQ1Ck1SmFtiKE7J790KFwC8o2r1dlTU130M/bv1eb/8gdPY1T3DLj40D8w=="; }; }; "@slack/client-3.16.0" = { @@ -5413,13 +5458,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.4.1" = { + "@snyk/code-client-3.7.0" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.4.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.1.tgz"; - sha512 = "XJ7tUdX1iQyzN/BmHac7p+Oyw1SyTcqSkCNExwBJxyQdlnUAKK6QKIWLXS81tTpZ79FgCdT+0fdS0AjsyS99eA=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.7.0.tgz"; + sha512 = "a1uGkSpO4Pr9UucZUVfUR5PVcl1fEA4sXbdZPyzs1AABE7JhMY6FnBYKgQFz2qIkPAPy4M0m18bnGpHq5ZdWNg=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5440,13 +5485,13 @@ let sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; }; }; - "@snyk/docker-registry-v2-client-1.13.9" = { + "@snyk/docker-registry-v2-client-2.1.3" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "1.13.9"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz"; - sha512 = "DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.1.3.tgz"; + sha512 = "nbWgOhHFc2GXQsweDxhulhYtLptsBxoXMSI3Py7BOt8ITgXK0HUors2+mzGbwpbvnwMAYjwhv8PLOVVVsa8PXQ=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5458,13 +5503,22 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.554.0" = { + "@snyk/fix-1.601.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.554.0"; + version = "1.601.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.554.0.tgz"; - sha512 = "q2eRVStgspPeI2wZ2EQGLpiWZMRg7o+4tsCk6m/kHZgQGDN4Bb7L3xslFW3OgF0+ZksYSaHl2cW2HmGiLRaYcA=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.601.0.tgz"; + sha512 = "0Fz0nC547Qkg0FGpmvzDIPrrXvisQN6c07JM0RReM8Xb47p1o51O/MPsWdHIFJasIT5HkshyOaV5rjGQmfwHtQ=="; + }; + }; + "@snyk/fix-pipenv-pipfile-0.3.5" = { + name = "_at_snyk_slash_fix-pipenv-pipfile"; + packageName = "@snyk/fix-pipenv-pipfile"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.3.5.tgz"; + sha512 = "Kqe9wqUrSSGB0+QFrJjCy5ub7bNg10F5I/avJK95RY/2g9cXpQnkdkTexRmVdOl+IF5z3JBXRjBnIQb6buvp6w=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -5503,22 +5557,22 @@ let sha512 = "aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q=="; }; }; - "@snyk/java-call-graph-builder-1.19.1" = { + "@snyk/java-call-graph-builder-1.21.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.19.1"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz"; - sha512 = "bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.21.0.tgz"; + sha512 = "i0c4N0+pYjpXEgqAkFniM3Q9YANvy+RtbbkQMPIvdEw41+XJISfEHzZ968ZmGWcoi480cgo5t9oxZEadFuHzyg=="; }; }; - "@snyk/java-call-graph-builder-1.20.0" = { + "@snyk/java-call-graph-builder-1.23.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.20.0"; + version = "1.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz"; - sha512 = "NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.0.tgz"; + sha512 = "Go/UV33/R0SW10nvshrs/s8GjY2mnbJaRV4Xkj4zGrwpK80lL30th6LDpXDKEdXPZ66EbYGS1Q9gGlL7GzOdeA=="; }; }; "@snyk/mix-parser-1.3.2" = { @@ -5548,13 +5602,13 @@ let sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; }; }; - "@snyk/snyk-docker-pull-3.2.3" = { + "@snyk/snyk-docker-pull-3.2.5" = { name = "_at_snyk_slash_snyk-docker-pull"; packageName = "@snyk/snyk-docker-pull"; - version = "3.2.3"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz"; - sha512 = "hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg=="; + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.5.tgz"; + sha512 = "vElzqQs894u8Tj6LluGrj97/v1jlvi0DToaU5YBlxEKGaY5IgwSUcuqEW8r4h87fPuY2h4S9/zWqKPShwipvjw=="; }; }; "@snyk/snyk-hex-plugin-1.1.4" = { @@ -5710,139 +5764,184 @@ let sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; - "@textlint/ast-node-types-4.4.2" = { + "@tencent-sdk/cls-0.2.1" = { + name = "_at_tencent-sdk_slash_cls"; + packageName = "@tencent-sdk/cls"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tencent-sdk/cls/-/cls-0.2.1.tgz"; + sha512 = "nSEPLAQyXf694XqoXi/OnWjfaJNPoo+JaPt81Kpy1QogOSZdEqEebgGj/ROs8kPjRa3kf+6+0s8MSQRtJBOOyQ=="; + }; + }; + "@tencent-sdk/common-0.1.0" = { + name = "_at_tencent-sdk_slash_common"; + packageName = "@tencent-sdk/common"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tencent-sdk/common/-/common-0.1.0.tgz"; + sha512 = "WHVGulaFv/CLwSqYC5501FCMNclu7B7nH1OminksjV2HSonIvx3o3Pms4+2/2Lse/sB5RCmPiiitV7g09b4mWw=="; + }; + }; + "@tencent-sdk/faas-0.1.5" = { + name = "_at_tencent-sdk_slash_faas"; + packageName = "@tencent-sdk/faas"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@tencent-sdk/faas/-/faas-0.1.5.tgz"; + sha512 = "6wEkJCm1rN9LOgH/BZHW6ajJpYZQuf1qwfW+tGTNkczW0RepWASznS6MCzWC9HX09oosVpg8sGCGtcgWQSP1Qg=="; + }; + }; + "@textlint/ast-node-types-12.0.0" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.4.2"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.2.tgz"; - sha512 = "m5brKbI7UY/Q8sbIZ7z1KB8ls04nRILshz5fPQ4EZ04jL19qrrUHJR8A6nK3vJ/GelkDWl4I0VDYSAjLEFQV8g=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.0.0.tgz"; + sha512 = "qUjmlpz1vR3AStBA9RPDCVT0/pGtePvBJ5Vb/0PzTrnr04iFktG6P6B1VOmgTh8J9Kl/FonQFo3A9M1Q3UH+JA=="; }; }; - "@textlint/ast-tester-2.3.4" = { + "@textlint/ast-node-types-4.4.3" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "4.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz"; + sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; + }; + }; + "@textlint/ast-tester-12.0.0" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.4.tgz"; - sha512 = "2gIsnJ1Dmr5jjF+u/vusNRqk2bJi0WwwbjP9WV/op51DhDTi7BUNjVSiZtcP9NVxidvs51XNEg+EMTRoKP3Msg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.0.0.tgz"; + sha512 = "mcAqaOJnAhay8QtDC/na5S72XPxmqGCntOwcLwuSjEmPGAIuLC3GsumLQo4nWSQ2LGnWd6CwLDZT4eBlRWetNA=="; }; }; - "@textlint/ast-traverse-2.3.4" = { + "@textlint/ast-traverse-12.0.0" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.4.tgz"; - sha512 = "NcjPXCvP8r4D2/azeQhwjPvh2+099I9RRBUrg6IpMfTW4IUUJb4BwZOPgjW+XRIVc71Dhgm82VSIagDL90FYcg=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.0.0.tgz"; + sha512 = "Mu0il8qWS9YkzVAqwmrTd+ga5S0LJVWOGjE6d9yADf5xObUDFk4g8ITlfEOiicpX5bTUxT4e1bORxPveCJ8iKQ=="; }; }; - "@textlint/feature-flag-3.3.4" = { + "@textlint/feature-flag-12.0.0" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.4.tgz"; - sha512 = "ULAqdD2y1sPAhbkaMjS2fltrZYCNQGsNDv/NQWFsCmDpQ1R8kxoUaTiXpebTM+nVuyvU5GfdkxhHyMarPIjmYw=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.0.0.tgz"; + sha512 = "xgK6tsf1Gg6xn8/X0HN4LXzSkJYgmByAvzItUPlI0dzvA4HhhT4gkBeshDCuXsHLc970nYgzy1TYHpyscu7PTw=="; }; }; - "@textlint/fixer-formatter-3.3.4" = { + "@textlint/fixer-formatter-12.0.0" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.4.tgz"; - sha512 = "H4i+N+uN7EiI5vRnfRIccFc5yekNHnO8795fiOK2TZPb6SzY3iwLOGZ2rDKvgu7ZKdyGW945w3T0elUF3Fkr5A=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.0.0.tgz"; + sha512 = "y2PWue8PANhSF9cXwksxmjDs/n9exOq4daNMhN7VvJk9yrXL+nSuAoyDXjyp09gX4Nfwa/xsOrQRTDVRbizgcw=="; }; }; - "@textlint/kernel-3.4.4" = { + "@textlint/kernel-12.0.0" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.4.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.4.tgz"; - sha512 = "ro9TPnE16C6gtKkY3aOjTs8ZfzAxdXLCV9JD4BuV5P+xBiiu9NdiE2Hwm3LyEGQjMxaKnXjbm/DTCAxA4gz0Dg=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.0.0.tgz"; + sha512 = "8UXHKhSAgn1aexPjyQE1CRVivCfSz+aFuNrktT9+JOMM3XsSd4JFcMKDhPA1utiiRR+4yDVH5be38vuuJOG9cQ=="; }; }; - "@textlint/linter-formatter-3.3.4" = { + "@textlint/linter-formatter-12.0.0" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.4.tgz"; - sha512 = "k1lyvR+w7ctwr5dWhMVRTKk19GH99BAO2dLk8ZS0ZcYyKqKAKu6Iyb1cWEg/u3dT3KFbWwoegnAelfz5828SHQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.0.0.tgz"; + sha512 = "jRRZluLCBXcP8VlA90N8DJOPy890j7rVOVSuyyFn0ypuUK88X2qH9XoEd9yYbo/HmH9ky2h+TeA8CJtOAIjU2g=="; }; }; - "@textlint/markdown-to-ast-6.3.4" = { + "@textlint/markdown-to-ast-12.0.0" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.4.tgz"; - sha512 = "LLScbDRXov1l4U4OCLJ5clu9eWNonBG+rhuArwYAHpf0hwIoNoETfAQvrNtXZG/NZ96fdWv4PLtaN6dA4ldRdQ=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.0.0.tgz"; + sha512 = "XaiuePJVDGVIwdjIiITdbdRXZDFnAFY/so3Rb8qAId/Qq9fKPUvgefMkdIG73wUC7LzhrAzH6/CuEO+f77HR5g=="; }; }; - "@textlint/module-interop-1.2.4" = { + "@textlint/module-interop-12.0.0" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.2.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.4.tgz"; - sha512 = "/wUKvDbBEujrhpcuD7Et4Mcicm3SG2oAe/tyMruLxSJ86umGxd34dEcHRON8fJzou9qyt0gFoczcypd4k3hJow=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.0.0.tgz"; + sha512 = "WSuwd3pd2xYDCYqpA6NE8FwMZS4WJ2gZmsSCXBpOh3qJ/pHbmrfEaiwOpGQJA4RfXVp8Fy5KfaAQJIr+wox98A=="; }; }; - "@textlint/source-code-fixer-3.4.4" = { + "@textlint/source-code-fixer-12.0.0" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "3.4.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.4.tgz"; - sha512 = "GDHVin2EJ9PGJ33VMGlqtPcvUlY+pkTbaWs4jWv8oBaEK8UUBzS5ZpEc4xi7Xp5vIXnVsCSLKNC6bgvR9X/AoQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.0.0.tgz"; + sha512 = "+XMJ7unzezEqKh8euWIw1QUprvv7IJzOfV0UPVbkThX2d3ZOzBmK+AzlYbqzCwZ1jkV0QYaRqaptBE+iaaQjNg=="; }; }; - "@textlint/text-to-ast-3.3.4" = { + "@textlint/text-to-ast-12.0.0" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.4.tgz"; - sha512 = "oDwGNQCAo7ROnHqaksPEogf8fxXGU3Z61C6NEv0n9vEWEkUX9oUVX4c9kh5UieZL5nN/xIdzVc3TrXywkkOK3g=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.0.0.tgz"; + sha512 = "j73hF6BiwdZurNdzHfOtP5j3v+nTWaTP7RtJf5wpfQBigT4RA+EqmKxUd/OpO+gt/Xy1NkpceLFNllZGRLEvkw=="; }; }; - "@textlint/textlint-plugin-markdown-5.3.4" = { + "@textlint/textlint-plugin-markdown-12.0.0" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.4.tgz"; - sha512 = "g8KKuwhzzlRjvKrpq3SbGc+JJMAJoy5Xp0Ibvq7QKgNVxwN/f5WtmrJc8CdgFG7++jgtkDPlofz0c9xG63xKwQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.0.0.tgz"; + sha512 = "eo9deECYMkytoiJUqDxEwzugL8sLcCFUbeCpzV5IuIRwQBh85Hds3lp/mtW1B3Q/BxcSa08im2HAa9uRdcoe4Q=="; }; }; - "@textlint/textlint-plugin-text-4.3.4" = { + "@textlint/textlint-plugin-text-12.0.0" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.3.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.4.tgz"; - sha512 = "ZtctKFR8V9mIZAMibS97xPWlt2lViizIRAy4oDaKCnxAwJ0uAjxm/OlHHdaFwNydGaEDtN60mcmarDqOOAZIiA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.0.0.tgz"; + sha512 = "brtexdqu7yvFLstYvVlotMZz5T7SwKfnFnV9Sm+uhg/d3Ddea9exzpiWWcXfRAhfOBd12mmEGM6gwAuSwzrhqg=="; }; }; - "@textlint/types-1.5.4" = { + "@textlint/types-1.5.5" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.4.tgz"; - sha512 = "bhSrOjW8AFSa/xf6lYZ2akE0j+4O/WEAA2S/R8RrjNMkA5Az2j57mxPNpqMhEeyHDkpzN/coIlqUwgYvcJHv1A=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.5.tgz"; + sha512 = "80P6fcqgsG9bP6JgR6W/E/oIx+71pplaicYCvvB4vMIeGk0OnWls4Q21kCpDYmq/C/ABtZ/Gy/Ov/8ExQPeQ7A=="; }; }; - "@textlint/utils-1.2.4" = { + "@textlint/types-12.0.0" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-12.0.0.tgz"; + sha512 = "3sB22cGtN9nPViDrW7FJxWkDrpGtyJbvNsvZqzX83HJbAiOmzzeHDkRRLvz9tax76lcdjlNk+2rHY3iSnjhEag=="; + }; + }; + "@textlint/utils-12.0.0" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.2.4"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.4.tgz"; - sha512 = "FREWc8n6bJFsKehtUlHPtbqnXULWhdnlazqWiHMjiBtcxUfD+1kY3P7PNGbChdzeZGmwBkgFQyGkok8bAGnZOw=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.0.0.tgz"; + sha512 = "bnIr17iouc4MtVR+r7v8mBasNn3ZsQpfTLTi4RelrZJdICHMBUMOWRX70cVRV/xJck/nfY9igt325qI0y2ELoQ=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5899,15 +5998,6 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; - "@types/anymatch-1.3.1" = { - name = "_at_types_slash_anymatch"; - packageName = "@types/anymatch"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; - }; - }; "@types/archiver-5.1.0" = { name = "_at_types_slash_archiver"; packageName = "@types/archiver"; @@ -5998,15 +6088,6 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/braces-3.0.0" = { - name = "_at_types_slash_braces"; - packageName = "@types/braces"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz"; - sha512 = "TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw=="; - }; - }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -6178,13 +6259,13 @@ let sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; - "@types/eslint-7.2.10" = { + "@types/eslint-7.2.12" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.10"; + version = "7.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz"; - sha512 = "kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.12.tgz"; + sha512 = "HjikV/jX6e0Pg4DcB+rtOBKSrG6w5IaxWpmi3efL/eLxMz5lZTK+W1DKERrX5a+mNzL78axfsDNXu7JHFP4uLg=="; }; }; "@types/eslint-scope-3.7.0" = { @@ -6232,6 +6313,15 @@ let sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; }; }; + "@types/expect-1.20.4" = { + name = "_at_types_slash_expect"; + packageName = "@types/expect"; + version = "1.20.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz"; + sha512 = "Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg=="; + }; + }; "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -6259,6 +6349,15 @@ let sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; }; }; + "@types/express-serve-static-core-4.17.20" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.20.tgz"; + sha512 = "8qqFN4W53IEWa9bdmuVrUcVkFemQWnt5DKPQ/oa8xKDYgtjCr2OO6NX5TIK49NLFr3mPYU2cLh92DQquC3oWWQ=="; + }; + }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -6268,13 +6367,13 @@ let sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; }; }; - "@types/fast-json-stable-stringify-2.0.0" = { + "@types/fast-json-stable-stringify-2.1.0" = { name = "_at_types_slash_fast-json-stable-stringify"; packageName = "@types/fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; + url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "IyNhGHu71jH1jCXTHmafuoAAdsbBON3kDh7u/UUhLmjYgN5TYB54e1R8ckTCiIevl2UuZaCsi9XRxineY5yUjw=="; }; }; "@types/flat-cache-2.0.0" = { @@ -6385,13 +6484,13 @@ let sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="; }; }; - "@types/http-proxy-1.17.5" = { + "@types/http-proxy-1.17.6" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; - sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.6.tgz"; + sha512 = "+qsjqR75S/ib0ig0R9WN+CDoZeOBU6F2XLewgC4KVgdXiNHiKKHFEMRHOrs5PbYE97D5vataw5wPj4KLYfUkuQ=="; }; }; "@types/inquirer-6.5.0" = { @@ -6520,13 +6619,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.13.1" = { + "@types/koa-2.13.2" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.13.1"; + version = "2.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.1.tgz"; - sha512 = "Qbno7FWom9nNqu0yHZ6A0+RWt4mrYBhw3wpBAQ3+IuzGcLlfeYkzZrnMq5wsxulN2np8M4KKeUpTodsOsSad5Q=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.2.tgz"; + sha512 = "MHKUNSaw940A8h4tRo+ccDR5SxCkT+OKq1QS5ZmvgB64hO2wsUhb5yvFa464uqTH+R/A/SzxneIfOjiQ6EpBGA=="; }; }; "@types/koa-compose-3.2.5" = { @@ -6547,13 +6646,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.168" = { + "@types/lodash-4.14.170" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.168"; + version = "4.14.170"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz"; - sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz"; + sha512 = "bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q=="; }; }; "@types/lodash.chunk-4.2.6" = { @@ -6610,15 +6709,6 @@ let sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; }; }; - "@types/micromatch-4.0.1" = { - name = "_at_types_slash_micromatch"; - packageName = "@types/micromatch"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz"; - sha512 = "my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw=="; - }; - }; "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -6709,6 +6799,15 @@ let sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; }; }; + "@types/multimatch-4.0.0" = { + name = "_at_types_slash_multimatch"; + packageName = "@types/multimatch"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/multimatch/-/multimatch-4.0.0.tgz"; + sha512 = "xS26gtqY5QASmfU/6jb5vj7F0D0SctgRGtwXsKSNng1knk/OewjISlkMwGonkMCbZCqSoW3s6nL0sAtTlzbL/g=="; + }; + }; "@types/mysql-2.15.15" = { name = "_at_types_slash_mysql"; packageName = "@types/mysql"; @@ -6727,13 +6826,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.58" = { + "@types/node-10.17.60" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.58"; + version = "10.17.60"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.58.tgz"; - sha512 = "Dn5RBxLohjdHFj17dVVw3rtrZAeXeWg+LQfvxDIW/fdPkSiuQk7h3frKMYtsQhtIW42wkErDcy9UMVxhGW4O7w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz"; + sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; "@types/node-12.12.70" = { @@ -6745,13 +6844,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-13.13.50" = { + "@types/node-13.13.52" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.50"; + version = "13.13.52"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.50.tgz"; - sha512 = "y7kkh+hX/0jZNxMyBR/6asG0QMSaPSzgeVK63dhWHl4QAXCQB8lExXmzLL6SzmOgKHydtawpMnNhlDbv7DXPEA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz"; + sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; }; }; "@types/node-14.11.1" = { @@ -6781,13 +6880,31 @@ let sha512 = "XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="; }; }; - "@types/node-14.14.41" = { + "@types/node-14.17.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.41"; + version = "14.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; - sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz"; + sha512 = "/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="; + }; + }; + "@types/node-15.0.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.0.3.tgz"; + sha512 = "/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ=="; + }; + }; + "@types/node-15.6.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz"; + sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; "@types/node-6.14.13" = { @@ -6826,24 +6943,6 @@ let sha512 = "IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ=="; }; }; - "@types/node-fetch-2.5.7" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz"; - sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; - }; - }; - "@types/node-fetch-2.5.8" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz"; - sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw=="; - }; - }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -6925,13 +7024,13 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/readable-stream-2.3.9" = { + "@types/readable-stream-2.3.10" = { name = "_at_types_slash_readable-stream"; packageName = "@types/readable-stream"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.9.tgz"; - sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw=="; + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.10.tgz"; + sha512 = "xwSXvAv9x4B9Vj88AMZnFyEVLilz1EBxKvRUhGqIF4nJpRQBSTm7jS236X4Y9Y2qPsVvaMxwrGJlNhLHEahlFQ=="; }; }; "@types/request-2.48.5" = { @@ -7015,13 +7114,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/semver-7.3.4" = { + "@types/semver-7.3.6" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.3.4"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz"; - sha512 = "+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.6.tgz"; + sha512 = "0caWDWmpCp0uifxFh+FaqK3CuZ2SkRR/ZRxAV5+zNdC3QVUi6wyOJnefhPvtNt8NQWXB5OA93BUvZsXpWat2Xw=="; }; }; "@types/serve-static-1.13.9" = { @@ -7033,13 +7132,13 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@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=="; }; }; "@types/socket.io-2.1.11" = { @@ -7186,22 +7285,31 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.55.0" = { - name = "_at_types_slash_vscode"; - packageName = "@types/vscode"; - version = "1.55.0"; + "@types/vinyl-2.0.4" = { + name = "_at_types_slash_vinyl"; + packageName = "@types/vinyl"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.55.0.tgz"; - sha512 = "49hysH7jneTQoSC8TWbAi7nKK9Lc5osQNjmDHVosrcU8o3jecD9GrK0Qyul8q4aGPSXRfNGqIp9CBdb13akETg=="; + url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.4.tgz"; + sha512 = "2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ=="; }; }; - "@types/webpack-4.41.27" = { + "@types/vscode-1.56.0" = { + name = "_at_types_slash_vscode"; + packageName = "@types/vscode"; + version = "1.56.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz"; + sha512 = "Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ=="; + }; + }; + "@types/webpack-4.41.29" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.27"; + version = "4.41.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz"; - sha512 = "wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.29.tgz"; + sha512 = "6pLaORaVNZxiB3FSHbyBiWM7QdazAWda1zvAq4SbZObZqHSDbWLi62iFdblVea6SK9eyBIVp5yHhKt/yNQdR7Q=="; }; }; "@types/webpack-sources-2.1.0" = { @@ -7240,6 +7348,15 @@ let sha512 = "ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q=="; }; }; + "@types/ws-7.4.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.4.tgz"; + sha512 = "d/7W23JAXPodQNbOZNXvl2K+bqAQrCMwlh/nuQsPSQk6Fq0opHoPrUw43aHsvSbIiQPr8Of2hkFbnz1XBFVyZQ=="; + }; + }; "@types/yargs-13.0.11" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -7285,13 +7402,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.22.0" = { + "@typescript-eslint/eslint-plugin-4.25.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz"; - sha512 = "U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.25.0.tgz"; + sha512 = "Qfs3dWkTMKkKwt78xp2O/KZQB8MPS1UQ5D3YW2s6LQWBE1074BE+Rym+b1pXZIX3M3fSvPUDaCvZLKV2ylVYYQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7303,13 +7420,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.22.0" = { + "@typescript-eslint/experimental-utils-4.25.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz"; - sha512 = "xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.25.0.tgz"; + sha512 = "f0doRE76vq7NEEU0tw+ajv6CrmPelw5wLoaghEHkA2dNLFb3T/zJQqGPQ0OYt5XlZaS13MtnN+GTPCuUVg338w=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7321,22 +7438,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.22.0" = { + "@typescript-eslint/parser-4.25.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz"; - sha512 = "z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.25.0.tgz"; + sha512 = "OZFa1SKyEJpAhDx8FcbWyX+vLwh7OEtzoo2iQaeWwxucyfbi0mT4DijbOSsTgPKzGHr6GrF2V5p/CEpUH/VBxg=="; }; }; - "@typescript-eslint/scope-manager-4.22.0" = { + "@typescript-eslint/scope-manager-4.25.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz"; - sha512 = "OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.25.0.tgz"; + sha512 = "2NElKxMb/0rya+NJG1U71BuNnp1TBd1JgzYsldsdA83h/20Tvnf/HrwhiSlNmuq6Vqa0EzidsvkTArwoq+tH6w=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7348,13 +7465,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.22.0" = { + "@typescript-eslint/types-4.25.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz"; - sha512 = "sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.25.0.tgz"; + sha512 = "+CNINNvl00OkW6wEsi32wU5MhHti2J25TJsJJqgQmJu3B3dYDBcmOxcE5w9cgoM13TrdE/5ND2HoEnBohasxRQ=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -7375,13 +7492,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.22.0" = { + "@typescript-eslint/typescript-estree-4.25.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz"; - sha512 = "TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.25.0.tgz"; + sha512 = "1B8U07TGNAFMxZbSpF6jqiDs1cVGO0izVkf18Q/SPcUAc9LhHxzvSowXDTvkHMWUVuPpagupaW63gB6ahTXVlg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7393,13 +7510,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.22.0" = { + "@typescript-eslint/visitor-keys-4.25.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.22.0"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz"; - sha512 = "nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.25.0.tgz"; + sha512 = "AmkqV9dDJVKP/TcZrbf6s6i1zYXt5Hl8qOLrRDTFfRNae4+LB8A4N3i+FLZPW85zIxRy39BgeWOfMS3HoH5ngg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7501,40 +7618,40 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vue/cli-shared-utils-4.5.12" = { + "@vue/cli-shared-utils-4.5.13" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.12.tgz"; - sha512 = "qnIQPJ4XckMoqYh9fJ0Y91QKMIb4Hiibrm9+k4E15QHpk5RaokuOpf10SsOr2NLPCXSWsHOLo3hduZSwHPGY/Q=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.13.tgz"; + sha512 = "HpnOrkLg42RFUsQGMJv26oTG3J3FmKtO2WSRhKIIL+1ok3w9OjGCtA3nMMXN27f9eX14TqO64M36DaiSZ1fSiw=="; }; }; - "@vue/cli-ui-4.5.12" = { + "@vue/cli-ui-4.5.13" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.12.tgz"; - sha512 = "TeP4ujkrUF3/l92R7fAIl6SbTyEw5CbrMpQggctgKrtOtMWorSGhWm17vGtP0C3PoZqzniOzDC7cdO83PL4n+g=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.13.tgz"; + sha512 = "kXsmK+KAX9A2ribCJ+JuFcJ9ICEKluWuFtJEwUMOvo85O/l5UNupA7XoCrXeHoItdVtw32hAOv+bEV+KmyPyuQ=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.12" = { + "@vue/cli-ui-addon-webpack-4.5.13" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.12.tgz"; - sha512 = "sPAElJL00koP6BxUSGj5wntH96+IBuhLpu+0YPUYpIMeT/e/Hip/HnsjBzeiv88CvGQKomsjykPQRi26kR/Tjw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.13.tgz"; + sha512 = "mtk174vPRza0aMqMvx80U/BBmprlOq8ngHr5v3+MYIC1tqzB7co5fCJvyGI/QJ4DjO6O0MaaTGBsxOp/YsqRaQ=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.12" = { + "@vue/cli-ui-addon-widgets-4.5.13" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.12.tgz"; - sha512 = "GIh+ETKezlmEWmZ/MxKuuJqdfSgYk8DlnIsMnNpbUcdxhHZFbkV2mv/0UoQaH2y0BQhBXBOt9TBJ9j4OeN3DwA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.13.tgz"; + sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; "@vue/compiler-core-3.0.11" = { @@ -8059,31 +8176,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.2" = { + "@webpack-cli/configtest-1.0.3" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz"; - sha512 = "3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; + sha512 = "WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw=="; }; }; - "@webpack-cli/info-1.2.3" = { + "@webpack-cli/info-1.2.4" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz"; - sha512 = "lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz"; + sha512 = "ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g=="; }; }; - "@webpack-cli/serve-1.3.1" = { + "@webpack-cli/serve-1.4.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz"; - sha512 = "0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz"; + sha512 = "xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg=="; }; }; "@wry/equality-0.1.11" = { @@ -8293,15 +8410,6 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "abortcontroller-polyfill-1.7.1" = { - name = "abortcontroller-polyfill"; - packageName = "abortcontroller-polyfill"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz"; - sha512 = "yml9NiDEH4M4p0G4AcPkg8AAa4mF3nfYF28VQxaokpO67j9H7gWgmsVWJ/f1Rn+PzsnDYvzJzWIQzCqDKRvWlA=="; - }; - }; "absolute-0.0.1" = { name = "absolute"; packageName = "absolute"; @@ -8428,13 +8536,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.2.1" = { + "acorn-8.2.4" = { name = "acorn"; packageName = "acorn"; - version = "8.2.1"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.2.1.tgz"; - sha512 = "z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz"; + sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="; }; }; "acorn-globals-1.0.9" = { @@ -8635,13 +8743,13 @@ let sha1 = "09c5cddd8d503b9fe5f76e0b8dc5c70a8f193e34"; }; }; - "adverb-where-0.2.2" = { + "adverb-where-0.2.5" = { name = "adverb-where"; packageName = "adverb-where"; - version = "0.2.2"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.2.2.tgz"; - sha512 = "hZPUFSgljaJnzQQXqc4GCEVSxmyhBkLgf/DyeW7F068PdRE9PervS4LmftJWWSPfTpaEhpJebx3eP7D9slBjSw=="; + url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.2.5.tgz"; + sha512 = "JiQe2U1UR8l10jPrXv/PmlDhOLZpsxqjvTp+k6Dm5wYDUULdMZytDRmovkXU8X6V9o0sg0FBdetv3VXHAZZK5Q=="; }; }; "after-0.8.1" = { @@ -8707,6 +8815,15 @@ let sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; + "aglfn-1.0.2" = { + name = "aglfn"; + packageName = "aglfn"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; + sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; + }; + }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -8779,22 +8896,22 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.2.4" = { + "ajv-8.2.0" = { name = "ajv"; packageName = "ajv"; - version = "7.2.4"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz"; - sha512 = "nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz"; + sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; }; }; - "ajv-8.1.0" = { + "ajv-8.5.0" = { name = "ajv"; packageName = "ajv"; - version = "8.1.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz"; - sha512 = "B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz"; + sha512 = "Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ=="; }; }; "ajv-errors-1.0.1" = { @@ -8806,13 +8923,22 @@ let sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; - "ajv-formats-1.6.1" = { + "ajv-formats-2.0.2" = { name = "ajv-formats"; packageName = "ajv-formats"; - version = "1.6.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.6.1.tgz"; - sha512 = "4CjkH20If1lhR5CGtqkrVg3bbOtFEG80X9v6jDOIUhbzzbB+UzPBGy8GQhUNVZ0yvMHdMpawCOcy5ydGMsagGQ=="; + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz"; + sha512 = "Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw=="; + }; + }; + "ajv-formats-2.1.0" = { + name = "ajv-formats"; + packageName = "ajv-formats"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz"; + sha512 = "USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q=="; }; }; "ajv-keywords-1.5.1" = { @@ -9211,13 +9337,13 @@ let sha1 = "fd753efa4beada0eac99981bc52a3f6ff019deb7"; }; }; - "ansi-to-html-0.6.14" = { + "ansi-to-html-0.6.15" = { name = "ansi-to-html"; packageName = "ansi-to-html"; - version = "0.6.14"; + version = "0.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.14.tgz"; - sha512 = "7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA=="; + url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.15.tgz"; + sha512 = "28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ=="; }; }; "ansi-wrap-0.1.0" = { @@ -9328,49 +9454,31 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-cache-control-0.12.0" = { + "apollo-cache-control-0.14.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.12.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.12.0.tgz"; - sha512 = "kClF5rfAm159Nboul1LxA+l58Tjz0M8L1GUknEMpZt0UHhILLAn3BfcG3ToX4TbNoR9M57kKMUcbPWLdy3Up7w=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz"; + sha512 = "qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w=="; }; }; - "apollo-datasource-0.8.0" = { + "apollo-datasource-0.9.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.8.0.tgz"; - sha512 = "gXgsGVLuejLc138z/2jUjPAzadDQxWbcLJyBgaQsg5BaXJNkv5uW/NjiSPk00cK51hyZrb0Xx8a+L+wPk2qIBA=="; - }; - }; - "apollo-env-0.6.6" = { - name = "apollo-env"; - packageName = "apollo-env"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.6.tgz"; - sha512 = "hXI9PjJtzmD34XviBU+4sPMOxnifYrHVmxpjykqI/dUD2G3yTiuRaiQqwRwB2RCdwC1Ug/jBfoQ/NHDTnnjndQ=="; - }; - }; - "apollo-env-0.9.0" = { - name = "apollo-env"; - packageName = "apollo-env"; version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.9.0.tgz"; - sha512 = "oMSaFiCYEULXTv1sLhuPpAg0SykJNzEu5QWvCw0844yq14MyETXFERmAYD9b8nNjQLAdpjbbkBGKTWcw5wgd5Q=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.9.0.tgz"; + sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; }; }; - "apollo-graphql-0.6.1" = { + "apollo-graphql-0.9.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.6.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.1.tgz"; - sha512 = "ZRXAV+k+hboCVS+FW86FW/QgnDR7gm/xMUwJPGXEbV53OLGuQQdIT0NCYK7AzzVkCfsbb7NJ3mmEclkZY9uuxQ=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.3.tgz"; + sha512 = "rcAl2E841Iko4kSzj4Pt3PRBitmyq1MvoEmpl04TQSpGnoVgl1E/ZXuLBYxMTSnEAm7umn2IsoY+c6Ll9U/10A=="; }; }; "apollo-link-1.2.1" = { @@ -9391,40 +9499,40 @@ let sha512 = "p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg=="; }; }; - "apollo-reporting-protobuf-0.6.2" = { + "apollo-reporting-protobuf-0.8.0" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "0.6.2"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz"; - sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz"; + sha512 = "B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg=="; }; }; - "apollo-server-caching-0.6.0" = { + "apollo-server-caching-0.7.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.6.0.tgz"; - sha512 = "SfjKaccrhRzUQ8TAke9FrYppp4pZV3Rp8KCs+4Ox3kGtbco68acRPJkiYYtSVc4idR8XNAUOOVfAEZVNHdZQKQ=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz"; + sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-core-2.23.0" = { + "apollo-server-core-2.25.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.23.0"; + version = "2.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.23.0.tgz"; - sha512 = "3/a4LPgRADc8CdT/nRh7W0CAqQv3Q4DJvakWQgKqGSqDEb/0u4IBynYjlQKuPBi4wwKdeK2Hb1wiQLl+zu4StQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.0.tgz"; + sha512 = "LqDmY+R5dcb6zj/RgM7P8NnURV2XdQFIF4rY7g80hD9mc2WSCKHF6eH+lHG0sFPW7f8iBr+lJ4LyETuWEVF0hg=="; }; }; - "apollo-server-env-3.0.0" = { + "apollo-server-env-3.1.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz"; - sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.1.0.tgz"; + sha512 = "iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ=="; }; }; "apollo-server-errors-2.5.0" = { @@ -9436,40 +9544,40 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-express-2.23.0" = { + "apollo-server-express-2.25.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.23.0"; + version = "2.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.23.0.tgz"; - sha512 = "tzil7c51ODH0rT1Bc5VMksdWzHrYGavdLtnDz4M0ePiTm18Gc81HD7X/4DPczorerEpfwwkf2YlADtPQfRSxlw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.0.tgz"; + sha512 = "FCTisD+VB1LCcTjjhKvQZ/dkly83KVlioFMgcPjW1X/kzCznRT3aQoVn9bQHlzQr7NnpwFseb4Rhd2KKD4wKEA=="; }; }; - "apollo-server-plugin-base-0.11.0" = { + "apollo-server-plugin-base-0.13.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.11.0.tgz"; - sha512 = "Du68x0XCyQ6EWlgoL9Z+1s8fJfXgY131QbKP7ao617StQPzwB0aGCwxBDfcMt1A75VXf4TkvV1rdUH5YeJFlhQ=="; - }; - }; - "apollo-server-types-0.7.0" = { - name = "apollo-server-types"; - packageName = "apollo-server-types"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.7.0.tgz"; - sha512 = "pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA=="; - }; - }; - "apollo-tracing-0.13.0" = { - name = "apollo-tracing"; - packageName = "apollo-tracing"; version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.13.0.tgz"; - sha512 = "28z4T+XfLQ6t696usU0nTFDxVN8BfF3o74d2p/zsT4eu1OuoyoDOEmVJqdInmVRpyTJK0tDEOjkIuDJJHZftog=="; + 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=="; + }; + }; + "apollo-server-types-0.9.0" = { + name = "apollo-server-types"; + packageName = "apollo-server-types"; + version = "0.9.0"; + 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" = { @@ -9589,15 +9697,6 @@ let sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="; }; }; - "archiver-4.0.2" = { - name = "archiver"; - packageName = "archiver"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-4.0.2.tgz"; - sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; - }; - }; "archiver-5.3.0" = { name = "archiver"; packageName = "archiver"; @@ -9679,15 +9778,6 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "aria-query-4.2.2" = { - name = "aria-query"; - packageName = "aria-query"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"; - sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA=="; - }; - }; "aribts-1.3.5" = { name = "aribts"; packageName = "aribts"; @@ -9850,15 +9940,6 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; - "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-find-0.1.1" = { name = "array-find"; packageName = "array-find"; @@ -10102,24 +10183,6 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; - "array.prototype.flat-1.2.4" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; - sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="; - }; - }; - "array.prototype.flatmap-1.2.4" = { - name = "array.prototype.flatmap"; - packageName = "array.prototype.flatmap"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; - }; - }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -10390,15 +10453,6 @@ let sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; - "ast-types-flow-0.0.7" = { - name = "ast-types-flow"; - packageName = "ast-types-flow"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; - sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; - }; - }; "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -10561,13 +10615,13 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-lock-1.2.8" = { + "async-lock-1.3.0" = { name = "async-lock"; packageName = "async-lock"; - version = "1.2.8"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.8.tgz"; - sha512 = "G+26B2jc0Gw0EG/WN2M6IczuGepBsfR1+DtqLnyFSH4p2C668qkOCtEkGNVEaaNAVlYwEMazy1+/jnLxltBkIQ=="; + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz"; + sha512 = "8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="; }; }; "async-mutex-0.1.4" = { @@ -10696,15 +10750,6 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "atob-lite-2.0.0" = { - name = "atob-lite"; - packageName = "atob-lite"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz"; - sha1 = "0fef5ad46f1bd7a8502c65727f0367d5ee43d696"; - }; - }; "atomic-batcher-1.0.2" = { name = "atomic-batcher"; packageName = "atomic-batcher"; @@ -10732,13 +10777,13 @@ let sha512 = "Eh6pW+fRC2/1RxPq3hO8+PkZKv+wujzKky2MP/n69eC8yMkbNFfuEb/riZHqf13M7gr6Hvglpk/kISgBSBb6bQ=="; }; }; - "atomic-file-rw-0.2.1" = { + "atomic-file-rw-0.2.2" = { name = "atomic-file-rw"; packageName = "atomic-file-rw"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.2.1.tgz"; - sha512 = "73oEZ7tkhd/7QjvsNts9saHY9BYJQWD4izzI/bKJmwVl/BGT7J6wBFUC5qxNlQZlFORguqfsTQwvJA1lm3RoFw=="; + url = "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.2.2.tgz"; + sha512 = "XZOcMIc32aIDxKFJGpYIPZ7H0p+Zmu3xAYyKDMmRgSQMNR97E8byl4tQa9vkYv4x8dNcYRQV8tw+KvtiKua0xQ=="; }; }; "atomic-sleep-1.0.0" = { @@ -10813,13 +10858,13 @@ let sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; }; }; - "available-typed-arrays-1.0.2" = { + "available-typed-arrays-1.0.4" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz"; - sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ=="; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz"; + sha512 = "SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="; }; }; "await-semaphore-0.1.3" = { @@ -10849,13 +10894,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.892.0" = { + "aws-sdk-2.918.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.892.0"; + version = "2.918.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.892.0.tgz"; - sha512 = "OOXJ15AnJJMHZYXJQVy22Wjnp5GrZCfvCxmoZuXdsLNs8M+BL4mfBqma82+UkM2NhJgLYuAhDfvFUBob6VGIWw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.918.0.tgz"; + sha512 = "ZjWanOA1Zo664EyWLCnbUlkwCjoRPmSIMx529W4gk1418qo3oCEcvUy1HeibGGIClYnZZ7J4FMQvVDm2+JtHLQ=="; }; }; "aws-sign2-0.6.0" = { @@ -10894,15 +10939,6 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; - "axe-core-4.1.4" = { - name = "axe-core"; - packageName = "axe-core"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.1.4.tgz"; - sha512 = "Pdgfv6iP0gNx9ejRGa3zE7Xgkj/iclXqLfe7BnatdZz0QnLZ3jrRHUVH8wNSdN68w05Sk3ShGTb3ydktMTooig=="; - }; - }; "axios-0.19.2" = { name = "axios"; packageName = "axios"; @@ -10930,22 +10966,13 @@ let sha512 = "NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA=="; }; }; - "axobject-query-2.2.0" = { - name = "axobject-query"; - packageName = "axobject-query"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"; - sha512 = "Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="; - }; - }; - "azure-devops-node-api-7.2.0" = { + "azure-devops-node-api-10.2.2" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; - version = "7.2.0"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz"; - sha512 = "pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w=="; + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz"; + sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; "b24.js-1.0.3" = { @@ -10984,6 +11011,15 @@ let sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; + "babel-eslint-10.1.0" = { + name = "babel-eslint"; + packageName = "babel-eslint"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; + }; + }; "babel-extract-comments-1.0.0" = { name = "babel-extract-comments"; packageName = "babel-extract-comments"; @@ -11218,31 +11254,31 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; - "babel-plugin-polyfill-corejs2-0.2.0" = { + "babel-plugin-polyfill-corejs2-0.2.2" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; - sha512 = "9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"; + sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; }; }; - "babel-plugin-polyfill-corejs3-0.2.0" = { + "babel-plugin-polyfill-corejs3-0.2.2" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; - sha512 = "zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz"; + sha512 = "l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A=="; }; }; - "babel-plugin-polyfill-regenerator-0.2.0" = { + "babel-plugin-polyfill-regenerator-0.2.2" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; - sha512 = "J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"; + sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; "babel-plugin-styled-components-1.12.0" = { @@ -11443,13 +11479,13 @@ let sha512 = "5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w=="; }; }; - "babel-preset-fbjs-3.3.0" = { + "babel-preset-fbjs-3.4.0" = { name = "babel-preset-fbjs"; packageName = "babel-preset-fbjs"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz"; - sha512 = "7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw=="; + url = "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz"; + sha512 = "9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow=="; }; }; "babel-preset-jest-25.5.0" = { @@ -12064,15 +12100,6 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.36" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.36"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz"; - sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; - }; - }; "big-integer-1.6.48" = { name = "big-integer"; packageName = "big-integer"; @@ -12856,13 +12883,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.0.3" = { + "boolean-3.0.4" = { name = "boolean"; packageName = "boolean"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.0.3.tgz"; - sha512 = "EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.0.4.tgz"; + sha512 = "5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA=="; }; }; "boom-2.10.1" = { @@ -12910,6 +12937,15 @@ let sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; }; }; + "bottleneck-2.19.5" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "2.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz"; + sha512 = "VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="; + }; + }; "boundary-1.0.1" = { name = "boundary"; packageName = "boundary"; @@ -13297,13 +13333,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.5" = { + "browserslist-4.16.6" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.5"; + version = "4.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz"; - sha512 = "C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; + sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; }; }; "brq-0.1.8" = { @@ -13936,13 +13972,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.6" = { + "cacache-15.2.0" = { name = "cacache"; packageName = "cacache"; - version = "15.0.6"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz"; - sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz"; + sha512 = "uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw=="; }; }; "cache-base-1.0.1" = { @@ -14251,22 +14287,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001214" = { + "caniuse-lite-1.0.30001230" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001214"; + version = "1.0.30001230"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz"; - sha512 = "O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; + sha512 = "5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="; }; }; - "canvas-2.7.0" = { + "canvas-2.8.0" = { name = "canvas"; packageName = "canvas"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/canvas/-/canvas-2.7.0.tgz"; - sha512 = "pzCxtkHb+5su5MQjTtepMDlIOtaXo277x0C0u3nMOxtkhTyQ+h2yNKhlROAaDllWgRyePAUitC08sXw26Eb6aw=="; + url = "https://registry.npmjs.org/canvas/-/canvas-2.8.0.tgz"; + sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q=="; }; }; "caporal-1.4.0" = { @@ -14359,13 +14395,13 @@ let sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; }; }; - "catharsis-0.8.11" = { + "catharsis-0.9.0" = { name = "catharsis"; packageName = "catharsis"; - version = "0.8.11"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz"; - sha512 = "a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g=="; + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz"; + sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; }; }; "caw-2.0.1" = { @@ -14413,13 +14449,13 @@ let sha512 = "G6SIJSg6mxeEzWEWNY8NAn/jqysTPegV79mOQ6eYj1uyKYggyzP5MzuWt8fKmYShM5BTDadnCRajwDnku9LZeQ=="; }; }; - "cdktf-0.3.0" = { + "cdktf-0.4.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.3.0.tgz"; - sha512 = "+Nk6eKVMjcnIlu5KPZ02vo2VuD1B+wFydGS00BvvpwDjymhNnMTc5ADjPtGhwpi067i30j/HCFRHDKG04dgVbg=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.0.tgz"; + sha512 = "P6KRqGokkAVRZdT2+fXfEdQszpOXrJa/EuNZr0WPcIrfTVfjL6HNrHyuP1HWUvJRzlcbG5ZZ3+8Uk4oFS9IXvA=="; }; }; "center-align-0.1.3" = { @@ -14782,6 +14818,15 @@ let sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; }; }; + "cheerio-1.0.0-rc.9" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.9.tgz"; + sha512 = "QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng=="; + }; + }; "cheerio-select-1.4.0" = { name = "cheerio-select"; packageName = "cheerio-select"; @@ -14818,6 +14863,15 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; + "child_process-1.0.2" = { + name = "child_process"; + packageName = "child_process"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz"; + sha1 = "b1f7e7fc73d25e7fd1d455adc94e143830182b5a"; + }; + }; "chloride-2.4.1" = { name = "chloride"; packageName = "chloride"; @@ -14908,13 +14962,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chroma-js-2.1.1" = { + "chroma-js-2.1.2" = { name = "chroma-js"; packageName = "chroma-js"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.1.tgz"; - sha512 = "gYc5/Dooshun2OikK7oY/hYnoEiZ0dxqRpXosEdYRYm505vU5mRsHFqIW062C9nMtr32DVErP6mlxuepo2kNkw=="; + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.2.tgz"; + sha512 = "ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ=="; }; }; "chrome-dgram-3.0.6" = { @@ -15034,13 +15088,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.1.1" = { + "ci-info-3.2.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.1.1"; + version = "3.2.0"; 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.2.0.tgz"; + sha512 = "dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="; }; }; "cint-8.2.1" = { @@ -15907,13 +15961,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.29.0" = { + "codemaker-1.30.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.29.0.tgz"; - sha512 = "dNUTiOhxNYB7MV75bLLCie1gr0SUh6wEOPc5OyZob4mLj51OETYIeRYILEiz39QVKLRx6YSbKoCY/S4PqQ0PNQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.30.0.tgz"; + sha512 = "yntR55JhhVlZTfR4CPV6IrCULovPDrk3z0yQR7/ygEtNxEOQrHhX17djJ0rVmIwCJUawv+ODTJ1ipJY9CbxJQw=="; }; }; "codepage-1.4.0" = { @@ -16627,15 +16681,6 @@ let sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q=="; }; }; - "compress-commons-3.0.0" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-3.0.0.tgz"; - sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; - }; - }; "compress-commons-4.1.0" = { name = "compress-commons"; packageName = "compress-commons"; @@ -16708,13 +16753,13 @@ let sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; }; }; - "concordance-4.0.0" = { + "concordance-5.0.4" = { name = "concordance"; packageName = "concordance"; - version = "4.0.0"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/concordance/-/concordance-4.0.0.tgz"; - sha512 = "l0RFuB8RLfCS0Pt2Id39/oCPykE01pyxgAFypWTlaGRgvLkZrtczZ8atEHpTeEIW+zYWXTBuA9cCSeEOScxReQ=="; + url = "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz"; + sha512 = "OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw=="; }; }; "conf-1.4.0" = { @@ -16726,6 +16771,15 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; + "conf-10.0.1" = { + name = "conf"; + packageName = "conf"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-10.0.1.tgz"; + sha512 = "QClEoNcruwBL84QgMEPHibL3ERxWIrRKhbjJKG1VsFBadm5QpS0jsu4QjY/maxUvhyAKXeyrs+ws+lC6PajnEg=="; + }; + }; "conf-6.2.4" = { name = "conf"; packageName = "conf"; @@ -16744,15 +16798,6 @@ let sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg=="; }; }; - "conf-9.0.2" = { - name = "conf"; - packageName = "conf"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz"; - sha512 = "rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw=="; - }; - }; "config-1.31.0" = { name = "config"; packageName = "config"; @@ -17005,15 +17050,6 @@ let sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0"; }; }; - "contains-path-0.1.0" = { - name = "contains-path"; - packageName = "contains-path"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -17060,22 +17096,22 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.17.1" = { + "contentful-management-7.22.4" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.17.1"; + version = "7.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.17.1.tgz"; - sha512 = "t2stBJNvvY347d84GuNoHxPvPMGKQHAIC/2CwEL0y47yas+30A4jkbTugqermgZS2l52gnasjo6xBTE27Rqb0w=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.22.4.tgz"; + sha512 = "nwFWfaaIQGveN9bAEZ6IpQjWeZlDgse1SXvgdR/D3mxTUYqDlyQv1sIqst+tcgd09zF4TuEKgF0e6Xmc0X1XhQ=="; }; }; - "contentful-sdk-core-6.7.0" = { + "contentful-sdk-core-6.8.0" = { name = "contentful-sdk-core"; packageName = "contentful-sdk-core"; - version = "6.7.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.7.0.tgz"; - sha512 = "+b8UXVE249Z6WzMLXvsu3CIvN/s5xXRZ9o+zY7zDdPkIYBMW15xcs9N2ATI6ncmc+s1uj4XZij/2skflletHiw=="; + url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.8.0.tgz"; + sha512 = "X45uNrcbQ2qY2p4G/Wx2EFUdnLnoDXjw29i+d0JVTUXqCG58p3q4GHuAPzTX+uafJL4h0ZY2xPOn4nvJ83eRBQ=="; }; }; "continuable-1.1.8" = { @@ -17483,13 +17519,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.11.0" = { + "core-js-3.13.0" = { name = "core-js"; packageName = "core-js"; - version = "3.11.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.11.0.tgz"; - sha512 = "bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz"; + sha512 = "iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog=="; }; }; "core-js-3.8.3" = { @@ -17501,22 +17537,22 @@ let sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.11.0" = { + "core-js-compat-3.13.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.11.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.11.0.tgz"; - sha512 = "3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.0.tgz"; + sha512 = "jhbI2zpVskgfDC9mGRaDo1gagd0E0i/kYW0+WvibL/rafEHKAHO653hEXIxJHqRlRLITluXtRH3AGTL5qJmifQ=="; }; }; - "core-js-pure-3.11.0" = { + "core-js-pure-3.13.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.11.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.0.tgz"; - sha512 = "PxEiQGjzC+5qbvE7ZIs5Zn6BynNeZO9zHhrrWmkRff2SZLq0CE/H5LuZOJHhmOQ8L38+eMzEHAmPYWrUtDfuDQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.0.tgz"; + sha512 = "7VTvXbsMxROvzPAVczLgfizR8CyYnvWPrb1eGrtlZAJfjQWEHLofVfCKljLHdpazTfpaziRORwUH/kfGDKvpdA=="; }; }; "core-util-is-1.0.2" = { @@ -17528,13 +17564,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "core_d-3.0.0" = { + "core_d-3.2.0" = { name = "core_d"; packageName = "core_d"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/core_d/-/core_d-3.0.0.tgz"; - sha512 = "6DM/spZ6j+Yha93TMdK+uz/ws82eDcYefPv2dKZBlMT5mFoJNG+zNPaqSpb5xFvrZh90KFXdSuau1Z+Jql2Tsg=="; + url = "https://registry.npmjs.org/core_d/-/core_d-3.2.0.tgz"; + sha512 = "waKkgHU2P19huhuMjCqCDWTYjxCIHoB+nnYjI7pVMUOC1giWxMNDrXkPw9QjWY+PWCFm49bD3wA/J+c7BGZ+og=="; }; }; "cors-2.8.5" = { @@ -17672,6 +17708,15 @@ let sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; + "crc-3.6.0" = { + name = "crc"; + packageName = "crc"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.6.0.tgz"; + sha512 = "K9CVP4+ugmpRvZidsumVVL1swX7t0cqYrLhT+5rAp7/S3TjiEtpovD8TISzy+3moanm6v6/cbXOzE6JbzB+siw=="; + }; + }; "crc-3.8.0" = { name = "crc"; packageName = "crc"; @@ -17726,13 +17771,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.3.0" = { + "create-gatsby-1.6.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.3.0.tgz"; - sha512 = "c78VG3AIqUg/sJCvxzFL5tGwO8MsDICRvyQ/FXS81Kf/QTr0ON9VvDjodEiM9AmtcyU5vRnM/GspEt1YfHo38A=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.6.0.tgz"; + sha512 = "mNPBiTZ9aH24I2YInaiBoXDjPgibsystLsXXWpM5miIJpA6rZrJSRtHVGfXUxZXsKHLc/at2vNrFQbsVue3Nyg=="; }; }; "create-graphback-1.0.1" = { @@ -17978,6 +18023,15 @@ let sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; }; }; + "css-3.0.0" = { + name = "css"; + packageName = "css"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-3.0.0.tgz"; + sha512 = "DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ=="; + }; + }; "css-b64-images-0.2.5" = { name = "css-b64-images"; packageName = "css-b64-images"; @@ -18194,13 +18248,13 @@ let sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="; }; }; - "css-what-5.0.0" = { + "css-what-5.0.1" = { name = "css-what"; packageName = "css-what"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-5.0.0.tgz"; - sha512 = "qxyKHQvgKwzwDWC/rGbT821eJalfupxYW2qbSJSAtdSTimsr/MlaGONoNLllaUPZWf8QnbcKM/kPVYUQuEKAFA=="; + url = "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz"; + sha512 = "FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="; }; }; "cssauron-1.4.0" = { @@ -19004,15 +19058,6 @@ let sha512 = "e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ=="; }; }; - "damerau-levenshtein-1.0.6" = { - name = "damerau-levenshtein"; - packageName = "damerau-levenshtein"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="; - }; - }; "dargs-7.0.0" = { name = "dargs"; packageName = "dargs"; @@ -19238,13 +19283,13 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "date-time-2.1.0" = { + "date-time-3.1.0" = { name = "date-time"; packageName = "date-time"; - version = "2.1.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz"; - sha512 = "/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g=="; + url = "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz"; + sha512 = "uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg=="; }; }; "dateformat-2.2.0" = { @@ -19274,13 +19319,13 @@ let sha512 = "OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q=="; }; }; - "dayjs-1.10.4" = { + "dayjs-1.10.5" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.4"; + version = "1.10.5"; 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.10.5.tgz"; + sha512 = "BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g=="; }; }; "dayjs-1.8.36" = { @@ -20219,13 +20264,13 @@ let sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; - "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-libc-1.0.3" = { @@ -20264,13 +20309,13 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "detect-node-2.0.5" = { + "detect-node-2.1.0" = { name = "detect-node"; packageName = "detect-node"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz"; - sha512 = "qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw=="; + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; "detect-port-1.3.0" = { @@ -20399,6 +20444,15 @@ let sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="; }; }; + "devtools-protocol-0.0.869402" = { + name = "devtools-protocol"; + packageName = "devtools-protocol"; + version = "0.0.869402"; + src = fetchurl { + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz"; + sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -20507,13 +20561,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.3" = { + "diff2html-3.4.4" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.3.tgz"; - sha512 = "ISnQ+aIZWyRsD6F/VZUoeXC3n54rT5tftHPJBZhbYzCDrJfTuiZMvzSY34uoN3xJ/ookMDn0FDs3hc67DmwEyA=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.4.tgz"; + sha512 = "yAvhx2GbzzWCAWTepQJrdIPyrjL/29A5UepSAPwnHvwVB41N9oAMshonZmulrFFAFkDN8u9OHKKf/p3R06xuvQ=="; }; }; "diff3-0.0.3" = { @@ -20561,13 +20615,13 @@ let sha512 = "zBiL4ALDmviHdoLC0g0G6wVme5bwAow9WfhcZLLopXCAWgg3AEf7RYTs2xugszIGulRHzEVDF/SHl9oyQU07Pw=="; }; }; - "dijkstrajs-1.0.1" = { + "dijkstrajs-1.0.2" = { name = "dijkstrajs"; packageName = "dijkstrajs"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz"; - sha1 = "d3cd81221e3ea40742cfcde556d4e99e98ddc71b"; + url = "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.2.tgz"; + sha512 = "QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="; }; }; "dir-glob-2.0.0" = { @@ -20732,13 +20786,13 @@ let sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; - "dns-packet-1.3.1" = { + "dns-packet-1.3.4" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz"; + sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; }; }; "dns-packet-4.2.0" = { @@ -20750,6 +20804,15 @@ let sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; + "dns-packet-5.2.4" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "5.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.4.tgz"; + sha512 = "vgu5Bx5IV8mXmh/9cn1lzn+J7okFlXe1vBRp+kCBJXg1nBED6Z/Q4e+QaDxQRSozMr14p/VQmdXwsf/I2wGjUA=="; + }; + }; "dns-socket-3.0.0" = { name = "dns-socket"; packageName = "dns-socket"; @@ -20840,15 +20903,6 @@ let sha512 = "WfJEuXWdVdiarhxJgRlZ9bkMO/9un6dZDz+u3z6AYEXfsH2XRwYqdIvyOqFzaDDP0Hc6pR5rb9FJRSKyo+NuxA=="; }; }; - "doctrine-1.5.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - }; "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; @@ -20930,13 +20984,13 @@ let sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; }; }; - "dom-serializer-1.3.1" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.1.tgz"; - sha512 = "Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; "dom-storage-2.1.0" = { @@ -21065,13 +21119,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.2.7" = { + "dompurify-2.2.8" = { name = "dompurify"; packageName = "dompurify"; - version = "2.2.7"; + version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz"; - sha512 = "jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz"; + sha512 = "9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww=="; }; }; "domutils-1.4.3" = { @@ -21155,6 +21209,15 @@ let sha1 = "d36517fe24b7cda61fce7a5026a0024afaf5a439"; }; }; + "dotenv-10.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"; + sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; + }; + }; "dotenv-5.0.1" = { name = "dotenv"; packageName = "dotenv"; @@ -21173,13 +21236,22 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; - "dotenv-8.2.0" = { + "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; - version = "8.2.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; - sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz"; + sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; + }; + }; + "dotenv-9.0.2" = { + name = "dotenv"; + packageName = "dotenv"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; }; "dotenv-expand-5.1.0" = { @@ -21236,15 +21308,6 @@ let sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; }; }; - "download-8.0.0" = { - name = "download"; - packageName = "download"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-8.0.0.tgz"; - sha512 = "ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA=="; - }; - }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -21479,15 +21542,6 @@ let sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; - "editions-6.1.0" = { - name = "editions"; - packageName = "editions"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-6.1.0.tgz"; - sha512 = "h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA=="; - }; - }; "editor-1.0.0" = { name = "editor"; packageName = "editor"; @@ -21587,13 +21641,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.720" = { + "electron-to-chromium-1.3.741" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.720"; + version = "1.3.741"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz"; - sha512 = "B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz"; + sha512 = "4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -21742,15 +21796,6 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; - "emoji-regex-9.2.2" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; - sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; - }; - }; "emoji-server-1.0.0" = { name = "emoji-server"; packageName = "emoji-server"; @@ -21958,13 +22003,13 @@ let sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w=="; }; }; - "engine.io-5.0.0" = { + "engine.io-5.1.1" = { name = "engine.io"; packageName = "engine.io"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-5.0.0.tgz"; - sha512 = "BATIdDV3H1SrE9/u2BAotvsmjJg0t1P4+vGedImSs1lkFAtQdvk4Ev1y4LDiPF7BPWgXWEG+NDY+nLvW3UrMWw=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; + sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; }; }; "engine.io-client-1.3.1" = { @@ -21985,13 +22030,13 @@ let sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ=="; }; }; - "engine.io-client-3.5.1" = { + "engine.io-client-3.5.2" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz"; - sha512 = "oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz"; + sha512 = "QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA=="; }; }; "engine.io-parser-1.0.6" = { @@ -22039,13 +22084,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.8.0" = { + "enhanced-resolve-5.8.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.8.0"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz"; - sha512 = "Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha512 = "F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA=="; }; }; "enquirer-2.3.6" = { @@ -22210,15 +22255,6 @@ let sha512 = "nm1o1ncxcJvXtLJVoPl4AJFX7Bh0BhPsTC9XhCRWwdRJXp1Ud1DcGpi/6c3sUA/URmyoIc1WONNdub+/AE5vTQ=="; }; }; - "err-code-1.1.2" = { - name = "err-code"; - packageName = "err-code"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; - sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; - }; - }; "err-code-2.0.3" = { name = "err-code"; packageName = "err-code"; @@ -22237,15 +22273,6 @@ let sha512 = "GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA=="; }; }; - "errlop-4.1.0" = { - name = "errlop"; - packageName = "errlop"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-4.1.0.tgz"; - sha512 = "vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ=="; - }; - }; "errno-0.1.8" = { name = "errno"; packageName = "errno"; @@ -22300,13 +22327,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.18.0" = { + "es-abstract-1.18.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.0"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz"; - sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz"; + sha512 = "nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw=="; }; }; "es-get-iterator-1.1.2" = { @@ -22471,13 +22498,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.11.14" = { + "esbuild-0.11.10" = { name = "esbuild"; packageName = "esbuild"; - version = "0.11.14"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.14.tgz"; - sha512 = "ejheEPkqhq5y0LM9rG9e+3yDihPtqeeE4NZmG7VQiSGJ3CjO4HvPOHmhhttSksfSztjLAGo2+0/zSIvlqj4JOQ=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.10.tgz"; + sha512 = "XvGbf+UreVFA24Tlk6sNOqNcvF2z49XAZt4E7A4H80+yqn944QOLTTxaU0lkdYNtZKFiITNea+VxmtrfjvnLPA=="; }; }; "esc-exit-2.0.2" = { @@ -22660,49 +22687,22 @@ let sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; - "eslint-7.25.0" = { + "eslint-7.27.0" = { name = "eslint"; packageName = "eslint"; - version = "7.25.0"; + version = "7.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; - sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; + sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; }; }; - "eslint-import-resolver-node-0.3.4" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.4"; + "eslint-config-prettier-8.3.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="; - }; - }; - "eslint-module-utils-2.6.0" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="; - }; - }; - "eslint-plugin-import-2.22.1" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; - sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="; - }; - }; - "eslint-plugin-jsx-a11y-6.4.1" = { - name = "eslint-plugin-jsx-a11y"; - packageName = "eslint-plugin-jsx-a11y"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; - sha512 = "0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg=="; + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; }; "eslint-plugin-no-unsanitized-3.1.4" = { @@ -22714,22 +22714,13 @@ let sha512 = "WF1+eZo2Sh+bQNjZuVNwT0dA61zuJORsLh+1Sww7+O6GOPw+WPWIIRfTWNqrmaXaDMhM4SXAqYPcNlhRMiH13g=="; }; }; - "eslint-plugin-react-7.23.2" = { - name = "eslint-plugin-react"; - packageName = "eslint-plugin-react"; - version = "7.23.2"; + "eslint-plugin-prettier-3.4.0" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; - sha512 = "AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw=="; - }; - }; - "eslint-plugin-react-hooks-4.2.0" = { - name = "eslint-plugin-react-hooks"; - packageName = "eslint-plugin-react-hooks"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; - sha512 = "623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ=="; + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; + sha512 = "UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw=="; }; }; "eslint-plugin-vue-6.2.2" = { @@ -22813,6 +22804,15 @@ let sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; }; }; + "eslint-visitor-keys-2.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -23497,22 +23497,22 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; - "exegesis-2.5.6" = { + "exegesis-2.5.7" = { name = "exegesis"; packageName = "exegesis"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/exegesis/-/exegesis-2.5.6.tgz"; - sha512 = "e+YkH/zZTN2njiwrV8tY6tHGDsFu3LyR/YbrqdWvDZaAJ5YGWaBYyd3oX/Y26iGqQc+7jLEKLDTv2UPzjAYL8w=="; + url = "https://registry.npmjs.org/exegesis/-/exegesis-2.5.7.tgz"; + sha512 = "Y0gEY3hgoLa80aMUm8rhhlIW3/KWo4uqN5hKJqok2GLh3maZjRLRC+p0gj33Jw3upAOKOXeRgScT5rtRoMyxwQ=="; }; }; - "exegesis-express-2.0.0" = { + "exegesis-express-2.0.1" = { name = "exegesis-express"; packageName = "exegesis-express"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/exegesis-express/-/exegesis-express-2.0.0.tgz"; - sha512 = "NKvKBsBa2OvU+1BFpWbz3PzoRMhA9q7/wU2oMmQ9X8lPy/FRatADvhlkGO1zYOMgeo35k1ZLO9ZV0uIs9pPnXg=="; + url = "https://registry.npmjs.org/exegesis-express/-/exegesis-express-2.0.1.tgz"; + sha512 = "8ORl1YRygYGPdR+zcClMqzaU+JQuvdNIw/s0RNwYluxNecEHkDEcXFmO6A5T79p7e48KI8iXJYt6KIn4Z9z4bg=="; }; }; "exif-parser-0.1.12" = { @@ -23614,13 +23614,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.74" = { + "expo-pwa-0.0.80" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.74"; + version = "0.0.80"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.74.tgz"; - sha512 = "Y3lzJl9Q+0KuYt6003eacwpfoEYzO+w2R3oBDtfwGU16KbQkm2O6zGAYluBGnlPoph+fCUmyi2mT2ucd5KSlDQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.80.tgz"; + sha512 = "AZefVqcB3OFS7yOhfOtkHANhFRTG34fAMrlDx69ERbxh0sEPI/Gv+wwYycUdmq/aYh7u8zuaoOlY9BUgMd6U6w=="; }; }; "express-2.5.11" = { @@ -23749,6 +23749,15 @@ 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-urlrewrite-1.4.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -24127,13 +24136,13 @@ let sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; }; }; - "fast-equals-2.0.1" = { + "fast-equals-2.0.3" = { name = "fast-equals"; packageName = "fast-equals"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.1.tgz"; - sha512 = "jIHAbyu5Txdi299DitHXr4wuvw7ajz8S4xVgShJmQOUD6TovsKzvMoHoq9G8+dO6xeKWrwH3DURT+ZDKnwjSsA=="; + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.3.tgz"; + sha512 = "0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA=="; }; }; "fast-glob-2.2.7" = { @@ -24208,13 +24217,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-3.0.0" = { + "fast-redact-3.0.1" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.0.tgz"; - sha512 = "a/S/Hp6aoIjx7EmugtzLqXmcNsyFszqbt6qQ99BdG61QjBZF6shNis0BYR6TsZOQ1twYc0FN2Xdhwwbv6+KD0w=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.1.tgz"; + sha512 = "kYpn4Y/valC9MdrISg47tZOpYBNoTXKgT9GYXFpHN/jYFs+lFkPoisY+LcBODdKVMY96ATzvzsWv+ES/4Kmufw=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -24316,13 +24325,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-4.0.3" = { + "faunadb-4.3.0" = { name = "faunadb"; packageName = "faunadb"; - version = "4.0.3"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.3.tgz"; - sha512 = "pfXX3pwyQQfsx+wO4u8m16gQyDPJRbpjMGk5fCzq0tCT/3mPyCVlc5zTorSdBWWmLFuResP9idFrWdqo+q2IEA=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.3.0.tgz"; + sha512 = "H5ZnInUNLAvrjqDHYXmYX+S55HP8Ib85QbF/UK1fV/bz125unl7J7LbjqKvMGcREYqOvIrpQCaniK1LwAkXHTw=="; }; }; "faye-websocket-0.10.0" = { @@ -24334,13 +24343,13 @@ let sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; }; }; - "faye-websocket-0.11.3" = { + "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; + sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; }; }; "fb-watchman-2.0.1" = { @@ -24559,15 +24568,6 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; - "file-type-11.1.0" = { - name = "file-type"; - packageName = "file-type"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-11.1.0.tgz"; - sha512 = "rM0UO7Qm9K7TWTtA6AShI/t7H5BPjDeGVDaNyg9BjHAj3PysKy7+8C8D137R88jnR3rFJZQB/tFgydl5sN5m7g=="; - }; - }; "file-type-14.7.1" = { name = "file-type"; packageName = "file-type"; @@ -24577,13 +24577,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.3.0" = { + "file-type-16.5.0" = { name = "file-type"; packageName = "file-type"; - version = "16.3.0"; + version = "16.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.3.0.tgz"; - sha512 = "ZA0hV64611vJT42ltw0T9IDwHApQuxRdrmQZWTeDmeAUtZBBVSQW3nSQqhhW1cAgpXgqcJvm410BYHXJQ9AymA=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.0.tgz"; + sha512 = "OxgWA9tbL8N/WP00GD1z8O0MiwQKFyWRs1q+3FhjdvcGgKqwxcejyGWso3n4/IMU6DdwV+ARZ4A7TTnPkDcSiw=="; }; }; "file-type-3.9.0" = { @@ -24694,15 +24694,6 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; - "filenamify-3.0.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-3.0.0.tgz"; - sha512 = "5EFZ//MsvJgXjBAFJ+Bh2YaCTRF/VP1YOmGrgt+KJ4SFRLjI87EIdwLLuT6wQX0I4F9W41xutobzczjsOKlI/g=="; - }; - }; "filenamify-4.1.0" = { name = "filenamify"; packageName = "filenamify"; @@ -24712,13 +24703,13 @@ let sha512 = "KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg=="; }; }; - "filenamify-4.2.0" = { + "filenamify-4.3.0" = { name = "filenamify"; packageName = "filenamify"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz"; - sha512 = "pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA=="; + url = "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz"; + sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg=="; }; }; "filesize-3.6.1" = { @@ -25171,13 +25162,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.149.0" = { + "flow-parser-0.152.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.149.0"; + version = "0.152.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.149.0.tgz"; - sha512 = "ruUVkZuM9oFQjhSsLO/OJYRYpGnuXJpTnIZmgzna6DyLFb3CLpeO27oJbWyeXaa830hmKf0JRzpcdFsFS8lmpg=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.152.0.tgz"; + sha512 = "qRXGE3ztuhyI2ovi4Ixwq7/GUYvKX9wmFdwBof2q5pWHteuveexFrlbwZxSonC0dWz2znA6sW+vce4RXgYLnnQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -25342,13 +25333,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.13.3" = { + "follow-redirects-1.14.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.3"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz"; - sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz"; + sha512 = "HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="; }; }; "follow-redirects-1.5.10" = { @@ -25612,13 +25603,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.10.4" = { + "fp-ts-2.10.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.4.tgz"; - sha512 = "vMTB5zNc9PnE20q145PNbkiL9P9WegwmKVOFloi/NfHnPdAlcob6I3AKqlH/9u3k3/M/GOftZhcJdBrb+NtnDA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.5.tgz"; + sha512 = "X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ=="; }; }; "fragment-cache-0.2.1" = { @@ -25711,15 +25702,6 @@ let sha512 = "8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA=="; }; }; - "fs-capacitor-6.2.0" = { - name = "fs-capacitor"; - packageName = "fs-capacitor"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-6.2.0.tgz"; - sha512 = "nKcE1UduoSKX27NSZlg879LdQc94OtbOsEmKMN2MBNudXREvijRKx2GEBsTMTfws+BrbkJoEuynbGSVRSpauvw=="; - }; - }; "fs-chunk-store-1.7.0" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; @@ -25765,15 +25747,6 @@ let sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; }; }; - "fs-extra-0.23.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.23.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz"; - sha1 = "6611dba6adf2ab8dc9c69fab37cddf8818157e3d"; - }; - }; "fs-extra-0.24.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -25810,6 +25783,15 @@ let sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; + "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-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; @@ -26143,31 +26125,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.3.0" = { + "gatsby-core-utils-2.6.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.3.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.3.0.tgz"; - sha512 = "M7RlR6jL2dtkUu4AoKBoQaPTsbpByzWHc7HBgeYdwzuqbk4VuMe6K76pFDvFSNj0+LvVhWoRGHO7OEtpfb2bEA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.6.0.tgz"; + sha512 = "d8a/iblc3wIrLEOWTUcoK5uYE2DrvlQmeulx6DK3NY49KD8jet8ozB6T5GA1CftsvowWeO6aaDnoWDbTxIxTRA=="; }; }; - "gatsby-recipes-0.14.0" = { + "gatsby-recipes-0.17.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.14.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.14.0.tgz"; - sha512 = "f8vZtHA7mCWqLE/xxEs4gpKxfM53L4dPic6hkALMlNfg8040eu05D6YbNT3i3QLsyqpvX1vKH88SBHk7swwW8w=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.17.0.tgz"; + sha512 = "tC2xUa05zrUp77DTyQE11ILhFiqv9JYxBHhh47b7tJGiLAU1XhjxZH0uFZ109r9wEeZjxTYOYkyoiTu+0Ps4pw=="; }; }; - "gatsby-telemetry-2.3.0" = { + "gatsby-telemetry-2.6.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.3.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.3.0.tgz"; - sha512 = "dr7pILAnEtoG9ZUyPRljSwB/fGBDM4OCoM0mGw3DYr6HFlvrsbIl7AVL4LVJIr4TrtVUrhTjC/crSw+bTzO42A=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.6.0.tgz"; + sha512 = "ENrhT4tkETj9Gq48d+ziiyNTX8Q8/5EyqqWvDUTCSefeHV5xpBclJ+CEnxZkmkEa/QSoBCpjws2VbxnTmRwjWA=="; }; }; "gauge-1.2.7" = { @@ -26188,13 +26170,13 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "gaxios-4.2.0" = { + "gaxios-4.3.0" = { name = "gaxios"; packageName = "gaxios"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-4.2.0.tgz"; - sha512 = "Ms7fNifGv0XVU+6eIyL9LB7RVESeML9+cMvkwGS70xyD6w2Z80wl6RiqiJ9k1KFlJCUTQqFFc8tXmPQfSKUe8g=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz"; + sha512 = "pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg=="; }; }; "gaze-1.1.3" = { @@ -26845,6 +26827,15 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; + "glob-7.1.7" = { + name = "glob"; + packageName = "glob"; + version = "7.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -26881,6 +26872,15 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; + "glob-parent-6.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz"; + sha512 = "Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww=="; + }; + }; "glob-slash-1.0.0" = { name = "glob-slash"; packageName = "glob-slash"; @@ -27098,13 +27098,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.8.0" = { + "globals-13.9.0" = { name = "globals"; packageName = "globals"; - version = "13.8.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; - sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + url = "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz"; + sha512 = "74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA=="; }; }; "globals-9.18.0" = { @@ -27260,6 +27260,15 @@ let sha512 = "zNvkjnJQWbFWtK7or4CtX0WMy2n5AfMVnob5ipf+AznwLxKX8KyqY9W4bzYpVh6Xjm9N21ZUbubsPheV3mA4qQ=="; }; }; + "goldengate-10.0.4" = { + name = "goldengate"; + packageName = "goldengate"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.4.tgz"; + sha512 = "WuLSD4trXP8fN8jCpWlNMpobrf1DBYCEy/0+SVrzen6znQepM4rRCByuna1Iy1G/XsbbdFiwYBd9iSxJiwqjDQ=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -27287,13 +27296,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.0.4" = { + "google-auth-library-7.1.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.0.4"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz"; - sha512 = "o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.0.tgz"; + sha512 = "X+gbkGjnLN3HUZP2W3KBREuA603BXd80ITvL0PeS0QpyDNYz/u0pIZ7aRuGnrSuUc0grk/qxEgtVTFt1ogbP+A=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27305,13 +27314,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.11.2" = { + "google-gax-2.14.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.11.2"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.11.2.tgz"; - sha512 = "PNqXv7Oi5XBMgoMWVxLZHUidfMv7cPHrDSDXqLyEd6kY6pqFnVKC8jt2T1df4JPSc2+VLPdeo6L7X9mbdQG8Xw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.14.1.tgz"; + sha512 = "I5RDEN7MEptrCxeHX3ht7nKFGfyjgYX4hQKI9eVMBohMzVbFSwWUndo0CcKXu8es7NhB4gt2XYLm1AHkXhtHpA=="; }; }; "google-p12-pem-3.0.3" = { @@ -27359,15 +27368,6 @@ let sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; - "got-11.4.0" = { - name = "got"; - packageName = "got"; - version = "11.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.4.0.tgz"; - sha512 = "XysJZuZNVpaQ37Oo2LV90MIkPeYITehyy1A0QzO1JwOXm8EWuEf9eeGk2XuHePvLEGnm9AVOI37bHwD6KYyBtg=="; - }; - }; "got-11.5.2" = { name = "got"; packageName = "got"; @@ -27566,13 +27566,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.13.0" = { + "graphql-extensions-0.15.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.13.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.13.0.tgz"; - sha512 = "Bb7E97nvfX4gtrIdZ/i5YFlqOd6MGzrw8ED+t4wQVraYje6NQ+8P8MHMOV2WZLfbW8zsNTx8NdnnlbsdH5siag=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.15.0.tgz"; + sha512 = "bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -27584,13 +27584,13 @@ let sha512 = "95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g=="; }; }; - "graphql-tag-2.12.3" = { + "graphql-tag-2.12.4" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.12.3"; + version = "2.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.3.tgz"; - sha512 = "5wJMjSvj30yzdciEuk9dPuUBUR56AqDi3xncoYQl1i42pGdSqOJrJsdb/rz5BDoy+qoGvQwABcBeF0xXY3TrKw=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz"; + sha512 = "VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww=="; }; }; "graphql-tools-3.0.0" = { @@ -27620,22 +27620,13 @@ let sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; - "graphql-upload-11.0.0" = { - name = "graphql-upload"; - packageName = "graphql-upload"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-upload/-/graphql-upload-11.0.0.tgz"; - sha512 = "zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA=="; - }; - }; - "graphql-ws-4.4.2" = { + "graphql-ws-4.5.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.4.2"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.4.2.tgz"; - sha512 = "Cz+t1w+8+tiHIKzcz45tMwrxJpPSQ7KNjQrfN8ADAELECkkBB7aSvAgpShWz0Tne8teH/UxzJsULObLVq5eMvQ=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.5.2.tgz"; + sha512 = "kowYwIq2SEJGaHMoKlgR5fgIAyFJbEdVpwjlct22eg6uuDkJK9Irv/b1XHdrFWny8KFssTd/+dUkDpT2vX9Log=="; }; }; "gray-matter-2.1.1" = { @@ -27692,13 +27683,13 @@ let sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; }; - "grunt-known-options-1.1.1" = { + "grunt-known-options-2.0.0" = { name = "grunt-known-options"; packageName = "grunt-known-options"; - version = "1.1.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz"; - sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz"; + sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; "gtoken-5.2.1" = { @@ -28205,15 +28196,6 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; - "hash-wasm-4.6.0" = { - name = "hash-wasm"; - packageName = "hash-wasm"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.6.0.tgz"; - sha512 = "Wi96tJDftxUQciCUi2Vs/Nw8al3psRATe/FhyezrajJKCXKRHvpiFARTZuUgdlGB7825LiN+FluH7SFoGdiGRA=="; - }; - }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -28421,15 +28403,6 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; - "hcl-to-json-0.1.1" = { - name = "hcl-to-json"; - packageName = "hcl-to-json"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hcl-to-json/-/hcl-to-json-0.1.1.tgz"; - sha512 = "sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A=="; - }; - }; "he-0.5.0" = { name = "he"; packageName = "he"; @@ -29124,13 +29097,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-1.2.1" = { + "http-proxy-middleware-1.3.1" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.2.1.tgz"; - sha512 = "mxqwEC+IOneTLuYz1B7fmLUmXXkVWfcbiXe8LsCctIX12vxfJU1Uj9HJD/G9MwK4HvgEdgKI8NZySM3uheC2JQ=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; + sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; }; }; "http-signature-0.11.0" = { @@ -29439,6 +29412,15 @@ let sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; }; }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; "icss-replace-symbols-1.1.0" = { name = "icss-replace-symbols"; packageName = "icss-replace-symbols"; @@ -29529,13 +29511,13 @@ let sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; - "ignore-walk-3.0.3" = { + "ignore-walk-3.0.4" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; }; }; "image-data-uri-2.0.1" = { @@ -29610,13 +29592,13 @@ let sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; }; }; - "immediate-chunk-store-2.1.1" = { + "immediate-chunk-store-2.2.0" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.1.tgz"; - sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA=="; + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.2.0.tgz"; + sha512 = "1bHBna0hCa6arRXicu91IiL9RvvkbNYLVq+mzWdaLGZC3hXvX4doh8e1dLhMKez5siu63CYgO5NrGJbRX5lbPA=="; }; }; "immer-7.0.15" = { @@ -29961,13 +29943,13 @@ let sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w=="; }; }; - "ink-spinner-4.0.1" = { + "ink-spinner-4.0.2" = { name = "ink-spinner"; packageName = "ink-spinner"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.1.tgz"; - sha512 = "2eYtzzUPb22Z0Cn2bGvE4BteYjcqDhgrHnCzGJM81EHXXlyNU7aYfucPgZs2CZPy0LWz/5hwoecFhd0mj1hrbw=="; + url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.2.tgz"; + sha512 = "vQGmhWUEh3IG1IxK1Hl2w6RfH6aaRIJWw9lrG8CvFFyrQ23UpJ8GClJs5/sFBxkNvsrrK9sKNEGlGnsqTYiUww=="; }; }; "ink-text-input-4.0.1" = { @@ -30114,6 +30096,15 @@ let sha512 = "ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA=="; }; }; + "inquirer-8.1.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.0.tgz"; + sha512 = "1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw=="; + }; + }; "inquirer-autocomplete-prompt-1.3.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -30267,15 +30258,6 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "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=="; - }; - }; "internmap-1.0.1" = { name = "internmap"; packageName = "internmap"; @@ -30357,13 +30339,13 @@ let sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; }; - "inversify-5.0.5" = { + "inversify-5.1.1" = { name = "inversify"; packageName = "inversify"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/inversify/-/inversify-5.0.5.tgz"; - sha512 = "60QsfPz8NAU/GZqXu8hJ+BhNf/C/c+Hp0eDc6XMIJTxBiP36AQyyQKpBkOVTLWBFDQWYVHpbbEuIsHu9dLuJDA=="; + url = "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz"; + sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; "invert-kv-1.0.0" = { @@ -30681,13 +30663,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.1" = { + "is-bigint-1.0.2" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz"; - sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz"; + sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; }; }; "is-binary-path-1.0.1" = { @@ -30708,13 +30690,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.1.0" = { + "is-boolean-object-1.1.1" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha512 = "bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng=="; }; }; "is-buffer-1.1.6" = { @@ -30789,13 +30771,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.3.0" = { + "is-core-module-2.4.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz"; - sha512 = "xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz"; + sha512 = "6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A=="; }; }; "is-data-descriptor-0.1.4" = { @@ -30816,13 +30798,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.4" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.4"; 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.4.tgz"; + sha512 = "/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="; }; }; "is-decimal-1.0.4" = { @@ -31032,13 +31014,13 @@ let sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; - "is-generator-function-1.0.8" = { + "is-generator-function-1.0.9" = { name = "is-generator-function"; packageName = "is-generator-function"; - version = "1.0.8"; + version = "1.0.9"; 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.9.tgz"; + sha512 = "ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A=="; }; }; "is-glob-2.0.1" = { @@ -31311,13 +31293,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.4" = { + "is-number-object-1.0.5" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; - sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz"; + sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="; }; }; "is-obj-1.0.1" = { @@ -31554,13 +31536,13 @@ let sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; - "is-regex-1.1.2" = { + "is-regex-1.1.3" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; - sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz"; + sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ=="; }; }; "is-regexp-1.0.0" = { @@ -31671,13 +31653,13 @@ let sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; }; }; - "is-ssh-1.3.2" = { + "is-ssh-1.3.3" = { name = "is-ssh"; packageName = "is-ssh"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.2.tgz"; - sha512 = "elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ=="; + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz"; + sha512 = "NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ=="; }; }; "is-stream-1.1.0" = { @@ -31707,13 +31689,13 @@ let sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; }; }; - "is-string-1.0.5" = { + "is-string-1.0.6" = { name = "is-string"; packageName = "is-string"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; - sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz"; + sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="; }; }; "is-supported-regexp-flag-1.0.1" = { @@ -31725,13 +31707,13 @@ let sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; }; }; - "is-symbol-1.0.3" = { + "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" = { @@ -31941,13 +31923,13 @@ let sha1 = "119556d1d1651a41ba105af803267c80b299f629"; }; }; - "is2-2.0.6" = { + "is2-2.0.7" = { name = "is2"; packageName = "is2"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz"; - sha512 = "+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ=="; + url = "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz"; + sha512 = "4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA=="; }; }; "isarray-0.0.1" = { @@ -31995,13 +31977,13 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; - "isbinaryfile-4.0.6" = { + "isbinaryfile-4.0.8" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.6"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; - sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; }; "isemail-3.2.0" = { @@ -32148,15 +32130,6 @@ let sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; }; }; - "istextorbinary-5.12.0" = { - name = "istextorbinary"; - packageName = "istextorbinary"; - version = "5.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/istextorbinary/-/istextorbinary-5.12.0.tgz"; - sha512 = "wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w=="; - }; - }; "isuri-2.0.3" = { name = "isuri"; packageName = "isuri"; @@ -32382,13 +32355,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.1.3" = { + "jitdb-3.1.4" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.3.tgz"; - sha512 = "g9RdoIzb2h9fkXKJVVQqQSU6U2XG4VrR6hsGjTGTha4rI+zNGBkIclhfrWAgTrW0ofjOIcMfgGWeIOLBTJLULw=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.4.tgz"; + sha512 = "UEzC68eqFIQJPQnmPm2/KGirX2pE+GebhA2EZss3b0UZZca7eGgxpvQ7+sIPcwLKAcZr5rmkFhQHGIQJyf20bg=="; }; }; "jju-1.4.0" = { @@ -32508,13 +32481,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.23.2" = { + "jquery.terminal-2.24.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.23.2"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.23.2.tgz"; - sha512 = "C92ZOquPhjGcB0PAEUHPlnkEycgtQoCoiCYZ3d7FyuK7z/JDSIXuNk5kosaVn3/NwFZ7jlFgy+s3kksHI0aFHg=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.24.0.tgz"; + sha512 = "rtjTBj7/FYoBiWawiNTYNXIRqVI4n39WF/x1h/bEKFb48Rzgr4/dpkKGd1dgZau714ewzczAi7CEBTKvhM6RjA=="; }; }; "js-base64-2.6.4" = { @@ -32760,13 +32733,13 @@ let sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; }; }; - "jsdom-16.5.3" = { + "jsdom-16.6.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.5.3"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.5.3.tgz"; - sha512 = "Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz"; + sha512 = "Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg=="; }; }; "jsdom-7.2.2" = { @@ -32805,49 +32778,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.29.0" = { + "jsii-1.30.0" = { name = "jsii"; packageName = "jsii"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.29.0.tgz"; - sha512 = "7o1yE/si/nbGsNquSejwxaiPq0iDSTPfDENd7ZyO3xzGIROV8UZSs+VhGyys9t/VF4og8p9s2olkajEN60fzMw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.30.0.tgz"; + sha512 = "TfVHhGjP0QiTEkyfnxrDIE8Da+itxnNUK2YoD69qIPAzmZ58goKVqK4sbXrXz2urHSToGLDmWI8+H69cLeVjJw=="; }; }; - "jsii-pacmak-1.29.0" = { + "jsii-pacmak-1.30.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.29.0.tgz"; - sha512 = "wpVDrvh+hClB4Y68v/sYCcRnXlXoDwEUTC0X+uz9o5xUHs/WfuDglS5AAhq6g51INAQc0ed3anrkqmFcDK6QPw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.30.0.tgz"; + sha512 = "hYvISYBXZ5WL/+LtG3HpVrimguqAoWa3D8jaqsnoiIGrdmaxKCZ0VnioJYxEX7wVamYuCwXu5NFx/b31BspU6A=="; }; }; - "jsii-reflect-1.29.0" = { + "jsii-reflect-1.30.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.29.0.tgz"; - sha512 = "r1XpKsnaMTaI0B2XXJ4rF1rbufqFDThASrArE+SyuuGeWTJxWQ4UtIzvXNVFLbZba0A5hX4K0JxiMIfaRFCEEg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.30.0.tgz"; + sha512 = "t/1Zr1gGqQSYt94Lfq860VLnCr8y8MLvlLorWYqmBeWKCaSPhtYSC1blGhZhDrAW+CBXiT0Oy64j4Q++AntRmw=="; }; }; - "jsii-rosetta-1.29.0" = { + "jsii-rosetta-1.30.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.29.0.tgz"; - sha512 = "WhTlFFm/xp2ictShT7XreBoqNpFj/U4MK4VyHyzYV1jS58uvJJMkwifMz/MOqciqRtWIAvGM3Ria4EB3VqmTfA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.30.0.tgz"; + sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.257" = { + "jsii-srcmak-0.1.273" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.257"; + version = "0.1.273"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.257.tgz"; - sha512 = "Nfym9T84GR8kMjx6Lcah/RhIW8c38BEt/nltagrf9wnBhXWPgQoIP9f6nSsKaGHy2srI6gNSNFFR7sSIS90TyA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.273.tgz"; + sha512 = "koWwHIq+LdKPoclPjRvZp2cNwk8Tck/wW1iUqgRDpjIO6+Puq26ovr/XF7etf9sXZEpCRHOT7/qTOVMJo0F+vg=="; }; }; "json-bigint-0.2.3" = { @@ -32967,6 +32940,15 @@ let sha512 = "tFH40YQ+lG7mgYYM1kGZOhQngO4SbOEHZJlA4W+NtetWZ20EUU3BPU+30uWRKumuAJoSo5eqrsXD2h72ioS8ew=="; }; }; + "json-ptr-2.2.0" = { + name = "json-ptr"; + packageName = "json-ptr"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-ptr/-/json-ptr-2.2.0.tgz"; + sha512 = "w9f6/zhz4kykltXMG7MLJWMajxiPj0q+uzQPR1cggNAE/sXoq/C5vjUb/7QNcC3rJsVIIKy37ALTXy1O+3c8QQ=="; + }; + }; "json-refs-2.1.7" = { name = "json-refs"; packageName = "json-refs"; @@ -33003,13 +32985,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-0.2.5" = { + "json-schema-0.3.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz"; - sha512 = "gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ=="; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.3.0.tgz"; + sha512 = "TYfxx36xfl52Rf1LU9HyWSLGPdYLL+SQ8/E/0yVyKG8wCCDaSrhPap0vEdlsZWRaS6tnKKLPGiEJGiREVC8kxQ=="; }; }; "json-schema-deref-sync-0.13.0" = { @@ -33102,13 +33084,13 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; - "json-stringify-nice-1.1.3" = { + "json-stringify-nice-1.1.4" = { name = "json-stringify-nice"; packageName = "json-stringify-nice"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.3.tgz"; - sha512 = "w8+cZZFgcPtFkZTmkA1UpRH0GXXfpeuc/cClNkQjLt9JoQd8cBFSyB8J1WWjJrthIYViHobwnh3jA4z5X2LdGA=="; + url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz"; + sha512 = "5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw=="; }; }; "json-stringify-pretty-compact-3.0.0" = { @@ -33147,13 +33129,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.219" = { + "json2jsii-0.1.236" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.219"; + version = "0.1.236"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.219.tgz"; - sha512 = "0KTPGNsHxvtKodkvymWSAg0HAMpcAUPcyk1wYEpWJJC3k3Zkeun/dGBeP4X7DjByZ4AcUMJMSPqlJy67f/3Cyg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.236.tgz"; + sha512 = "f2UN6Fum7vNQmeonz3HvP7GJxlathMSFYNzYCHdLjFKDpX3KDD9+xi7Qrk0JOMqrGMG6Ev1ye4rXlnUBlWKLvA=="; }; }; "json3-3.2.6" = { @@ -33444,15 +33426,6 @@ let sha1 = "69ec30ce4518bed5997b38f027648e8c285e92f7"; }; }; - "jsx-ast-utils-3.2.0" = { - name = "jsx-ast-utils"; - packageName = "jsx-ast-utils"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; - sha512 = "EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q=="; - }; - }; "jszip-2.6.1" = { name = "jszip"; packageName = "jszip"; @@ -33669,14 +33642,14 @@ let sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; }; }; - "kad-git+https://github.com/wikimedia/kad.git#master" = { + "kad-git://github.com/wikimedia/kad#master" = { name = "kad"; packageName = "kad"; version = "1.3.6"; src = fetchgit { - url = "https://github.com/wikimedia/kad.git"; - rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e"; - sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea"; + url = "git://github.com/wikimedia/kad"; + rev = "634a3fc7f60898ec541406d60ccf0d48556070e2"; + sha256 = "285413585c8cc029d7204b5babc30cde39715fea8c8a875b8ae3c0dff2643d68"; }; }; "kad-localstorage-0.0.7" = { @@ -33706,13 +33679,13 @@ let sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; }; }; - "katex-0.12.0" = { + "katex-0.13.11" = { name = "katex"; packageName = "katex"; - version = "0.12.0"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.12.0.tgz"; - sha512 = "y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; + sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; }; }; "keep-alive-agent-0.0.1" = { @@ -33787,13 +33760,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "keytar-7.6.0" = { + "keytar-7.7.0" = { name = "keytar"; packageName = "keytar"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.6.0.tgz"; - sha512 = "H3cvrTzWb11+iv0NOAnoNAPgEapVZnYLVHZQyxmh7jdmVfR/c0jNNFEZ6AI38W/4DeTGTaY66ZX4Z1SbfKPvCQ=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz"; + sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; }; }; "keyv-3.0.0" = { @@ -34003,24 +33976,6 @@ let sha512 = "uLrFPGj2//glOgJGLZn8hNTNlhU+eGx0WFRLZxIoC39nfjLRZ1fncHcPK2t5gA2GcvgtGUT2dnw60M8vJAOIkQ=="; }; }; - "language-subtag-registry-0.3.21" = { - name = "language-subtag-registry"; - packageName = "language-subtag-registry"; - version = "0.3.21"; - src = fetchurl { - url = "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz"; - sha512 = "L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg=="; - }; - }; - "language-tags-1.0.5" = { - name = "language-tags"; - packageName = "language-tags"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz"; - sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; - }; - }; "last-call-webpack-plugin-3.0.0" = { name = "last-call-webpack-plugin"; packageName = "last-call-webpack-plugin"; @@ -34534,6 +34489,15 @@ let sha512 = "VpkNbaWlsmTgaWWJPGyYb2dm2v5b+wPQWmfZBJ7V5znL17Q+ef7Csj8PTTgnIccAWE429QL9/OyOzn/JVnZ/PA=="; }; }; + "lightning-3.3.7" = { + name = "lightning"; + packageName = "lightning"; + version = "3.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.7.tgz"; + sha512 = "fjzFCwXafGUeCwUSiEKToS/A8GO4oxDiDG+XNuL984mgYyJdXLHoTEMdaYZD48yowtfjYCdLks0iypIdg6kn1Q=="; + }; + }; "limit-spawn-0.0.3" = { name = "limit-spawn"; packageName = "limit-spawn"; @@ -34543,13 +34507,13 @@ let sha1 = "cc09c24467a0f0a1ed10a5196dba597cad3f65dc"; }; }; - "limitation-0.2.1" = { + "limitation-0.2.2" = { name = "limitation"; packageName = "limitation"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.2.1.tgz"; - sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw=="; + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.2.tgz"; + sha512 = "kUfYO29baIJzY3S4/j7qaWl0GdjxT88SEaIcUN98YGdhYh+m7Zkt1N4jGubVF05A7dzjfjgtQD/NI5APKl38RQ=="; }; }; "line-reader-0.4.0" = { @@ -34687,6 +34651,15 @@ let sha512 = "n0Ib9fjVL8x3ymdOax6gjmR0Nq59vIhQ89en1XpgxIWbowWhiJUXPolTEgiA8vpeoG72CZN3nYaPXgil9uNVLg=="; }; }; + "ln-service-51.8.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.1.tgz"; + sha512 = "YjRsNwAez1RfA63YDoLf5Ojg3Ma+aLmvfMqasqU3r+/pDR+mgGFyjVODsw6qujerIEM2FaxegddJeOz7R7/Ijw=="; + }; + }; "ln-sync-0.4.5" = { name = "ln-sync"; packageName = "ln-sync"; @@ -34696,13 +34669,13 @@ let sha512 = "ETaASkbv5v2gcrob/xonsjy0deKSxIHfKOTfOXQicxhZed02plQ2oAUx/K3yxIhRnm7YS45Z/gYQLxUqHkI4ow=="; }; }; - "ln-telegram-3.2.2" = { + "ln-telegram-3.2.3" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.2.tgz"; - sha512 = "6gJmRkOpcsyARrCL0+O66xgVlZVRd1erLSw1/dsiGXgUsaSuZ4mFpxE40j6eXZZZxwcFcYNE06Q79BMtsIvoqA=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.3.tgz"; + sha512 = "pNYz/xz/VCn8EApERCR+2nB0hmBM25dAmKUs0FZnMlQGozNaSqb26ttN0XLA/Q/JVOeovacjlAOJ0tl6zqcS8w=="; }; }; "load-bmfont-1.4.1" = { @@ -34921,13 +34894,13 @@ let sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; - "locutus-2.0.14" = { + "locutus-2.0.15" = { name = "locutus"; packageName = "locutus"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.14.tgz"; - sha512 = "0H1o1iHNEp3kJ5rW57bT/CAP5g6Qm0Zd817Wcx2+rOMTYyIJoc482Ja1v9dB6IUjwvWKcBNdYi7x2lRXtlJ3bA=="; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.15.tgz"; + sha512 = "2xWC4RkoAoCVXEb/stzEgG1TNgd+mrkLBj6TuEDNyUoKeQ2XzDTyJUC23sMiqbL6zJmJSP3w59OZo+zc4IBOmA=="; }; }; "lodash-2.4.2" = { @@ -35488,13 +35461,13 @@ let sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; }; }; - "lodash.endswith-4.2.1" = { - name = "lodash.endswith"; - packageName = "lodash.endswith"; - version = "4.2.1"; + "lodash.differencewith-4.5.0" = { + name = "lodash.differencewith"; + packageName = "lodash.differencewith"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz"; - sha1 = "fed59ac1738ed3e236edd7064ec456448b37bc09"; + url = "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz"; + sha1 = "bafafbc918b55154e179176a00bb0aefaac854b7"; }; }; "lodash.escape-3.2.0" = { @@ -35776,15 +35749,6 @@ let sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; }; }; - "lodash.islength-4.0.1" = { - name = "lodash.islength"; - packageName = "lodash.islength"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.islength/-/lodash.islength-4.0.1.tgz"; - sha1 = "4e9868d452575d750affd358c979543dc20ed577"; - }; - }; "lodash.ismatch-4.4.0" = { name = "lodash.ismatch"; packageName = "lodash.ismatch"; @@ -36748,15 +36712,6 @@ let sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; }; }; - "lynx-0.2.0" = { - name = "lynx"; - packageName = "lynx"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lynx/-/lynx-0.2.0.tgz"; - sha1 = "79e6674530da4183e87953bd686171e070da50b9"; - }; - }; "lzma-native-6.0.1" = { name = "lzma-native"; packageName = "lzma-native"; @@ -36883,13 +36838,13 @@ let sha512 = "ZpqciThlbvE6KkyT5oxAup/6CwjePw1hdtR8NU5+vq2hn9Sp5b7w3bRiJRvo9fMHUj2dWSuVCdkqt9p4ed1V9Q=="; }; }; - "magnet-uri-6.1.1" = { + "magnet-uri-6.2.0" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.1.1.tgz"; - sha512 = "TUyzaLB36TqqIHzgvkMrlZUPN6mfoLX/+2do5YJH3gjBQL2auEtivT+99npIiA77YepJ6pYA/AzWhboXTAAm0w=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.2.0.tgz"; + sha512 = "O9AgdDwT771fnUj0giPYu/rACpz8173y8UXCSOdLITjOVfBenZ9H9q3FqQmveK+ORUMuD+BkKNSZP8C3+IMAKQ=="; }; }; "make-dir-1.3.0" = { @@ -37099,6 +37054,15 @@ let sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; + "markdown-it-12.0.4" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "12.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.4.tgz"; + sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; + }; + }; "markdown-it-12.0.6" = { name = "markdown-it"; packageName = "markdown-it"; @@ -37162,13 +37126,13 @@ let sha512 = "ODpk98FWkGIq2vkwm2NOLt4G6TRgy3M9eTa9SFm06pUyOd0zjjYAwkhsjiCDU42pzKuz0ChiwBO0utuOj3LNOA=="; }; }; - "markdown-it-footnote-3.0.2" = { + "markdown-it-footnote-3.0.3" = { name = "markdown-it-footnote"; packageName = "markdown-it-footnote"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz"; - sha512 = "JVW6fCmZWjvMdDQSbOT3nnOQtd9iAXmw7hTSh26+v42BnvXeVyGMDBm5b/EZocMed2MbCAHiTX632vY0FyGB8A=="; + url = "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz"; + sha512 = "YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w=="; }; }; "markdown-it-github-headings-1.1.2" = { @@ -37243,13 +37207,13 @@ let sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ=="; }; }; - "markdown-link-extractor-1.2.7" = { + "markdown-link-extractor-1.3.0" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.2.7"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.7.tgz"; - sha512 = "gFwyqKEMPAwXiW2n7ZeM26bJL9WfkYnzP1O2lxFvqenefzPQE4A5XjidqbotOyDA5qUzjOHeqYoaGa2qb4B4Og=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.3.0.tgz"; + sha512 = "1qXoYqhsU5qgWtUF9HQlBF82jRrakENh+7nmPUxoMJw13kf92jzb72EchrSsw5vdqbDLJurkpNL50xLFRhjmbw=="; }; }; "markdown-serve-0.3.3" = { @@ -37288,6 +37252,24 @@ let sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; }; }; + "markdownlint-0.23.1" = { + name = "markdownlint"; + packageName = "markdownlint"; + version = "0.23.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.23.1.tgz"; + sha512 = "iOEwhDfNmq2IJlaA8mzEkHYUi/Hwoa6Ss+HO5jkwUR6wQ4quFr0WzSx+Z9rsWZKUaPbyirIdL1zGmJRkWawr4Q=="; + }; + }; + "markdownlint-rule-helpers-0.14.0" = { + name = "markdownlint-rule-helpers"; + packageName = "markdownlint-rule-helpers"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.14.0.tgz"; + sha512 = "vRTPqSU4JK8vVXmjICHSBhwXUvbfh/VJo+j7hvxqe15tLJyomv3FLgFdFgb8kpj0Fe8SsJa/TZUAXv7/sN+N7A=="; + }; + }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -37306,22 +37288,13 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-0.8.2" = { + "marked-2.0.6" = { name = "marked"; packageName = "marked"; - version = "0.8.2"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz"; - sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; - }; - }; - "marked-2.0.3" = { - name = "marked"; - packageName = "marked"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-2.0.3.tgz"; - sha512 = "5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA=="; + url = "https://registry.npmjs.org/marked/-/marked-2.0.6.tgz"; + sha512 = "S2mYj0FzTQa0dLddssqwRVW4EOJOVJ355Xm2Vcbm+LU7GQRGWvwbO5K87OaPSOux2AwTSgtPPaXmc8sDPrhn2A=="; }; }; "marked-terminal-3.3.0" = { @@ -37342,13 +37315,13 @@ let sha512 = "t7Mdf6T3PvOEyN01c3tYxDzhyKZ8xnkp8Rs6Fohno63L/0pFTJ5Qtwto2AQVuDtbQiWzD+4E5AAu1Z2iLc8miQ=="; }; }; - "marky-1.2.1" = { + "marky-1.2.2" = { name = "marky"; packageName = "marky"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz"; - sha512 = "md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ=="; + url = "https://registry.npmjs.org/marky/-/marky-1.2.2.tgz"; + sha512 = "k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ=="; }; }; "mastodon-api-1.3.0" = { @@ -37513,22 +37486,13 @@ let sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw=="; }; }; - "md5-hex-2.0.0" = { + "md5-hex-3.0.1" = { name = "md5-hex"; packageName = "md5-hex"; - version = "2.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz"; - sha1 = "d0588e9f1c74954492ecd24ac0ac6ce997d92e33"; - }; - }; - "md5-o-matic-0.1.1" = { - name = "md5-o-matic"; - packageName = "md5-o-matic"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz"; - sha1 = "822bccd65e117c514fab176b25945d54100a03c3"; + url = "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz"; + sha512 = "BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw=="; }; }; "md5.js-1.3.5" = { @@ -37576,6 +37540,24 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; + "mdast-util-find-and-replace-1.1.1" = { + name = "mdast-util-find-and-replace"; + packageName = "mdast-util-find-and-replace"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz"; + sha512 = "9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA=="; + }; + }; + "mdast-util-footnote-0.1.7" = { + name = "mdast-util-footnote"; + packageName = "mdast-util-footnote"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz"; + sha512 = "QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w=="; + }; + }; "mdast-util-from-markdown-0.8.5" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; @@ -37585,6 +37567,60 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; + "mdast-util-frontmatter-0.2.0" = { + name = "mdast-util-frontmatter"; + packageName = "mdast-util-frontmatter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-0.2.0.tgz"; + sha512 = "FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ=="; + }; + }; + "mdast-util-gfm-0.1.2" = { + name = "mdast-util-gfm"; + packageName = "mdast-util-gfm"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz"; + sha512 = "NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ=="; + }; + }; + "mdast-util-gfm-autolink-literal-0.1.3" = { + name = "mdast-util-gfm-autolink-literal"; + packageName = "mdast-util-gfm-autolink-literal"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz"; + sha512 = "GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A=="; + }; + }; + "mdast-util-gfm-strikethrough-0.2.3" = { + name = "mdast-util-gfm-strikethrough"; + packageName = "mdast-util-gfm-strikethrough"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz"; + sha512 = "5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA=="; + }; + }; + "mdast-util-gfm-table-0.1.6" = { + name = "mdast-util-gfm-table"; + packageName = "mdast-util-gfm-table"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz"; + sha512 = "j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ=="; + }; + }; + "mdast-util-gfm-task-list-item-0.1.6" = { + name = "mdast-util-gfm-task-list-item"; + packageName = "mdast-util-gfm-task-list-item"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz"; + sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; + }; + }; "mdast-util-mdx-0.1.1" = { name = "mdast-util-mdx"; packageName = "mdast-util-mdx"; @@ -37792,22 +37828,22 @@ let sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; }; }; - "mem-fs-1.2.0" = { + "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; - version = "1.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.2.0.tgz"; - sha512 = "b8g0jWKdl8pM0LqAPdK9i8ERL7nYrzmJfRhxMiWH2uYdfYnb7uXnmwVb0ZGe7xyEl4lj+nLIU3yf4zPUT+XsVQ=="; + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-2.2.1.tgz"; + sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-8.1.2" = { + "mem-fs-editor-9.0.1" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-8.1.2.tgz"; - sha512 = "owE6PKMRegrYb37Lsar3yLSwK9wLGvHkNIOzBO3ycFeoOwshdF8j593EqjU7ucFAf3ZvcFVwfpo8Q8LqgFQg0A=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.0.1.tgz"; + sha512 = "SqW+DkPbxZVzVldNHexoo5MiUR3YpIqiCVcZ/SZ6f7KToaSV7pMd4/URrkD5mnj35bd6NAK7SlftHSyW+Kgk4w=="; }; }; "memfs-3.2.2" = { @@ -37864,13 +37900,13 @@ let sha1 = "7890b01d52c00c8ebc9d533e1f8eb17e3034871a"; }; }; - "memory-chunk-store-1.3.2" = { + "memory-chunk-store-1.3.5" = { name = "memory-chunk-store"; packageName = "memory-chunk-store"; - version = "1.3.2"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.2.tgz"; - sha512 = "EBcbwpdQlzT5aNV0FTT+RAfh1cGEssjiCcRGcTk57mKsnZlRMOtH4Cfk/AqQnkz8xP2dUF+/lgpmErSGwwE1FA=="; + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.5.tgz"; + sha512 = "E1Xc1U4ifk/FkC2ZsWhCaW1xg9HbE/OBmQTLe2Tr9c27YPSLbW7kw1cnb3kQWD1rDtErFJHa7mB9EVrs7aTx9g=="; }; }; "memory-fs-0.3.0" = { @@ -38080,22 +38116,22 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.9.2" = { + "mermaid-8.10.1" = { name = "mermaid"; packageName = "mermaid"; - version = "8.9.2"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.2.tgz"; - sha512 = "XWEaraDRDlHZexdeHSSr/MH4VJAOksRSPudchi69ecZJ7IUjjlzHsg32n4ZwJUh6lFO+NMYLHwHNNYUyxIjGPg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.1.tgz"; + sha512 = "KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A=="; }; }; - "mersenne-0.0.4" = { - name = "mersenne"; - packageName = "mersenne"; - version = "0.0.4"; + "meros-1.1.4" = { + name = "meros"; + packageName = "meros"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"; - sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; + url = "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz"; + sha512 = "E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ=="; }; }; "metals-languageclient-0.4.2" = { @@ -38269,6 +38305,78 @@ let sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; }; }; + "micromark-extension-footnote-0.3.2" = { + name = "micromark-extension-footnote"; + packageName = "micromark-extension-footnote"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz"; + sha512 = "gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ=="; + }; + }; + "micromark-extension-frontmatter-0.2.2" = { + name = "micromark-extension-frontmatter"; + packageName = "micromark-extension-frontmatter"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-0.2.2.tgz"; + sha512 = "q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A=="; + }; + }; + "micromark-extension-gfm-0.3.3" = { + name = "micromark-extension-gfm"; + packageName = "micromark-extension-gfm"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz"; + sha512 = "oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A=="; + }; + }; + "micromark-extension-gfm-autolink-literal-0.5.7" = { + name = "micromark-extension-gfm-autolink-literal"; + packageName = "micromark-extension-gfm-autolink-literal"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz"; + sha512 = "ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw=="; + }; + }; + "micromark-extension-gfm-strikethrough-0.6.5" = { + name = "micromark-extension-gfm-strikethrough"; + packageName = "micromark-extension-gfm-strikethrough"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz"; + sha512 = "PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw=="; + }; + }; + "micromark-extension-gfm-table-0.4.3" = { + name = "micromark-extension-gfm-table"; + packageName = "micromark-extension-gfm-table"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz"; + sha512 = "hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA=="; + }; + }; + "micromark-extension-gfm-tagfilter-0.3.0" = { + name = "micromark-extension-gfm-tagfilter"; + packageName = "micromark-extension-gfm-tagfilter"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz"; + sha512 = "9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q=="; + }; + }; + "micromark-extension-gfm-task-list-item-0.3.3" = { + name = "micromark-extension-gfm-task-list-item"; + packageName = "micromark-extension-gfm-task-list-item"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz"; + sha512 = "0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ=="; + }; + }; "micromark-extension-mdx-0.2.1" = { name = "micromark-extension-mdx"; packageName = "micromark-extension-mdx"; @@ -38989,22 +39097,22 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.3.0" = { + "mobx-6.3.2" = { name = "mobx"; packageName = "mobx"; - version = "6.3.0"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.0.tgz"; - sha512 = "Aa1+VXsg4WxqJMTQfWoYuJi5UD10VZhiobSmcs5kcmI3BIT0aVtn7DysvCeDADCzl7dnbX+0BTHUj/v7gLlZpQ=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.2.tgz"; + sha512 = "xGPM9dIE1qkK9Nrhevp0gzpsmELKU4MFUJRORW/jqxVFIHHWIoQrjDjL8vkwoJYY3C2CeVJqgvl38hgKTalTWg=="; }; }; - "mobx-react-7.1.0" = { + "mobx-react-7.2.0" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.1.0.tgz"; - sha512 = "DxvA6VXmnZ+N9f/UTtolWtdRnAAQY2iHWTSPLktfpj8NKlXUe4dabBAjuXrBcZUM8GjLWnxD1ZEjssXq1M0RAw=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.0.tgz"; + sha512 = "KHUjZ3HBmZlNnPd1M82jcdVsQRDlfym38zJhZEs33VxyVQTvL77hODCArq6+C1P1k/6erEeo2R7rpE7ZeOL7dg=="; }; }; "mobx-react-lite-3.2.0" = { @@ -39034,13 +39142,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.3.2" = { + "mocha-8.4.0" = { name = "mocha"; packageName = "mocha"; - version = "8.3.2"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; - sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz"; + sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; "mock-require-3.0.3" = { @@ -39106,13 +39214,13 @@ let sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; }; }; - "moize-6.0.2" = { + "moize-6.0.3" = { name = "moize"; packageName = "moize"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-6.0.2.tgz"; - sha512 = "94jF5aP4ul90e24fFe+covFPp4u5bGzlcGUsn0u6fZgKcnQpJ9e1nX75vxqtlyOUr92ww3DPMF+ziE4OQOkkkA=="; + url = "https://registry.npmjs.org/moize/-/moize-6.0.3.tgz"; + sha512 = "7Jz9TSiqW9G2u8HwUWnaBQMFMPLblrWKEiWN4BA/GPOfQlsnfQqq0yRnTGHckGPlKApA9Eu1HPb/eTqvK9EtKg=="; }; }; "mold-source-map-0.4.0" = { @@ -39286,13 +39394,13 @@ let sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; - "mqtt-packet-6.9.1" = { + "mqtt-packet-6.10.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.9.1.tgz"; - sha512 = "0+u0ZoRj6H6AuzNY5d8qzXzyXmFI19gkdPRA14kGfKvbqYcpOL+HWUGHjtCxHqjm8CscwsH+dX0+Rxx4se5HSA=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; + sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; "mri-1.1.6" = { @@ -39448,13 +39556,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.2.2" = { + "multicast-dns-7.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.2.tgz"; - sha512 = "XqSMeO8EWV/nOXOpPV8ztIpNweVfE1dSpz6SQvDPp71HD74lMXjt4m/mWB1YBMG0kHtOodxRWc5WOb/UNN1A5g=="; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.3.tgz"; + sha512 = "TzxgGSLRLB7tqAlzjgd2x2ZE0cDsGFq4rs9W4yE5xp+7hlRXeUQGtXZsTGfGw2FwWB45rfe8DtXMYBpZGMLUng=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -39529,13 +39637,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.7.1" = { + "multiserver-3.7.2" = { name = "multiserver"; packageName = "multiserver"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.1.tgz"; - sha512 = "wc+s3NNXjYEFT6AmeW8fVVBTZWhfwwbFU0M0KurZH6jAbsnWYQnEsnN90iqFkSmHkAnPW2hvT4O+lAfWsf/lVQ=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.2.tgz"; + sha512 = "RaRSN/g1QOujNkFtmLU52PCjjqUdhad7FO/aZRRTzWkpJuclk0jfWtvew9jKp0mNqC6RhriEm0U1L1qYiymF8Q=="; }; }; "multiserver-address-1.0.1" = { @@ -39682,13 +39790,13 @@ let sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; - "muxrpc-6.5.2" = { + "muxrpc-6.5.3" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.2.tgz"; - sha512 = "fgYhBfzevyUbwsB8YBlrnmzZOGxWv6OiAUNKQYwPLqbophsZ+GT8STKrCVHCYNjUx6btxFA5+BJPUCFMecyaSA=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.3.tgz"; + sha512 = "Q8NfvPB27T6KlAtEsy0g5Sz+HlfrMZMLcrhlb5nTfY4FMMsQAIM63FZvgInKqV6ENkSWuTOdqH4aUZosUXJCLA=="; }; }; "muxrpc-usage-2.1.0" = { @@ -39826,6 +39934,15 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; + "nanoassert-2.0.0" = { + name = "nanoassert"; + packageName = "nanoassert"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz"; + sha512 = "7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA=="; + }; + }; "nanobus-4.5.0" = { name = "nanobus"; packageName = "nanobus"; @@ -39862,13 +39979,13 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.1.22" = { + "nanoid-3.1.23" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.22"; + version = "3.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz"; - sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; "nanolru-1.0.0" = { @@ -39988,13 +40105,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.1.0" = { + "ncjsm-4.2.0" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.1.0.tgz"; - sha512 = "YElRGtbz5iIartetOI3we+XAkcGE29F0SdNC0qRy500/u4WceQd2z9Nhlx24OHmIDIKz9MHdJwf/fkSG0hdWcQ=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.2.0.tgz"; + sha512 = "L2Qij4PTy7Bs4TB24zs7FLIAYJTaR5JPvSig5hIcO059LnMCNgy6MfHHNyg8s/aekPKrTqKX90gBGt3NNGvhdw=="; }; }; "nconf-0.10.0" = { @@ -40250,22 +40367,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-6.1.20" = { + "netlify-7.0.0" = { name = "netlify"; packageName = "netlify"; - version = "6.1.20"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.1.20.tgz"; - sha512 = "a0WYQIcJIIEmK7MxUWD/4awyBeGTukolaTgl84SILrnT6WC/HQqK8bIEPVJ5IhmbZioJIcl4UZMaDyWuPin6Kw=="; + url = "https://registry.npmjs.org/netlify/-/netlify-7.0.0.tgz"; + sha512 = "s454O7JRqrIo90c6rX+um1Xp7B0dGZBAYaIXYtA3em8DXJ0uWoglDeQSul8qGT1goAAF/9oMPo0T9KTM/XrjqA=="; }; }; - "netlify-redirect-parser-3.0.17" = { + "netlify-redirect-parser-3.0.29" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.17"; + version = "3.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.17.tgz"; - sha512 = "tKAVgpZg2CmNi9QMmdeoN10FTvsXKX5m+dw+ytdN9hVXGy+CWeCN5d0jqIL7wPl6iCXu3MXIIQGC78Q6BB8WJw=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.29.tgz"; + sha512 = "+lP4IG30CEpjlUaJM7hs/AW84gxkP0svvE80WJOcgB20lilPDkS6K3qeLlybjH/YznzomHZ0EF5Ydr/9d5I99A=="; }; }; "netlify-redirector-0.2.1" = { @@ -40376,13 +40493,13 @@ let sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; }; - "nextgen-events-1.3.4" = { + "nextgen-events-1.4.0" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.4.tgz"; - sha512 = "umMRD9VOvQ7+AeCvMETA7tekqrzG0xOX2HLrpyZRuW+4NlXR5baZwY/CP7Sq3x1BkKCIa1KnI1m2+Fs+fJpOiQ=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.4.0.tgz"; + sha512 = "bwSpShfuLg/lcRFokZvtUcrn5kumy6uRI6Jc+QWzH+bW6ZRdog7LfwAwhqeTzVfsprZgDGrctr6rO5aJhcdAfg=="; }; }; "nice-try-1.0.5" = { @@ -40466,22 +40583,22 @@ let sha512 = "mYihjs47X5+N71CN3P+QBrEIBuclIfMMpgWEpkmLqFPvrOXdzokvDlhbLfjdBNZOqYgniaeZC6J1ZCgxFdyvXw=="; }; }; - "no-cliches-0.3.2" = { + "no-cliches-0.3.4" = { name = "no-cliches"; packageName = "no-cliches"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.3.2.tgz"; - sha512 = "zPpIr24OdcdM6lbg9QbFUGaLx9RueAkg1I4ZueuuB5452ZrxYfdwaBkhLGFCgpy3AaQ1w8HaY/8k2HmeyD9FXw=="; + url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.3.4.tgz"; + sha512 = "oUqnng1vhKLaA4GR+OzVbLuZZ7OOguKCtMHxHMiyP8+9mXidKfoCyc030LbAyNI3xcgCHHyitK3Q8wP+w6DwVQ=="; }; }; - "node-abi-2.26.0" = { + "node-abi-2.30.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.26.0"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz"; - sha512 = "ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz"; + sha512 = "g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg=="; }; }; "node-addon-api-1.7.2" = { @@ -40520,13 +40637,13 @@ let sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="; }; }; - "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=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; }; "node-appc-1.1.2" = { @@ -40638,15 +40755,6 @@ let sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; }; }; - "node-fetch-2.2.0" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz"; - sha512 = "OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="; - }; - }; "node-fetch-2.6.1" = { name = "node-fetch"; packageName = "node-fetch"; @@ -40728,6 +40836,15 @@ let sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; }; + "node-gyp-8.1.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.1.0.tgz"; + sha512 = "o2elh1qt7YUp3lkMwY3/l4KF3j/A3fI/Qt4NH+CQQgPJdqGE9y7qnP84cjIWN27Q0jJkrSAhCVDg+wBVNBYdBg=="; + }; + }; "node-gyp-build-3.9.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -40827,13 +40944,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.1" = { + "node-object-hash-2.3.2" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.1.tgz"; - sha512 = "ab7pm34jqISawXpJ+fHjj2E9CmzDtm2fTTdurgzbWXIrdTEk2q2cSZRzoeGrwa0cvq6Sqezq6S9bhOBYPHRzuQ=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.2.tgz"; + sha512 = "QsV+vb6Kegh1V9eKeLJf2swNGkhH1sBtGWQz1fmwknGylbsyUt60iDIJWyGq2DeBRtuywdb+xXJydKa9BFNxTA=="; }; }; "node-persist-2.1.0" = { @@ -40890,15 +41007,6 @@ let sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; }; }; - "node-pre-gyp-0.15.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz"; - sha512 = "7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA=="; - }; - }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -40944,13 +41052,13 @@ let sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw=="; }; }; - "node-releases-1.1.71" = { + "node-releases-1.1.72" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.71"; + version = "1.1.72"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; - sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz"; + sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; }; }; "node-source-walk-4.2.0" = { @@ -41268,13 +41376,13 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; "now-and-later-2.0.1" = { @@ -41385,15 +41493,6 @@ let sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; }; }; - "npm-package-arg-8.1.0" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz"; - sha512 = "/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig=="; - }; - }; "npm-package-arg-8.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -41412,22 +41511,13 @@ let sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; - "npm-packlist-2.1.5" = { + "npm-packlist-2.2.2" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.5.tgz"; - sha512 = "KCfK3Vi2F+PH1klYauoQzg81GQ8/GGjQRKYY6tRnpQUPKTs/1gBZSRWtTEd7jGdSn1LZL7gpAmJT+BcS55k2XQ=="; - }; - }; - "npm-pick-manifest-6.1.0" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz"; - sha512 = "ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz"; + sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; }; }; "npm-pick-manifest-6.1.1" = { @@ -41466,13 +41556,13 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-10.1.1" = { + "npm-registry-fetch-10.1.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz"; - sha512 = "F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz"; + sha512 = "KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA=="; }; }; "npm-registry-fetch-9.0.0" = { @@ -41592,6 +41682,15 @@ let sha1 = "201095a487e1ad36081b3432fa3cada4f8d071b0"; }; }; + "nullthrows-1.1.1" = { + name = "nullthrows"; + packageName = "nullthrows"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz"; + sha512 = "2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="; + }; + }; "num-sort-2.1.0" = { name = "num-sort"; packageName = "num-sort"; @@ -41845,22 +41944,22 @@ let sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-hash-2.1.1" = { + "object-hash-2.2.0" = { name = "object-hash"; packageName = "object-hash"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; - sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"; + sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; - "object-inspect-1.10.2" = { + "object-inspect-1.10.3" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz"; - sha512 = "gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz"; + sha512 = "e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="; }; }; "object-inspect-1.4.1" = { @@ -41971,22 +42070,13 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.entries-1.1.3" = { + "object.entries-1.1.4" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz"; - sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; - }; - }; - "object.fromentries-2.0.4" = { - name = "object.fromentries"; - packageName = "object.fromentries"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz"; - sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz"; + sha512 = "h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA=="; }; }; "object.getownpropertydescriptors-2.1.2" = { @@ -42034,13 +42124,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.3" = { + "object.values-1.1.4" = { name = "object.values"; packageName = "object.values"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; - sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz"; + sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; }; }; "object_values-0.1.2" = { @@ -42115,22 +42205,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "octokit-pagination-methods-1.1.0" = { - name = "octokit-pagination-methods"; - packageName = "octokit-pagination-methods"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz"; - sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; - }; - }; - "office-ui-fabric-react-7.168.0" = { + "office-ui-fabric-react-7.170.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.168.0"; + version = "7.170.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.168.0.tgz"; - sha512 = "hxH6HuNEIPVwO1ahzkVTkrARbN1vGP0W0qgbNPNcQDjnux9moyLgGcp0BzWXG6mNlTKFti/6WceCwXFjLEyPkw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.170.1.tgz"; + sha512 = "NZULXfe9I9W1THYUOFOPr7vLStRbdYNJi3+sJSRrNQHSeeGlUaFbAIOiT8g8h+3Seypk4Ybtm7vZXc6mUHx+Gw=="; }; }; "omggif-1.0.10" = { @@ -42295,13 +42376,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "oo-ascii-tree-1.29.0" = { + "oo-ascii-tree-1.30.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.29.0"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.29.0.tgz"; - sha512 = "DUwUL3Yc3lS2znWBlOi5eEU4pKoGGK2IaB/S7XygSBzmSS2jJE6+waAip17FNeNXfC4aXClr95HxZXamCLtYqQ=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.30.0.tgz"; + sha512 = "TzXuoCnha2QHFcAR+8+tBgD7Wnn6Uh+P3aZMoXKDJ3CVLXFnTnzHy4WMmmz01pTfv+f5haQMjhL9OIFJLEZ5kA=="; }; }; "opal-runtime-1.0.11" = { @@ -42358,15 +42439,6 @@ let sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; }; }; - "open-7.4.0" = { - name = "open"; - packageName = "open"; - version = "7.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz"; - sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; - }; - }; "open-7.4.2" = { name = "open"; packageName = "open"; @@ -42376,13 +42448,31 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.0.6" = { + "open-8.0.2" = { name = "open"; packageName = "open"; - version = "8.0.6"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.0.6.tgz"; - sha512 = "vDOC0KwGabMPFtIpCO2QOnQeOz0N2rEkbuCuxICwLMUCrpv+A7NHrrzJ2dQReJmVluHhO4pYRh/Pn6s8t7Op6Q=="; + url = "https://registry.npmjs.org/open/-/open-8.0.2.tgz"; + sha512 = "NV5QmWJrTaNBLHABJyrb+nd5dXI5zfea/suWawBhkHzAbVhLLiJdrqMgxMypGK9Eznp2Ltoh7SAVkQ3XAucX7Q=="; + }; + }; + "open-8.1.0" = { + name = "open"; + packageName = "open"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.1.0.tgz"; + sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw=="; + }; + }; + "open-8.2.0" = { + name = "open"; + packageName = "open"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.2.0.tgz"; + sha512 = "O8uInONB4asyY3qUcEytpgwxQG3O0fJ/hlssoUHsBboOIRVZzT6Wq+Rwj5nffbeUhOdMjpXeISpDDzHCMRDuOQ=="; }; }; "openapi-default-setter-2.1.0" = { @@ -42493,13 +42583,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.0.0-beta.18" = { + "openapi-sampler-1.0.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0-beta.18"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.18.tgz"; - sha512 = "nG/0kvvSY5FbrU5A+Dbp1xTQN++7pKIh87/atryZlxrzDuok5Y6TCbpxO1jYqpUKLycE4ReKGHCywezngG6xtQ=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0.tgz"; + sha512 = "HysKj4ZuLk0RpZkopao5SIupUX8LMOTsEDTw9dSzcRv6BBW6Ep1IdbKwYsCrYM9tnw4VZtebR/N5sJHY6qqRew=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -42583,13 +42673,13 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; - "openapi3-ts-1.4.0" = { + "openapi3-ts-2.0.1" = { name = "openapi3-ts"; packageName = "openapi3-ts"; - version = "1.4.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-1.4.0.tgz"; - sha512 = "8DmE2oKayvSkIR3XSZ4+pRliBsx19bSNeIzkTPswY8r4wvjX86bMxsORdqwAwMxE8PefOcSAT2auvi/0TZe9yA=="; + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.1.tgz"; + sha512 = "v6X3iwddhi276siej96jHGIqTx3wzVfMTmpGJEQDt7GPI7pI6sywItURLzpEci21SBRpPN/aOWSF5mVfFVNmcg=="; }; }; "opencollective-1.0.3" = { @@ -42709,13 +42799,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "optimize-css-assets-webpack-plugin-5.0.4" = { + "optimize-css-assets-webpack-plugin-5.0.6" = { name = "optimize-css-assets-webpack-plugin"; packageName = "optimize-css-assets-webpack-plugin"; - version = "5.0.4"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz"; - sha512 = "wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A=="; + url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.6.tgz"; + sha512 = "JAYw7WrIAIuHWoKeSBB3lJ6ZG9PSDK3JJduv/FMpIY060wvbA8Lqn/TCtxNGICNlg0X5AGshLzIhpYrkltdq+A=="; }; }; "optional-0.1.4" = { @@ -42817,15 +42907,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.1.1" = { - name = "ora"; - packageName = "ora"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; - sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; - }; - }; "ora-5.1.0" = { name = "ora"; packageName = "ora"; @@ -42880,15 +42961,6 @@ let sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; - "os-0.1.1" = { - name = "os"; - packageName = "os"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/os/-/os-0.1.1.tgz"; - sha1 = "208845e89e193ad4d971474b93947736a56d13f3"; - }; - }; "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; @@ -42988,22 +43060,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.4" = { + "ot-builder-1.0.7" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.4.tgz"; - sha512 = "M8FhdQrpsHAQo+qYcAmnrl14HvXcew4M5tZCsQk4GZfeYVPr8TJZPwiHXScYbqH9+uNrU5U8tRjgHi44inVxxw=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.7.tgz"; + sha512 = "VhBztvKbf4PfsWIePHVzRhcstXWNv4StU7AqYpypzG/vxXbuRxamROSgHxklY2iDivLUbZWXIgxP5yeThQO4UQ=="; }; }; - "otb-ttc-bundle-1.0.4" = { + "otb-ttc-bundle-1.0.7" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.4.tgz"; - sha512 = "EnGZoAtvzLKM+kO3VZSavt11FzVIDQQq5o3s66LMvJZ2LdHbZg1L9WdAvnZjY2+SXdtLEo6VNlL1gP4l9ovRjw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.7.tgz"; + sha512 = "j6HyPSsOuDFLSupDEyXcg8XcaVTlO6L9RDyeq1pSDuMUhF0zqJIMLvNC0CyXmjYuzq43VALjMgT18y7A//O34g=="; }; }; "ow-0.21.0" = { @@ -43060,13 +43132,13 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; - "p-cancelable-2.1.0" = { + "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz"; - sha512 = "HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; "p-debounce-1.0.0" = { @@ -43519,13 +43591,13 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.2.4" = { + "pacote-11.3.2" = { name = "pacote"; packageName = "pacote"; - version = "11.2.4"; + version = "11.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz"; - sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.2.tgz"; + sha512 = "lMO7V9aMhyE5gfaSFxKfW3OTdXuFBNQJfuNuet3NPzWWhOYIW90t85vHcHLDjdhgmfAdAHyh9q1HAap96ea0XA=="; }; }; "pacote-11.3.3" = { @@ -43573,13 +43645,13 @@ let sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; - "papaparse-4.6.0" = { + "papaparse-5.2.0" = { name = "papaparse"; packageName = "papaparse"; - version = "4.6.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/papaparse/-/papaparse-4.6.0.tgz"; - sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; + url = "https://registry.npmjs.org/papaparse/-/papaparse-5.2.0.tgz"; + sha512 = "ylq1wgUSnagU+MKQtNeVqrPhZuMYBvOSL00DHycFTCxownF95gpLAk1HiHdUW77N8yxRq1qHXLdlIPyBSG9NSA=="; }; }; "parallel-transform-1.2.0" = { @@ -44347,13 +44419,13 @@ let sha512 = "CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA=="; }; }; - "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-platform-0.11.15" = { @@ -44455,6 +44527,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "path2-0.1.0" = { + name = "path2"; + packageName = "path2"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path2/-/path2-0.1.0.tgz"; + sha1 = "639828942cdbda44a41a45b074ae8873483b4efa"; + }; + }; "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; @@ -44572,13 +44653,13 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "perfect-scrollbar-1.5.0" = { + "perfect-scrollbar-1.5.1" = { name = "perfect-scrollbar"; packageName = "perfect-scrollbar"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz"; - sha512 = "NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA=="; + url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz"; + sha512 = "MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ=="; }; }; "performance-now-0.2.0" = { @@ -44698,6 +44779,15 @@ let sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; }; }; + "picomatch-2.3.0" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + }; "picture-tuber-1.0.2" = { name = "picture-tuber"; packageName = "picture-tuber"; @@ -44842,15 +44932,6 @@ let sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg=="; }; }; - "pipeline-pipe-0.1.5" = { - name = "pipeline-pipe"; - packageName = "pipeline-pipe"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pipeline-pipe/-/pipeline-pipe-0.1.5.tgz"; - sha512 = "HFub9yAfxEWBZZmsA12dWiFpg9+er8Sp7bpVwKP41AsAeO6570PVhU2Ckkt8fMnHBwm1edLLg2wIfpNGCDvI0Q=="; - }; - }; "pipeworks-1.3.1" = { name = "pipeworks"; packageName = "pipeworks"; @@ -45779,13 +45860,13 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; - "postcss-selector-parser-6.0.5" = { + "postcss-selector-parser-6.0.6" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; - sha512 = "aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; }; }; "postcss-svgo-4.0.3" = { @@ -46049,13 +46130,13 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.2.1" = { + "prettier-2.3.0" = { name = "prettier"; packageName = "prettier"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"; - sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz"; + sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; }; "prettier-bytes-1.0.4" = { @@ -46085,13 +46166,22 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-svelte-2.2.0" = { + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; + "prettier-plugin-svelte-2.3.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.2.0.tgz"; - sha512 = "Xdmqgr71tAuMqqzNCK52/v94g/Yv7V7lz+nmbO9NEA+9ol15VV3uUHOfydMNOo3SWvFaVlBcp947ebEaMWqVfQ=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.3.0.tgz"; + sha512 = "HTzXvSq7lWFuLsSaxYOUkGkVNCl3RrSjDCOgQjkBX5FQGmWjL8o3IFACSGhjPMMfWKADpapAr0zdbBWkND9mqw=="; }; }; "prettier-stylelint-0.4.2" = { @@ -46436,6 +46526,15 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; + "prom-client-13.1.0" = { + name = "prom-client"; + packageName = "prom-client"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz"; + sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; + }; + }; "promiscuous-0.6.0" = { name = "promiscuous"; packageName = "promiscuous"; @@ -46535,15 +46634,6 @@ let sha1 = "2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4"; }; }; - "promise-retry-1.1.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; - sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; - }; - }; "promise-retry-2.0.1" = { name = "promise-retry"; packageName = "promise-retry"; @@ -46724,13 +46814,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protobufjs-6.10.2" = { + "protobufjs-6.11.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "6.10.2"; + version = "6.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz"; - sha512 = "27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz"; + sha512 = "4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw=="; }; }; "protocol-buffers-encodings-1.1.1" = { @@ -47624,6 +47714,15 @@ let sha1 = "a7afa2384d1e6415a5d602054126cc8de3bcbce7"; }; }; + "pull-websocket-3.4.2" = { + name = "pull-websocket"; + packageName = "pull-websocket"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-websocket/-/pull-websocket-3.4.2.tgz"; + sha512 = "hGFWC4/fzRdO2FEsyR9woVzgv/yG4PIk3RXPN4azBpomGzGQFRUORwKQDS3j7RAIy8tjvN2W+qjU8jNn2NWeNQ=="; + }; + }; "pull-window-2.1.4" = { name = "pull-window"; packageName = "pull-window"; @@ -47651,15 +47750,6 @@ let sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef"; }; }; - "pull-ws-3.3.2" = { - name = "pull-ws"; - packageName = "pull-ws"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.2.tgz"; - sha512 = "Bn4bcJsSzJGOQl4RBulDhG1FkcbDHSCXteI8Jg5k4X6X5TxVzZzKilWJ1WV2v4OnRXl2eYbtHFGsPl8Cr1xJzw=="; - }; - }; "pump-0.3.5" = { name = "pump"; packageName = "pump"; @@ -47759,6 +47849,15 @@ let sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; }; }; + "puppeteer-9.1.1" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz"; + sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; + }; + }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -47777,22 +47876,22 @@ let sha512 = "wCDN1KkAWOMXsiV0XxH/CggHqOYeXvyn00t9Zjp5RKsLZ2rzg/lLJIMAVxYLyh79T168W3fBYcG5TRRJAlQr6g=="; }; }; - "push-stream-11.0.0" = { + "push-stream-11.0.1" = { name = "push-stream"; packageName = "push-stream"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/push-stream/-/push-stream-11.0.0.tgz"; - sha512 = "rDVD2f3wOztI/59/fukGLwZkUOC55674hncsSwgKF/yLlkkL594AoWTlkF6SGF0x8O5o1j92ObXk8Cxc1llhYg=="; + url = "https://registry.npmjs.org/push-stream/-/push-stream-11.0.1.tgz"; + sha512 = "Cb5aOY6Z6JxjAKBmpmmzoJ+8I6pJlRjJ5WYoM2Vw3kSlClojmIXzA+FP0yglJ4ELokrqLX223frxJTnxUx0dpw=="; }; }; - "push-stream-to-pull-stream-1.0.3" = { + "push-stream-to-pull-stream-1.0.4" = { name = "push-stream-to-pull-stream"; packageName = "push-stream-to-pull-stream"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.3.tgz"; - sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw=="; + url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.4.tgz"; + sha512 = "W1ysxl25uU6410OGipJM0/FvlNoXvuZqIgSLGELkZ6+MaXPAp/wr2EvAYKrs1o4blzhYssv/cFXiiRJkMnnhrA=="; }; }; "pushdata-bitcoin-1.0.1" = { @@ -47804,13 +47903,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.134" = { + "pyright-1.1.144" = { name = "pyright"; packageName = "pyright"; - version = "1.1.134"; + version = "1.1.144"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.134.tgz"; - sha512 = "wQSdU6X3olAwCZy3tSA0fn8nMQGEwm01rm1dHM+aN2crzXIcUQ9sLOf+wCn5PFlLGsm/CXH7ROYmeMs3jXQ8Rw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz"; + sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg=="; }; }; "q-0.9.7" = { @@ -48533,13 +48632,13 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; - "re2-1.15.9" = { + "re2-1.16.0" = { name = "re2"; packageName = "re2"; - version = "1.15.9"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.15.9.tgz"; - sha512 = "AXWEhpMTBdC+3oqbjdU07dk0pBCvxh5vbOMLERL6Y8FYBSGn4vXlLe8cYszn64Yy7H8keVMrgPzoSvOd4mePpg=="; + url = "https://registry.npmjs.org/re2/-/re2-1.16.0.tgz"; + sha512 = "eizTZL2ZO0ZseLqfD4t3Qd0M3b3Nr0MBWpX81EbPMIud/1d/CSfUIx2GQK8fWiAeHoSekO5EOeFib2udTZLwYw=="; }; }; "react-16.14.0" = { @@ -48560,13 +48659,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.12.4" = { + "react-devtools-core-4.13.5" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.12.4"; + version = "4.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.12.4.tgz"; - sha512 = "hVCT7wRtA5xWclgLb3oA51RNBAlbuTauEYkqFX+qRAkPLVJoX8qdJnO7r+47SSUckD5vkBm3kaAhg6597m7gDA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.13.5.tgz"; + sha512 = "k+P5VSKM6P22Go9IQ8dJmjj9fbztvKt1iRDI/4wS5oTvd1EnytIJMYB59wZt+D3kgp64jklNX/MRmY42xAQ08g=="; }; }; "react-dom-16.14.0" = { @@ -48776,15 +48875,6 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-fast-1.2.2" = { - name = "read-package-json-fast"; - packageName = "read-package-json-fast"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz"; - sha512 = "39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ=="; - }; - }; "read-package-json-fast-2.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -49136,13 +49226,13 @@ let sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; }; }; - "record-cache-1.1.0" = { + "record-cache-1.1.1" = { name = "record-cache"; packageName = "record-cache"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz"; - sha512 = "u8rbtLEJV7HRacl/ZYwSBFD8NFyB3PfTTfGLP37IW3hftQCwu6z4Q2RLyxo1YJUNRTEzJfpLpGwVuEYdaIkG9Q=="; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.1.tgz"; + sha512 = "L5hZlgWc7CmGbztnemQoKE1bLu9rtI2skOB0ttE4C5+TVszLE8Rd0YLTROSgvXKLAqPumS/soyN5tJW5wJLmJQ=="; }; }; "recursive-readdir-2.2.2" = { @@ -49586,13 +49676,13 @@ let sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw=="; }; }; - "remark-frontmatter-1.3.3" = { - name = "remark-frontmatter"; - packageName = "remark-frontmatter"; - version = "1.3.3"; + "remark-footnotes-3.0.0" = { + name = "remark-footnotes"; + packageName = "remark-footnotes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz"; - sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; + url = "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-3.0.0.tgz"; + sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg=="; }; }; "remark-frontmatter-2.0.0" = { @@ -49604,6 +49694,24 @@ let sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; }; }; + "remark-frontmatter-3.0.0" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-3.0.0.tgz"; + sha512 = "mSuDd3svCHs+2PyO29h7iijIZx4plX0fheacJcAoYAASfgzgVIcXGYSq9GFyYocFLftQs8IOmmkgtOovs6d4oA=="; + }; + }; + "remark-gfm-1.0.0" = { + name = "remark-gfm"; + packageName = "remark-gfm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz"; + sha512 = "KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA=="; + }; + }; "remark-html-2.0.2" = { name = "remark-html"; packageName = "remark-html"; @@ -49649,15 +49757,6 @@ let sha512 = "XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw=="; }; }; - "remark-parse-5.0.0" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz"; - sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; - }; - }; "remark-parse-6.0.3" = { name = "remark-parse"; packageName = "remark-parse"; @@ -50117,15 +50216,6 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-1.19.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; - sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; - }; - }; "resolve-1.20.0" = { name = "resolve"; packageName = "resolve"; @@ -50648,13 +50738,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.45.2" = { + "rollup-2.50.3" = { name = "rollup"; packageName = "rollup"; - version = "2.45.2"; + version = "2.50.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.45.2.tgz"; - sha512 = "kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz"; + sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51143,13 +51233,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.11" = { + "sass-1.34.0" = { name = "sass"; packageName = "sass"; - version = "1.32.11"; + version = "1.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz"; - sha512 = "O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; + sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; }; }; "sax-0.5.8" = { @@ -51359,13 +51449,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.8" = { + "selfsigned-1.10.11" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.8"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; - sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz"; + sha512 = "aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA=="; }; }; "semaphore-async-await-1.5.1" = { @@ -51512,15 +51602,6 @@ 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"; @@ -51647,13 +51728,13 @@ let sha512 = "QnpHNykm4nI4T6mT+NoVayh9Ixl5DohYCSVqMgPJsO2WejOcqaYTh4HQOkmzaDzXH3NO5pif4z/hpo2NGtgNlg=="; }; }; - "sentence-splitter-3.2.1" = { + "sentence-splitter-3.2.2" = { name = "sentence-splitter"; packageName = "sentence-splitter"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.2.1.tgz"; - sha512 = "aG+Tf8M1wVUd2uPSUtdMXdJlKZLcdh+oVE8iEn8KwfxYZ87qDpe7+o0nGZdr+96g2H76Qz/8TrG9dIxyp7c70w=="; + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.2.2.tgz"; + sha512 = "hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug=="; }; }; "separator-escape-0.0.1" = { @@ -51782,13 +51863,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.8.2" = { + "service-runner-2.8.3" = { name = "service-runner"; packageName = "service-runner"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.2.tgz"; - sha512 = "SspUqYN+hp8fB5qhG9PbTzIPL3ze5wKXThdyUny2BIA6wdT5MljVkYUCUMQgo5xjM4e95+qU+XrsvfM2ytt6ng=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.3.tgz"; + sha512 = "oOP54jRgWE9IBeStnYI9lIdJ333HHe+8pjAvBpDmRyOXNcsvVMN22hbuX93YVlTUE87I8J80ORZ3u01DgNKMYg=="; }; }; "set-blocking-1.0.0" = { @@ -52250,13 +52331,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.38.0" = { + "simple-git-2.39.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.38.0"; + version = "2.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.38.0.tgz"; - sha512 = "CORjrfirWMEGbJAxaXDH/PjZVOeATeG2bkafM9DsLVcFkbF9sXQGIIpEI6FeyXpvUsFK69T/pa4+4FKY9TUJMQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.39.0.tgz"; + sha512 = "VOsrmc3fpp1lGVIpo+1SKNqJzrdVJeSGZCeenPKnJPNo5UouAlSkWFc037pfm9wRYtfxBdwp2deVJGCG8J6C8A=="; }; }; "simple-markdown-0.4.4" = { @@ -52376,13 +52457,13 @@ let sha1 = "81f0ad2ad645181945c80952a5c1414992ee9664"; }; }; - "siphash24-1.1.1" = { + "siphash24-1.2.0" = { name = "siphash24"; packageName = "siphash24"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz"; - sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.2.0.tgz"; + sha512 = "51yTA4ZqBY0tHTsBVGy3KAmMI7ArtwSOSmfFwJnZHFL+K76RMzZLx4m59HY5HSByjGHF3q+Fmcl8e5bMF160iQ=="; }; }; "sisteransi-1.0.5" = { @@ -52538,13 +52619,13 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; - "slugify-1.5.0" = { + "slugify-1.5.3" = { name = "slugify"; packageName = "slugify"; - version = "1.5.0"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.5.0.tgz"; - sha512 = "Q2UPZ2udzquy1ElHfOLILMBMqBEXkiD3wE75qtBvV+FsDdZZjUqPZ44vqLTejAVq+wLLHacOMcENnP8+ZbzmIA=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.5.3.tgz"; + sha512 = "/HkjRdwPY3yHJReXu38NiusZw2+LLE2SrhkWJtmlPDB1fqFSvioYj62NkPcrKiNCgRLeGcGK7QBvr1iQwybeXw=="; }; }; "smart-buffer-4.1.0" = { @@ -52682,13 +52763,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.19.3" = { + "snyk-docker-plugin-4.20.8" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.19.3"; + version = "4.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz"; - sha512 = "5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.20.8.tgz"; + sha512 = "uZ0vp2D+AYzPWzoo0jAqdK6gbUwKNPBYPKzyn6A9hBVO8guL/Y3JCq5H+7hCs6FFd0FEuD70Tsy3SNAEJyu4Fg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -52709,13 +52790,13 @@ let sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q=="; }; }; - "snyk-gradle-plugin-3.14.2" = { + "snyk-gradle-plugin-3.16.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.14.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.2.tgz"; - sha512 = "l/nivKDZz7e2wymrwP6g2WQD8qgaYeE22SnbZrfIpwGolif81U28A9FsRedwkxKyB/shrM0vGEoD3c3zI8NLBw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.0.tgz"; + sha512 = "PQegG8GOweJvUDSroysO1E0RK3MxphSUvNG5siRqGHJQ8s+dw9DddYN8kMn5+pTrfzo6zddgDPJxjqsfNR+NIw=="; }; }; "snyk-module-3.1.0" = { @@ -52727,31 +52808,31 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.25.3" = { + "snyk-mvn-plugin-2.26.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.25.3"; + version = "2.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz"; - sha512 = "JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.0.tgz"; + sha512 = "LxYNWXPJxcwbkCK+vE7t437RttEDcbsS2KJJYzFtrr6u7g26c51u9aMHYPCDAEmwjI1A28zSrh7Wp45JW4YOqg=="; }; }; - "snyk-nodejs-lockfile-parser-1.30.2" = { + "snyk-nodejs-lockfile-parser-1.34.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.30.2"; + version = "1.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz"; - sha512 = "wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.34.0.tgz"; + sha512 = "F5QjIBBu6DWHwvTYlnETJxWabTQSoKGYxyoqzurPyL60lWNQmFVid0x67tQdq0sTQOOr0p6358JI+5w634vuew=="; }; }; - "snyk-nodejs-lockfile-parser-1.32.0" = { + "snyk-nodejs-lockfile-parser-1.35.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.32.0"; + version = "1.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.32.0.tgz"; - sha512 = "FdYa/7NibnJPqBfobyw5jgI1/rd0LpMZf2W4WYYLRc2Hz7LZjKAByPjIX6qoA+lB9SC7yk5HYwWj2n4Fbg/DDw=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.35.0.tgz"; + sha512 = "fSjer9Ic8cdA2HvInUmhwbAhoLFXIokAzGB1PeGKwr0zzyfo3dSX3ReTMEbkhrEg+h0eES13px/KiiJ0EKRKMg=="; }; }; "snyk-nuget-plugin-1.21.1" = { @@ -52799,13 +52880,13 @@ let sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; }; }; - "snyk-python-plugin-1.19.8" = { + "snyk-python-plugin-1.19.9" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.8"; + version = "1.19.9"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.8.tgz"; - sha512 = "LMKVnv0J4X/qHMoKB17hMND0abWtm9wdgI4xVzrOcf2Vtzs3J87trRhwLxQA2lMoBW3gcjtTeBUvNKaxikSVeQ=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.9.tgz"; + sha512 = "vkqBJP+wOtrBKpqrFRP5EfAs5wZ/fGNI14Mb+EMnmu+ebP1ze9AnHxfiqMl/+ITzeYElZ2H5DX9sXXiqpJRhRg=="; }; }; "snyk-resolve-1.1.0" = { @@ -52898,13 +52979,13 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; - "socket.io-4.0.1" = { + "socket.io-4.1.2" = { name = "socket.io"; packageName = "socket.io"; - version = "4.0.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.0.1.tgz"; - sha512 = "g8eZB9lV0f4X4gndG0k7YZAywOg1VxYgCUspS4V+sDqsgI/duqd0AW84pKkbGj/wQwxrqrEq+VZrspRfTbHTAQ=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; + sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; }; }; "socket.io-adapter-0.2.0" = { @@ -52934,13 +53015,13 @@ let sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; }; }; - "socket.io-adapter-2.2.0" = { + "socket.io-adapter-2.3.1" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.2.0.tgz"; - sha512 = "rG49L+FwaVEwuAdeBRq49M97YI3ElVabJPzvHT9S6a2CWhDKnjSFasvwAwSYPRhQzfn4NtDIbCaGYgOCOU/rlg=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz"; + sha512 = "8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw=="; }; }; "socket.io-client-1.0.6" = { @@ -53348,6 +53429,15 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; + "source-map-resolve-0.6.0" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; + sha512 = "KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w=="; + }; + }; "source-map-support-0.4.18" = { name = "source-map-support"; packageName = "source-map-support"; @@ -53483,13 +53573,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.9" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; }; }; "spdx-license-list-6.4.0" = { @@ -53852,13 +53942,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.1.1" = { + "ssb-db2-2.1.2" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.1.tgz"; - sha512 = "6A2vLmDpz454ttFV3iVEI0qCIPYgsOlBtM3PCKn0arRvBKQ86e3Grr1/gCcx68fz8yT4fTC1o9ikWiZ/uUGIdg=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.2.tgz"; + sha512 = "FrH++v1qyoCVq9ykuyjvzvsjNEX8mpqY8DRt0bOvIENOeWTWHCA6AXlP8d6LU39CGlwjw6ftlZr4ObizYH4zSQ=="; }; }; "ssb-ebt-5.6.7" = { @@ -54086,13 +54176,13 @@ let sha512 = "XhzVmezsUJLlKxTfWlicxhiPRTEYHfJLskYQNRSnw4USqgo9LVx53+MJAhdZOYpZTW2jINR0TeetWs9M27gcbA=="; }; }; - "ssb-replicate-1.3.2" = { + "ssb-replicate-1.3.3" = { name = "ssb-replicate"; packageName = "ssb-replicate"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.2.tgz"; - sha512 = "r/34OHn5wDkVUu0UNdKdPjmd3cPDmgknA5nK+gXBZj9ugSDwmdDsfEUavGtA7hlO+He1pC4EXtBa14dqgTqJCg=="; + url = "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.3.tgz"; + sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; "ssb-sort-1.1.3" = { @@ -54140,15 +54230,6 @@ let sha512 = "Xyf2tWLnO0Z297FKag0e8IXFIpnYRWZ3FBn4dN2qlMRsOcpf0P54FPhvdcb1Es0Fm4hbhYYXa23jR+VPGPQhSg=="; }; }; - "sse-z-0.3.0" = { - name = "sse-z"; - packageName = "sse-z"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sse-z/-/sse-z-0.3.0.tgz"; - sha512 = "jfcXynl9oAOS9YJ7iqS2JMUEHOlvrRAD+54CENiWnc4xsuVLQVSgmwf7cwOTcBd/uq3XkQKBGojgvEtVXcJ/8w=="; - }; - }; "ssh-config-1.1.6" = { name = "ssh-config"; packageName = "ssh-config"; @@ -54392,22 +54473,13 @@ let sha512 = "/Kz55rgUIv2KP2MKphwYT/NCuSfAlbbMRv2ZWw7wyXayu230zdtzhxxuXXcvsc6EmmhS8bSJl3uS1wmMHFumbA=="; }; }; - "statsd-client-0.4.5" = { + "statsd-client-0.4.6" = { name = "statsd-client"; packageName = "statsd-client"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.5.tgz"; - sha512 = "tmTpFMxpBcq92CTMq81d1W47GEazy76Hi+aNKvKJloMplQZe+L1jekSg95YG8ieq6j2Q9MboCaLIMdsF20+eGg=="; - }; - }; - "statsd-parser-0.0.4" = { - name = "statsd-parser"; - packageName = "statsd-parser"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz"; - sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.6.tgz"; + sha512 = "OL3PAf0LhlFP8ZpxFm3Ue7dL3cV5o7PAsWDsQnx/iKXGVr8huYF/ui+OZEORerEDVRps7BCPAq5bWppMj1oMoA=="; }; }; "statuses-1.4.0" = { @@ -54950,15 +55022,6 @@ let sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; }; }; - "string.prototype.matchall-4.0.4" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; - sha512 = "pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ=="; - }; - }; "string.prototype.repeat-0.2.0" = { name = "string.prototype.repeat"; packageName = "string.prototype.repeat"; @@ -55454,13 +55517,13 @@ let sha512 = "CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA=="; }; }; - "styled-components-5.2.3" = { + "styled-components-5.3.0" = { name = "styled-components"; packageName = "styled-components"; - version = "5.2.3"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.3.tgz"; - sha512 = "BlR+KrLW3NL1yhvEB+9Nu9Dt51CuOnHoxd+Hj+rYPdtyR8X11uIW9rvhpy3Dk4dXXBsiW1u5U78f00Lf/afGoA=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.0.tgz"; + sha512 = "bPJKwZCHjJPf/hwTJl6TbkSZg/3evha+XPEizrZUGb535jLImwDUdjTNxXqjjaASt2M4qO4AVfoHJNe3XB/tpQ=="; }; }; "stylehacks-4.0.3" = { @@ -55472,13 +55535,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.13.0" = { + "stylelint-13.13.1" = { name = "stylelint"; packageName = "stylelint"; - version = "13.13.0"; + version = "13.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.0.tgz"; - sha512 = "jvkM1iuH88vAvjdKPwPm6abiMP2/D/1chbfb+4GVONddOOskHuCXc0loyrLdxO1AwwH6jdnjYskkTKHQD7cXwQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz"; + sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; }; "stylelint-8.4.0" = { @@ -55778,31 +55841,31 @@ let sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; - "svelte-3.35.0" = { + "svelte-3.38.2" = { name = "svelte"; packageName = "svelte"; - version = "3.35.0"; + version = "3.38.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.35.0.tgz"; - sha512 = "gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.38.2.tgz"; + sha512 = "q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg=="; }; }; - "svelte-preprocess-4.6.9" = { + "svelte-preprocess-4.7.3" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.6.9"; + version = "4.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.6.9.tgz"; - sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.3.tgz"; + sha512 = "Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA=="; }; }; - "svelte2tsx-0.1.188" = { + "svelte2tsx-0.2.0" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.188"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.188.tgz"; - sha512 = "+clvG/h9Z02fhx8sxDruKppheCcAXWhkKNjz9f3R4jdwVJgTHbr66qgewIjN1i2Id3D9tBKnKgaghm8H1W55sA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.2.0.tgz"; + sha512 = "gag/5eqXOMfeHkPWbioEz2kk01KJpG2ZVxYMV35EWMGpxR4m6jzgNPkl7bYp5fEOuHQ99muyVQFIedu4wjgmZw=="; }; }; "sver-compat-1.5.0" = { @@ -55931,13 +55994,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.47.1" = { + "swagger-ui-dist-3.49.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.47.1.tgz"; - sha512 = "7b9iHDC/GGC9SJLd3HiV/3EnsJ3wu7xN8Q4MpOPfQO8UG7TQFG2TMTDkvvy0SNeqxQY0tGQY0ppZC9a95tW3kg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.49.0.tgz"; + sha512 = "R1+eT16XNP1bBLfacISifZAkFJlpwvWsS2vVurF5pbIFZnmCasD/hj+9r/q7urYdQyb0B6v11mDnuYU7rUpfQg=="; }; }; "swagger2openapi-6.2.3" = { @@ -56039,6 +56102,15 @@ let sha512 = "6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q=="; }; }; + "symbol-observable-4.0.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz"; + sha512 = "b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -56066,13 +56138,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.20" = { + "systeminformation-4.34.23" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.20"; + version = "4.34.23"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.20.tgz"; - sha512 = "KyT3TFxs14x9CvSbNukbBq2DIjhuLHXkBjZ6Pqllnzqt3ERxDdC6SwIBiKnXeMq6NAOfx1Dp9PjPtXtnIFuAow=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.23.tgz"; + sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; "table-3.8.3" = { @@ -56111,31 +56183,22 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.0.9" = { + "table-6.7.0" = { name = "table"; packageName = "table"; - version = "6.0.9"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.9.tgz"; - sha512 = "F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ=="; + url = "https://registry.npmjs.org/table/-/table-6.7.0.tgz"; + sha512 = "SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw=="; }; }; - "table-6.4.0" = { + "table-6.7.1" = { name = "table"; packageName = "table"; - version = "6.4.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.4.0.tgz"; - sha512 = "/Vfr23BDjJT2kfsCmYtnJqEPdD/8Dh/MDIQxfcbe+09lZUel6gluquwdMTrLERBw623Nv34DLGZ11krWn5AAqw=="; - }; - }; - "table-6.5.1" = { - name = "table"; - packageName = "table"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.5.1.tgz"; - sha512 = "xGDXWTBJxahkzPQCsn1S9ESHEenU7TbMD5Iv4FeopXv/XwJyWatFjfbor+6ipI10/MNPXBYUamYukOrbPZ9L/w=="; + url = "https://registry.npmjs.org/table/-/table-6.7.1.tgz"; + sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; }; "table-layout-0.4.5" = { @@ -56463,15 +56526,6 @@ let sha512 = "s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg=="; }; }; - "temp-0.9.1" = { - name = "temp"; - packageName = "temp"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; - sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; - }; - }; "temp-0.9.4" = { name = "temp"; packageName = "temp"; @@ -56553,6 +56607,24 @@ let sha512 = "vXPxwOyaNVi9nyczO16mxmHGpl6ASC5/TVhRRHpqeYHvKQm58EaWNvZXxAhR0lYYnBOQFjXjhzeLsaXdjxLjRg=="; }; }; + "tempy-1.0.1" = { + name = "tempy"; + packageName = "tempy"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz"; + sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; + }; + }; + "tencent-serverless-http-1.3.2" = { + name = "tencent-serverless-http"; + packageName = "tencent-serverless-http"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tencent-serverless-http/-/tencent-serverless-http-1.3.2.tgz"; + sha512 = "HgIu9HuBdY0lx3jLKuicOSOrjmieklPh55x8ZmtuTnrZ5v1buAPUfLKBhTeBSz6e90ggyW+dPr5PWdz179kUkw=="; + }; + }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -56616,13 +56688,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.6.1" = { + "terser-5.7.0" = { name = "terser"; packageName = "terser"; - version = "5.6.1"; + version = "5.7.0"; 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.7.0.tgz"; + sha512 = "HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -56652,13 +56724,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.1.1" = { + "terser-webpack-plugin-5.1.2" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"; - sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz"; + sha512 = "6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q=="; }; }; "test-exclude-6.0.0" = { @@ -56724,13 +56796,13 @@ let sha1 = "be68d47a5146b16dd116278c9aeb7bd35631ccda"; }; }; - "textlint-rule-helper-2.1.1" = { + "textlint-rule-helper-2.2.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.1.1.tgz"; - sha512 = "6fxgHzoJVkjl3LaC1b2Egi+5wbhG4i0pU0knJmQujVhxIJ3D3AcQQZPs457xKAi5xKz1WayYeTeJ5jrD/hnO7g=="; + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.2.0.tgz"; + sha512 = "9S5CsgQuQwPjM2wvr4JGdpkLf+pR9gOjedSQFa/Dkrbh+D9MXt1LIR4Jvx1RujKtt2nq42prmEX2q3xOxyUcIQ=="; }; }; "textlint-util-to-string-2.1.1" = { @@ -57534,13 +57606,13 @@ let sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; }; }; - "too-wordy-0.3.1" = { + "too-wordy-0.3.4" = { name = "too-wordy"; packageName = "too-wordy"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.3.1.tgz"; - sha512 = "qfKDd/kxLEmbOqdtWnp/Gw1EEvW5ONZB3HehzkHNKFIx3bUrfda6qdOzxJ74vkaIaJbZyRFkBHkbY078fjAd5A=="; + url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.3.4.tgz"; + sha512 = "EU+UA4zHc06TkVQaravNNVdqX763/ENTIOKiKlqSJ6WKCPwLxHjvY3d0uEJYaq92iojyHPwD2iaYbZKjdw3icA=="; }; }; "topo-2.0.2" = { @@ -57723,13 +57795,13 @@ let sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; }; }; - "tr46-2.0.2" = { + "tr46-2.1.0" = { name = "tr46"; packageName = "tr46"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz"; - sha512 = "3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg=="; + url = "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"; + sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; "transliteration-1.6.6" = { @@ -57840,13 +57912,13 @@ let sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; }; }; - "trim-newlines-3.0.0" = { + "trim-newlines-3.0.1" = { name = "trim-newlines"; packageName = "trim-newlines"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz"; - sha512 = "C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA=="; + 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" = { @@ -58155,15 +58227,6 @@ let sha1 = "ac9f4ba7bd04525d6bd8b087f85553c8ef19dc9e"; }; }; - "tunnel-0.0.4" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; - sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; - }; - }; "tunnel-0.0.6" = { name = "tunnel"; packageName = "tunnel"; @@ -58452,6 +58515,15 @@ let sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; }; + "type-fest-1.1.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-1.1.3.tgz"; + sha512 = "CsiQeFMR1jZEq8R+H59qe+bBevnjoV5N2WZTTdlyqxeoODQOOepN2+msQOywcieDq5sBjabKzTn3U+sfHZlMdw=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -58461,13 +58533,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-rest-client-1.2.0" = { + "typed-rest-client-1.8.4" = { name = "typed-rest-client"; packageName = "typed-rest-client"; - version = "1.2.0"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz"; - sha512 = "FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw=="; + url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz"; + sha512 = "MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg=="; }; }; "typedarray-0.0.6" = { @@ -58515,13 +58587,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.2.4" = { + "typegram-3.3.1" = { name = "typegram"; packageName = "typegram"; - version = "3.2.4"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.2.4.tgz"; - sha512 = "UkWgXIXZYwXK0q6zyZ4xtlETAmmgAt1Y4EFL5Ia87bIort1HHBw+RAMnO7eC1PYogCAKPSCeCSBAZVIoxQ/Dvw=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.3.1.tgz"; + sha512 = "Y1bR17IZ9Shj1Ih8wTLtrmOOMHJ20ve0Bd5SPymmw53uO4WLp/JjNM55s2b6PEziBvMISRdCQSZ+m6JiUKEobA=="; }; }; "typescript-2.9.2" = { @@ -58587,13 +58659,13 @@ let sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; }; }; - "typescript-4.2.4" = { + "typescript-4.3.2" = { name = "typescript"; packageName = "typescript"; - version = "4.2.4"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; - sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz"; + sha512 = "zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -58695,13 +58767,13 @@ let sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; }; }; - "uglify-js-3.13.4" = { + "uglify-js-3.13.8" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.4"; + version = "3.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.4.tgz"; - sha512 = "kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; + sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; }; }; "uglify-js-3.4.10" = { @@ -58893,13 +58965,13 @@ let sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A=="; }; }; - "underscore-1.10.2" = { + "underscore-1.12.1" = { name = "underscore"; packageName = "underscore"; - version = "1.10.2"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz"; - sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; + sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; "underscore-1.13.1" = { @@ -58938,15 +59010,6 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; @@ -59397,6 +59460,15 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; + "unist-util-stringify-position-3.0.0" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; + sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; + }; + }; "unist-util-visit-1.4.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; @@ -59460,15 +59532,6 @@ let sha512 = "3DLtXdm/G1LQMCnPj+Aw7uDoleQttNHp2g5FnNQKR6cP6taNWS1b/Ehjjx4PVyvejKi3TJyu8iBraKM4q3JQPg=="; }; }; - "universal-user-agent-4.0.1" = { - name = "universal-user-agent"; - packageName = "universal-user-agent"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz"; - sha512 = "LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg=="; - }; - }; "universal-user-agent-6.0.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; @@ -59973,13 +60036,13 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; - "usb-1.7.0" = { + "usb-1.7.1" = { name = "usb"; packageName = "usb"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.7.0.tgz"; - sha512 = "LHm9d389NCzZSMd0DnilxT5Lord4P2E3ETwP1LeuJcEBmI5uLJv8Sd18z/9bairUMbDnnNqX+Hi5Xkl93Kvdmw=="; + url = "https://registry.npmjs.org/usb/-/usb-1.7.1.tgz"; + sha512 = "HTCfx6NnNRhv5y98t04Y8j2+A8dmQnEGxCMY2/zN/0gkiioLYfTZ5w/PEKlWRVUY+3qLe9xwRv9pHLkjQYNw/g=="; }; }; "use-3.1.1" = { @@ -60028,13 +60091,13 @@ let sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ=="; }; }; - "ut_pex-2.0.1" = { + "ut_pex-3.0.0" = { name = "ut_pex"; packageName = "ut_pex"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.1.tgz"; - sha512 = "kI1/y1IhbuTqjyVqekSZCd3afPQTpdIRCrON1WXc9jGdcIAaze3FAoZ1ssYJmGBuJbdg7LQO42daJGCaoRXl+A=="; + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-3.0.0.tgz"; + sha512 = "huPZAVpXzqUmCSGdeALwnoH29V+bK0O9ISH4jNfvlGFhY8qMJF0I+RKfVMiiT0TlgeB6thiitz/0G9BORVRb6Q=="; }; }; "utf-8-validate-1.2.2" = { @@ -60046,13 +60109,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.4" = { + "utf-8-validate-5.0.5" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz"; - sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.5.tgz"; + sha512 = "+pnxRYsS/axEpkrrEpzYfNZGXp0IjC/9RIxwM5gntY4Koi8SHmUGSfxfWqxZdRxrtaoVstuOzUp/rbs3JSPELQ=="; }; }; "utf7-1.0.2" = { @@ -60136,13 +60199,13 @@ let sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; }; - "util-0.12.3" = { + "util-0.12.4" = { name = "util"; packageName = "util"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz"; - sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog=="; + url = "https://registry.npmjs.org/util/-/util-0.12.4.tgz"; + sha512 = "bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw=="; }; }; "util-0.4.9" = { @@ -60253,13 +60316,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.4.0" = { + "utp-native-2.5.0" = { name = "utp-native"; packageName = "utp-native"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.4.0.tgz"; - sha512 = "jKwpFiEaDUuNH5S4vVk/+waAX+yA6f3Lw4flqOROH1ZE/jcT4mh0/hjIGSuPP9j9RbQcsBG6Fu6LaFk4ojXFxw=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.0.tgz"; + sha512 = "HoHPE6gwLxC0xlpYJUl+Xw2sh809lhXx3TexHsb2/xY8vEd6NwuvAxOI/X27dBTc/TOT5diWUpCJWDaunkcVvA=="; }; }; "uuid-2.0.3" = { @@ -60433,6 +60496,15 @@ let sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; }; }; + "value-or-promise-1.0.6" = { + name = "value-or-promise"; + packageName = "value-or-promise"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.6.tgz"; + sha512 = "9r0wQsWD8z/BxPOvnwbPf05ZvFngXyouE9EKB+5GbYix+BYnAwrIChCUyFIinfbf2FL/U71z+CPpbnmTdxrwBg=="; + }; + }; "variable-diff-1.1.0" = { name = "variable-diff"; packageName = "variable-diff"; @@ -60883,24 +60955,6 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; - "version-compare-1.1.0" = { - name = "version-compare"; - packageName = "version-compare"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/version-compare/-/version-compare-1.1.0.tgz"; - sha512 = "zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ=="; - }; - }; - "version-range-1.1.0" = { - name = "version-range"; - packageName = "version-range"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/version-range/-/version-range-1.1.0.tgz"; - sha512 = "R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w=="; - }; - }; "vfile-1.4.0" = { name = "vfile"; packageName = "vfile"; @@ -61000,6 +61054,15 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; + "vfile-message-3.0.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.1.tgz"; + sha512 = "gYmSHcZZUEtYpTmaWaFJwsuUD70/rTY4v09COp8TGtOkix6gGxb/a8iTQByIY9ciTk9GwAwIXd/J9OPfM4Bvaw=="; + }; + }; "vfile-reporter-1.5.0" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -61198,13 +61261,13 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.87.1" = { + "vsce-1.88.0" = { name = "vsce"; packageName = "vsce"; - version = "1.87.1"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.87.1.tgz"; - sha512 = "3tSUWZl9AmhZrqy/UVUpdPODSzBiCGjIr/AMSSgF2PuFLSdrh+6kiOr2Ath7bpQEXOxf55hNgz3qdO5MuEJmww=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz"; + sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -61297,13 +61360,13 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.0" = { + "vscode-json-languageservice-4.1.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.0"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.0.tgz"; - sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.4.tgz"; + sha512 = "/UqaE58BVFdePM9l971L6xPRLlCLNk01aovf1Pp9hB/8pytmd2s9ZNEnS1JqYyQEJ1k5/fEBsWOdhQlNo4H7VA=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -61459,6 +61522,15 @@ let sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; }; }; + "vscode-languageserver-7.1.0-next.4" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "7.1.0-next.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.1.0-next.4.tgz"; + sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -61882,6 +61954,15 @@ let sha512 = "Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw=="; }; }; + "watchpack-2.2.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz"; + sha512 = "up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA=="; + }; + }; "watchpack-chokidar2-2.0.1" = { name = "watchpack-chokidar2"; packageName = "watchpack-chokidar2"; @@ -61963,13 +62044,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.3.5" = { + "web3-utils-1.3.6" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.5.tgz"; - sha512 = "5apMRm8ElYjI/92GHqijmaLC+s+d5lgjpjHft+rJSs/dsnX8I8tQreqev0dmU+wzU+2EEe4Sx9a/OwGWHhQv3A=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz"; + sha512 = "hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg=="; }; }; "webassemblyjs-1.11.0" = { @@ -62179,13 +62260,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-2.2.0" = { + "webpack-sources-2.3.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz"; - sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz"; + sha512 = "WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ=="; }; }; "webpack-stream-6.1.0" = { @@ -62233,13 +62314,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.118.0" = { + "webtorrent-1.0.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.118.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.118.0.tgz"; - sha512 = "xXwwM2P+vtDsMRx9eRPNQqHD+6E7Zz7OTZqWAr2XDXg3TWGCf9HmwpgV53+F9H0oqw+l4j7vR9DRjAjChPQpZA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.0.0.tgz"; + sha512 = "htwcY5OBOWL/OMwaw3xi1Mp2gE9k5UmGTKeO3n1ixQDH9QgeqqRlBJz2ZLEyOL8yN1FdS/D9z+ijm06bZ3oW5w=="; }; }; "well-known-symbols-2.0.0" = { @@ -63178,6 +63259,15 @@ let sha512 = "xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="; }; }; + "ws-7.4.6" = { + name = "ws"; + packageName = "ws"; + version = "7.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"; + sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63259,13 +63349,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.34" = { + "xdl-59.0.40" = { name = "xdl"; packageName = "xdl"; - version = "59.0.34"; + version = "59.0.40"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.34.tgz"; - sha512 = "gcnWDPydwr/0JAwTv0vbWU8PaYjiRWSSjwzsIcnqlh5aZZdMfEle+TwfXRhPwJm5jut4BgnzOfQqMV8CfXKbXQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.40.tgz"; + sha512 = "TRSCBA2bRGiMATsf0dpyKtTo80WHYRWL+Rbo6OOLh1ODR032dvdrh0v1eaUcmnEnjUxF2uXgUQaoi5qiVhxB3A=="; }; }; "xenvar-0.5.1" = { @@ -63556,6 +63646,15 @@ let sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; }; }; + "xmldom-0.6.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz"; + sha512 = "iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -63584,6 +63683,15 @@ let sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; }; }; + "xmlhttprequest-ssl-1.6.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz"; + sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; + }; + }; "xorshift-0.2.1" = { name = "xorshift"; packageName = "xorshift"; @@ -63647,22 +63755,22 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.8" = { + "xss-1.0.9" = { name = "xss"; packageName = "xss"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz"; - sha512 = "3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.9.tgz"; + sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.18.0" = { + "xstate-4.19.2" = { name = "xstate"; packageName = "xstate"; - version = "4.18.0"; + version = "4.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.18.0.tgz"; - sha512 = "cjj22XXxTWIkMrghyoUWjUlDFcd7MQGeKYy8bkdtcIeogZjF98mep9CHv8xLO3j4PZQF5qgcAGGT8FUn99mF1Q=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.19.2.tgz"; + sha512 = "eWI6kOHavcqhu1ACCmRowYGaQnH0KGvBoGg3lqmle9ZYyVWa2ZcVTgZlsK7o419/jw9gWX2LYmYGkm9w/VoXMA=="; }; }; "xstream-11.14.0" = { @@ -63908,13 +64016,13 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.0.0-candidate.12" = { + "yargs-17.0.1" = { name = "yargs"; packageName = "yargs"; - version = "17.0.0-candidate.12"; + version = "17.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.0.0-candidate.12.tgz"; - sha512 = "K/Q98zCuqg1CTgqmURpqytY3Iz+P7HQ42/FglRRQWEEi2DNxzIJqA50J1LJjm58FPJDzBnqLQ1BHUFnabzj4CA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz"; + sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; }; }; "yargs-3.10.0" = { @@ -64160,13 +64268,13 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-3.2.0" = { + "yeoman-environment-3.4.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.2.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.2.0.tgz"; - sha512 = "Z2G4qgbjSLQ0BOiPQ4PCbqSYNhOP/HeWItu/hrlBv1gtBK6c3vkHSLioX8SduVYOKrn04X4H7cIG7hXpD3RsOQ=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.4.1.tgz"; + sha512 = "Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw=="; }; }; "yn-3.1.1" = { @@ -64286,15 +64394,6 @@ let sha512 = "EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q=="; }; }; - "zip-stream-3.0.1" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-3.0.1.tgz"; - sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; - }; - }; "zip-stream-4.1.0" = { name = "zip-stream"; packageName = "zip-stream"; @@ -64337,43 +64436,30 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.10"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.10.tgz"; - sha512 = "x7u36KmX1iiyDZhkeB6yXRrNj1no+mf6arnAvJYXH2JxqsZDqp19hP8b1QcGVMSl9CZUT/vA0KT3XuI4aJ6TfQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.2.tgz"; + sha512 = "hXxnOxPl6+v/O+OnkJxPPupCeQJNmI08EdtnER5z/UCSpmlJibbTAqLF9rFaOi/7dPLS0RCNWmCRA6grgTlP9g=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.10" - sources."@angular-devkit/core-11.2.10" - sources."@angular-devkit/schematics-11.2.10" - sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.8" // { - dependencies = [ - sources."hosted-git-info-4.0.2" - sources."npm-package-arg-8.1.2" - sources."npm-pick-manifest-6.1.1" - sources."promise-retry-2.0.1" - sources."semver-7.3.5" - ]; - }) + sources."@angular-devkit/architect-0.1200.2" + sources."@angular-devkit/core-12.0.2" + sources."@angular-devkit/schematics-12.0.2" + sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - (sources."@npmcli/run-script-1.8.5" // { - dependencies = [ - sources."read-package-json-fast-2.0.2" - ]; - }) - sources."@schematics/angular-11.2.10" - sources."@schematics/update-0.1102.10" + sources."@npmcli/run-script-1.8.5" + sources."@schematics/angular-12.0.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" + sources."ajv-8.2.0" + sources."ajv-formats-2.0.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -64398,7 +64484,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."builtins-1.0.3" - sources."cacache-15.0.6" + sources."cacache-15.2.0" sources."caseless-0.12.0" sources."chalk-4.1.1" sources."chardet-0.7.0" @@ -64418,6 +64504,7 @@ in sources."dashdash-1.14.1" sources."debug-4.3.1" sources."defaults-1.0.3" + sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -64425,7 +64512,7 @@ in sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."env-paths-2.2.1" @@ -64451,14 +64538,19 @@ in ]; }) sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-3.0.8" + sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -64466,16 +64558,16 @@ in sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-7.3.3" + sources."inquirer-8.0.0" sources."ip-1.1.5" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -64489,7 +64581,7 @@ in sources."jsbn-0.1.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" sources."jsonc-parser-3.0.0" sources."jsonparse-1.3.1" @@ -64498,11 +64590,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - (sources."make-fetch-happen-8.0.14" // { - dependencies = [ - sources."promise-retry-2.0.1" - ]; - }) + sources."make-fetch-happen-8.0.14" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."mimic-fn-2.1.0" @@ -64523,56 +64611,47 @@ in sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.0" - sources."npm-packlist-2.1.5" - sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-9.0.0" + sources."npm-package-arg-8.1.2" + sources."npm-packlist-2.2.2" + sources."npm-pick-manifest-6.1.1" + sources."npm-registry-fetch-10.1.2" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.4.0" - sources."ora-5.3.0" + sources."open-8.0.2" + sources."ora-5.4.0" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.2.4" + sources."pacote-11.3.2" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" - (sources."promise-retry-1.1.1" // { - dependencies = [ - sources."err-code-1.1.2" - sources."retry-0.10.1" - ]; - }) + sources."promise-retry-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-fast-1.2.2" + sources."read-package-json-fast-2.0.2" sources."readable-stream-3.6.0" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" ]; }) - sources."resolve-1.19.0" + sources."require-from-string-2.0.2" + sources."resolve-1.20.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.4" - (sources."semver-intersect-1.4.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" @@ -64586,7 +64665,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."symbol-observable-3.0.0" + sources."symbol-observable-4.0.0" sources."tar-6.1.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -64597,11 +64676,6 @@ in sources."type-fest-0.21.3" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - (sources."universal-analytics-0.4.23" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -64694,7 +64768,7 @@ in sources."append-buffer-1.0.2" sources."argparse-1.0.10" sources."asciidoctor.js-1.5.9" - sources."async-lock-1.2.8" + sources."async-lock-1.3.0" sources."balanced-match-1.0.2" sources."base64-js-0.0.2" sources."bl-4.0.4" @@ -64793,7 +64867,7 @@ in sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -64854,7 +64928,7 @@ in sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" sources."map-obj-4.2.1" - sources."marky-1.2.1" + sources."marky-1.2.2" sources."matcher-2.1.0" sources."mime-db-1.47.0" sources."mime-types-2.1.30" @@ -64866,7 +64940,7 @@ in sources."multi-progress-2.0.0" sources."neo-async-2.6.2" sources."normalize-path-2.1.1" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."now-and-later-2.0.1" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -64946,7 +65020,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -64986,10 +65060,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.15.1.tgz"; - sha512 = "kD+EkbSqFRtkwV/PXbgaCvrSOqVRTRaFhfT4XNoYbggWhMVwB6ebvdHvHe5I7pRKE8/xgP7WiIM/b0HP81bbHg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.16.0.tgz"; + sha512 = "HWQnOa3TzRJcF/TVKGWqzFP9PVaG6IhCBzFVY2tZ5mITNAf1nb2aC+gzH2EMa1m41IV6knPuXpqnsVGJGqQuxg=="; }; dependencies = [ sources."abab-2.0.5" @@ -65009,7 +65083,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.36" + sources."big-integer-1.6.48" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" @@ -65077,15 +65151,15 @@ in sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."node-fetch-2.2.0" - sources."node-forge-0.7.6" + sources."node-fetch-2.6.1" + sources."node-forge-0.10.0" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."onetime-2.0.1" sources."open-7.1.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" - sources."papaparse-4.6.0" + sources."papaparse-5.2.0" sources."parse5-5.1.0" sources."performance-now-2.1.0" sources."pify-3.0.0" @@ -65144,7 +65218,7 @@ in meta = { description = "A secure and free password manager for all of your devices."; homepage = "https://bitwarden.com"; - license = "GPL-3.0"; + license = "GPL-3.0-only"; }; production = true; bypassCache = true; @@ -65168,8 +65242,8 @@ in }) sources."@angular-devkit/schematics-cli-0.1102.6" sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -65188,12 +65262,12 @@ in ]; }) sources."@schematics/schematics-0.1102.6" - sources."@types/eslint-7.2.10" + sources."@types/eslint-7.2.12" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65212,7 +65286,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.2.1" + sources."acorn-8.2.4" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65227,11 +65301,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65251,10 +65325,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.8.0" // { + (sources."enhanced-resolve-5.8.2" // { dependencies = [ sources."tapable-2.2.0" ]; @@ -65288,7 +65362,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-stream-5.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" @@ -65310,7 +65384,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -65349,7 +65423,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -65367,9 +65441,9 @@ in sources."parse-json-5.2.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pluralize-8.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -65413,12 +65487,12 @@ in sources."supports-color-7.2.0" sources."symbol-observable-3.0.0" sources."tapable-1.1.3" - (sources."terser-5.6.1" // { + (sources."terser-5.7.0" // { dependencies = [ sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.1.1" // { + (sources."terser-webpack-plugin-5.1.2" // { dependencies = [ sources."schema-utils-3.0.0" sources."source-map-0.6.1" @@ -65440,7 +65514,7 @@ in sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."watchpack-2.1.1" + sources."watchpack-2.2.0" sources."wcwidth-1.0.1" (sources."webpack-5.28.0" // { dependencies = [ @@ -65449,7 +65523,7 @@ in ]; }) sources."webpack-node-externals-2.5.2" - (sources."webpack-sources-2.2.0" // { + (sources."webpack-sources-2.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -65474,67 +65548,70 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.12.tgz"; - sha512 = "ZP0bxmM+VpmH8xT/5DbH8UD5nnlXLxJNYLiMcndx0pmuujabUORZdhIO3B9pq1w1Y204p2CJq3srrEUwhKKY5g=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.13.tgz"; + sha512 = "KAU300YbT0/7zG472KzJgHKdFex4nr5Xoo80gQJwT+y7pkepMhTxjrmxrJ/XR8QirUvPnBiX5n6BX5FrlMuUGQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/protobufjs-1.2.0" // { + (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ - sources."@types/node-10.17.58" + sources."@types/node-10.17.60" ]; }) - sources."@apollographql/apollo-tools-0.4.12" + sources."@apollographql/apollo-tools-0.5.1" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.16" - sources."@babel/generator-7.13.16" + sources."@babel/compat-data-7.14.4" + sources."@babel/core-7.14.3" + sources."@babel/generator-7.14.3" 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.16" - 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.2.0" + sources."@babel/helper-compilation-targets-7.14.4" + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" 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-class-static-block-7.14.3" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" + sources."@babel/plugin-proposal-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.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-class-static-block-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" @@ -65545,15 +65622,16 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" 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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -65562,14 +65640,14 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-parameters-7.14.2" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" @@ -65578,10 +65656,10 @@ in 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-typescript-7.14.4" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.13.15" + sources."@babel/preset-env-7.14.4" sources."@babel/preset-flow-7.13.13" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.13.0" @@ -65592,16 +65670,16 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@josephg/resolvable-1.0.0" + sources."@josephg/resolvable-1.0.1" sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.4" // { dependencies = [ @@ -65643,31 +65721,26 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.13.1" + sources."@types/koa-2.13.2" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" - (sources."@types/node-fetch-2.5.8" // { - dependencies = [ - sources."form-data-3.0.1" - ]; - }) + sources."@types/node-15.6.1" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.9" sources."@types/through-0.0.30" - sources."@types/ws-7.4.1" - sources."@vue/cli-shared-utils-4.5.12" - (sources."@vue/cli-ui-4.5.12" // { + sources."@types/ws-7.4.4" + sources."@vue/cli-shared-utils-4.5.13" + (sources."@vue/cli-ui-4.5.13" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.12" - sources."@vue/cli-ui-addon-widgets-4.5.12" + sources."@vue/cli-ui-addon-webpack-4.5.13" + sources."@vue/cli-ui-addon-widgets-4.5.13" (sources."@vue/compiler-core-3.0.11" // { dependencies = [ sources."source-map-0.6.1" @@ -65692,35 +65765,28 @@ in }) sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."apollo-cache-control-0.12.0" - sources."apollo-datasource-0.8.0" - sources."apollo-env-0.9.0" - (sources."apollo-graphql-0.6.1" // { - dependencies = [ - sources."@types/node-fetch-2.5.7" - sources."apollo-env-0.6.6" - sources."form-data-3.0.1" - ]; - }) + sources."apollo-cache-control-0.14.0" + sources."apollo-datasource-0.9.0" + sources."apollo-graphql-0.9.3" sources."apollo-link-1.2.14" - sources."apollo-reporting-protobuf-0.6.2" - (sources."apollo-server-caching-0.6.0" // { + sources."apollo-reporting-protobuf-0.8.0" + (sources."apollo-server-caching-0.7.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.23.0" // { + (sources."apollo-server-core-2.25.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" ]; }) - sources."apollo-server-env-3.0.0" + sources."apollo-server-env-3.1.0" sources."apollo-server-errors-2.5.0" - sources."apollo-server-express-2.23.0" - sources."apollo-server-plugin-base-0.11.0" - sources."apollo-server-types-0.7.0" - sources."apollo-tracing-0.13.0" + sources."apollo-server-express-2.25.0" + sources."apollo-server-plugin-base-0.13.0" + sources."apollo-server-types-0.9.0" + sources."apollo-tracing-0.15.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { dependencies = [ @@ -65749,9 +65815,9 @@ in sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-polyfill-corejs2-0.2.0" - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs2-0.2.2" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -65784,7 +65850,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -65804,7 +65870,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -65862,12 +65928,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.11.0" - (sources."core-js-compat-3.11.0" // { + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; }) + sources."core-js-pure-3.13.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -65934,14 +66000,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-7.0.3" 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.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -66017,7 +66083,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.149.0" + sources."flow-parser-0.152.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -66044,7 +66110,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -66068,9 +66134,9 @@ in }) sources."graceful-fs-4.2.6" sources."graphql-14.7.0" - sources."graphql-extensions-0.13.0" + sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" - (sources."graphql-tag-2.12.3" // { + (sources."graphql-tag-2.12.4" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -66125,13 +66191,13 @@ in sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -66145,22 +66211,22 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.6" + sources."isbinaryfile-4.0.8" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -66269,7 +66335,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -66297,7 +66363,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object-visit-1.0.1" @@ -66331,12 +66397,12 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-3.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" (sources."pid-from-port-1.1.3" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -66498,7 +66564,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -66684,7 +66750,7 @@ in sources."ws-6.2.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xss-1.0.8" + sources."xss-1.0.9" sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -66834,12 +66900,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.13.16" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/generator-7.14.3" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" sources."@babel/template-7.12.13" - sources."@babel/types-7.13.17" + sources."@babel/types-7.14.4" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -66914,43 +66980,43 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.16" // { + (sources."@babel/generator-7.14.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.13.16" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-compilation-targets-7.14.4" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" 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-module-transforms-7.14.2" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-replace-supers-7.14.4" sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.5" - sources."caniuse-lite-1.0.30001214" + sources."browserslist-4.16.6" + sources."caniuse-lite-1.0.30001230" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -66961,7 +67027,7 @@ in sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -66988,7 +67054,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -67007,7 +67073,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -67016,7 +67082,7 @@ in ]; }) sources."parse-passwd-1.0.0" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pkginfo-0.4.1" sources."resolve-1.20.0" sources."safe-buffer-5.1.2" @@ -67055,14 +67121,14 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -67090,7 +67156,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -67101,7 +67167,7 @@ in sources."tslib-2.2.0" ]; }) - (sources."aws-sdk-2.892.0" // { + (sources."aws-sdk-2.918.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67167,7 +67233,7 @@ in sources."ftp-0.3.10" sources."get-stream-5.2.0" sources."get-uri-3.0.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" @@ -67270,7 +67336,7 @@ in sources."uuid-8.3.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" @@ -67290,10 +67356,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "8.0.8"; + version = "8.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.8.tgz"; - sha512 = "v52KtlVv4Sdp0GaqH9vPYSwOCgIvTruMX0yv8ev+GguqY1kV+mCykCIFW3++ysu97pog00LhImvFbxndAU68rA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.14.tgz"; + sha512 = "z9/oACcuCHyWSg2c5J1G/HNcTAknUc4YS2SIqsbjw27YmAL2x6T9Uo1OSSemWnOqGtlHfS6xf7X3DJNsfIYPfQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67306,10 +67372,10 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.2.12" // { dependencies = [ - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" ]; }) - sources."@grpc/proto-loader-0.5.6" + sources."@grpc/proto-loader-0.6.1" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -67329,7 +67395,7 @@ in sources."@types/caseless-0.12.2" sources."@types/connect-3.4.34" sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.19" + sources."@types/express-serve-static-core-4.17.20" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -67342,7 +67408,7 @@ in }) sources."@types/serve-static-1.13.9" sources."@types/tough-cookie-4.0.0" - sources."@types/ws-7.4.0" + sources."@types/ws-7.4.1" sources."abort-controller-3.0.0" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -67419,7 +67485,7 @@ in sources."bn.js-5.2.0" ]; }) - sources."bolt09-0.1.3" + sources."bolt09-0.1.4" (sources."boxen-5.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -67447,7 +67513,6 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."caporal-1.4.0" sources."caseless-0.12.0" @@ -67553,23 +67618,19 @@ in sources."form-data-3.0.0" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."gaxios-4.2.0" + sources."gaxios-4.3.0" sources."gcp-metadata-4.2.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."global-dirs-3.0.0" - (sources."goldengate-10.0.3" // { + (sources."goldengate-10.0.4" // { dependencies = [ - sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."bolt07-1.7.1" - sources."invoices-1.1.6" - sources."ln-service-51.5.0" + sources."invoices-1.1.7" + sources."ln-service-51.7.0" ]; }) sources."google-auth-library-6.1.6" @@ -67579,14 +67640,12 @@ in sources."gtoken-5.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hash-base-3.1.0" @@ -67635,13 +67694,11 @@ in dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."bolt09-0.1.4" ]; }) sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" - sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" @@ -67654,11 +67711,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.4" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" - sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" @@ -67679,74 +67734,92 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-3.3.1" // { + (sources."lightning-3.3.4" // { dependencies = [ - sources."@grpc/grpc-js-1.2.11" - sources."@types/node-14.14.35" - sources."asyncjs-util-1.2.3" + sources."@grpc/proto-loader-0.6.0" + sources."@types/node-14.14.37" sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."bolt07-1.7.1" - sources."cbor-7.0.4" - sources."invoices-1.1.6" - sources."psbt-1.1.8" + sources."invoices-1.1.7" ]; }) (sources."ln-accounting-4.2.7" // { dependencies = [ + sources."@grpc/grpc-js-1.2.11" + sources."@grpc/proto-loader-0.5.6" + sources."@types/node-14.14.35" + sources."@types/ws-7.4.0" sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."bolt07-1.7.1" + sources."bolt09-0.1.3" + sources."cbor-7.0.4" + sources."goldengate-10.0.3" sources."invoices-1.1.6" + (sources."lightning-3.3.1" // { + dependencies = [ + sources."asyncjs-util-1.2.3" + ]; + }) sources."ln-service-51.5.0" + sources."psbt-1.1.8" ]; }) - (sources."ln-service-51.7.0" // { + (sources."ln-service-51.8.1" // { dependencies = [ - sources."@grpc/proto-loader-0.6.0" - sources."@types/node-14.14.37" - sources."@types/ws-7.4.1" - sources."bech32-2.0.0" + sources."@grpc/grpc-js-1.3.1" + sources."@grpc/proto-loader-0.6.2" + sources."@types/node-15.0.3" + sources."@types/ws-7.4.4" sources."bn.js-5.2.0" - sources."bolt09-0.1.4" - sources."invoices-1.1.7" - sources."lightning-3.3.4" + sources."lightning-3.3.7" + sources."ws-7.4.5" ]; }) (sources."ln-sync-0.4.5" // { dependencies = [ - sources."asyncjs-util-1.2.4" - ]; - }) - (sources."ln-telegram-3.2.2" // { - dependencies = [ - sources."ajv-8.1.0" - sources."ansi-regex-5.0.0" + sources."@grpc/grpc-js-1.2.11" + sources."@grpc/proto-loader-0.5.6" + sources."@types/node-14.14.35" + sources."@types/ws-7.4.0" sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."bolt07-1.7.1" - sources."bolt09-0.1.4" - sources."invoices-1.1.7" + sources."bolt09-0.1.3" + sources."invoices-1.1.6" + (sources."lightning-3.3.1" // { + dependencies = [ + sources."asyncjs-util-1.2.3" + sources."cbor-7.0.4" + ]; + }) + sources."psbt-1.1.8" + ]; + }) + (sources."ln-telegram-3.2.3" // { + dependencies = [ + sources."ajv-8.5.0" + sources."ansi-regex-5.0.0" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" sources."is-fullwidth-code-point-3.0.0" sources."json-schema-traverse-1.0.0" - (sources."ln-service-51.5.0" // { + (sources."ln-service-51.7.0" // { dependencies = [ - sources."bolt09-0.1.3" - sources."invoices-1.1.6" + sources."invoices-1.1.7" ]; }) sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."table-6.0.9" + sources."table-6.7.0" ]; }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" sources."lodash.difference-4.5.0" - sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -67793,7 +67866,7 @@ in sources."node-forge-0.10.0" sources."node-gyp-build-4.2.3" sources."nofilter-2.0.3" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -67816,24 +67889,36 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.5" // { dependencies = [ + sources."@grpc/grpc-js-1.2.11" + sources."@grpc/proto-loader-0.5.6" + sources."@types/node-14.14.35" + sources."@types/ws-7.4.0" sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."bolt09-0.1.4" + sources."bolt09-0.1.3" + sources."cbor-7.0.4" sources."invoices-1.1.7" - (sources."ln-service-51.5.0" // { + (sources."lightning-3.3.1" // { dependencies = [ + sources."asyncjs-util-1.2.3" sources."bolt07-1.7.1" - sources."bolt09-0.1.3" sources."invoices-1.1.6" ]; }) + (sources."ln-service-51.5.0" // { + dependencies = [ + sources."bolt07-1.7.1" + sources."invoices-1.1.6" + ]; + }) + sources."psbt-1.1.8" ]; }) sources."process-nextick-args-2.0.1" - (sources."protobufjs-6.10.2" // { + (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-13.13.50" + sources."@types/node-15.6.1" ]; }) sources."proxy-addr-2.0.6" @@ -67902,9 +67987,9 @@ in sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."table-6.4.0" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" sources."json-schema-traverse-1.0.0" @@ -67944,7 +68029,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.2.4" + sources."typegram-3.3.1" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -68075,7 +68160,7 @@ in sources."fs.realpath-1.0.0" sources."fuzzy-search-3.2.1" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."html-encoding-sniffer-1.0.2" @@ -68220,7 +68305,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -68256,7 +68341,7 @@ in sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-type-1.1.0" // { dependencies = [ sources."graceful-fs-4.2.6" @@ -68274,7 +68359,7 @@ in sources."resolve-1.20.0" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" ]; }) sources."semver-5.7.1" @@ -68284,7 +68369,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -68320,7 +68405,6 @@ in sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."array-filter-1.0.0" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -68332,7 +68416,7 @@ in sources."util-0.10.3" ]; }) - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bn.js-5.2.0" @@ -68390,7 +68474,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -68400,7 +68484,7 @@ in sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-intrinsic-1.1.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" @@ -68419,18 +68503,18 @@ in sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" sources."is-arguments-1.1.0" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.3.0" - sources."is-date-object-1.0.2" - sources."is-generator-function-1.0.8" + sources."is-core-module-2.4.0" + sources."is-date-object-1.0.4" + sources."is-generator-function-1.0.9" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."isarray-1.0.0" sources."jsonparse-1.3.1" @@ -68449,7 +68533,7 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -68459,7 +68543,7 @@ in sources."parse-asn1-5.1.6" sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-platform-0.11.15" sources."pbkdf2-3.1.2" sources."process-0.11.10" @@ -68520,7 +68604,7 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.12.3" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" @@ -68548,10 +68632,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" - sources."@babel/types-7.13.17" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" + sources."@babel/types-7.14.4" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.1" @@ -68672,9 +68756,9 @@ in sources."denque-1.5.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."dijkstrajs-1.0.1" + sources."dijkstrajs-1.0.2" sources."doctypes-1.1.0" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -68694,11 +68778,12 @@ in ]; }) sources."express-async-handler-1.1.4" - (sources."express-session-1.17.1" // { + (sources."express-session-1.17.2" // { dependencies = [ + sources."cookie-0.4.1" sources."debug-2.6.9" sources."depd-2.0.0" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" ]; }) sources."extend-3.0.2" @@ -68712,7 +68797,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -68750,12 +68835,12 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-typedarray-1.0.0" sources."isarray-2.0.5" sources."isstream-0.1.2" @@ -68832,7 +68917,7 @@ in sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" (sources."pidusage-2.0.21" // { @@ -68919,11 +69004,11 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.38.0" + sources."simple-git-2.39.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.9" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -68942,7 +69027,7 @@ in sources."toidentifier-1.0.0" sources."token-stream-1.0.0" sources."tough-cookie-2.5.0" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."tsscmp-1.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -69009,7 +69094,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.50" + sources."@types/node-15.6.1" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69130,7 +69215,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."got-1.2.2" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" @@ -69151,7 +69236,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -69228,7 +69313,7 @@ in }) sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-1.1.0" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ @@ -69254,7 +69339,7 @@ in sources."plist-3.0.2" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-6.10.2" + sources."protobufjs-6.11.2" sources."psl-1.8.0" (sources."pump-0.3.5" // { dependencies = [ @@ -69335,7 +69420,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -69421,20 +69506,19 @@ in sha512 = "Oo/tO5aqmjsBORN93dSnidF7+2u77Q9zwUn9VbCQkZqCNfeZZcwIV9AG108hMYwtcXqtKQC7wevX6rmi9l8lng=="; }; dependencies = [ - sources."@jsii/spec-1.29.0" - sources."@types/node-10.17.58" + sources."@jsii/spec-1.30.0" + sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."array-filter-1.0.0" sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" sources."cdk8s-1.0.0-beta.11" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.29.0" // { + (sources."codemaker-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -69454,7 +69538,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -69476,53 +69560,53 @@ in sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" sources."is-arguments-1.1.0" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-fullwidth-code-point-3.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" sources."is-set-2.0.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.29.0" // { + (sources."jsii-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.29.0" // { + (sources."jsii-pacmak-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.29.0" // { + (sources."jsii-reflect-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.29.0" // { + (sources."jsii-rosetta-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.257" // { + (sources."jsii-srcmak-0.1.273" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) - sources."json-schema-0.2.5" - sources."json2jsii-0.1.219" + sources."json-schema-0.3.0" + sources."json2jsii-0.1.236" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69534,11 +69618,11 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.29.0" + sources."oo-ascii-tree-1.30.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -69579,7 +69663,7 @@ in sources."which-typed-array-1.1.4" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -69608,17 +69692,17 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.3.0.tgz"; - sha512 = "8ZICMcjBkKMBzzyVQfa3CGb/kkxBfvr7nxvOLpyEO1ecJt4E1gkrAwsKb8oVX/zfQ371UJqrqJxwBwb+OUT5Wg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.0.tgz"; + sha512 = "2mJA2Kq8mCcTzfHbNnogPWj/OVtPFEtzgL00hxPyLIKaQz7gX0Sagej18qp7kPh0pVA5Qenm5jVST3GdkjoX6A=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.3.0" - sources."@jsii/spec-1.29.0" + sources."@cdktf/hcl2json-0.4.0" + sources."@jsii/spec-1.30.0" sources."@skorfmann/ink-confirm-input-3.0.0" - sources."@skorfmann/terraform-cloud-1.10.0" - sources."@types/node-14.14.41" + sources."@skorfmann/terraform-cloud-1.10.1" + sources."@types/node-14.17.1" sources."@types/node-fetch-2.5.10" sources."@types/yauzl-2.9.1" sources."@types/yoga-layout-1.9.2" @@ -69635,13 +69719,12 @@ in sources."readable-stream-2.3.7" ]; }) - sources."array-filter-1.0.0" sources."astral-regex-2.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."axios-0.21.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -69653,7 +69736,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.3.0" + sources."cdktf-0.4.0" sources."chalk-4.1.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -69696,7 +69779,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -69710,7 +69793,7 @@ in sources."fd-slicer-1.1.0" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" @@ -69720,7 +69803,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -69735,30 +69818,30 @@ in sources."type-fest-0.12.0" ]; }) - sources."ink-spinner-4.0.1" + sources."ink-spinner-4.0.2" sources."ink-text-input-4.0.1" sources."is-arguments-1.1.0" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" sources."is-set-2.0.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.29.0" // { + (sources."jsii-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69766,10 +69849,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.29.0" // { + (sources."jsii-pacmak-1.30.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.29.0" + sources."codemaker-1.30.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -69778,7 +69861,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.29.0" // { + (sources."jsii-reflect-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69786,7 +69869,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.29.0" // { + (sources."jsii-rosetta-1.30.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69794,7 +69877,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.257" // { + (sources."jsii-srcmak-0.1.273" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69830,13 +69913,13 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.29.0" + sources."oo-ascii-tree-1.30.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -69851,7 +69934,7 @@ in sources."pump-3.0.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.4" + sources."react-devtools-core-4.13.5" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -69916,9 +69999,9 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xmlbuilder-15.1.1" - sources."xmldom-0.5.0" + sources."xmldom-0.6.0" sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { @@ -69947,10 +70030,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.2.tgz"; - sha512 = "XlgBVTpEAsU/aT7gxAZ/g5Q8P9glHZeg6yfNvE7hYuvoozMdw5Wd46b12QtzuDVs8/7UZ/GCulS0VR9TI5NWRg=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.0.tgz"; + sha512 = "Jri2KVAcan/Y1JuEDo1rUlm3vUoGvMKSOpIL2YEPgalksvoGur/yL2KbtMF2dPs2VlMVj1afzp76Vu0KjxKfvA=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -69959,7 +70042,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -70009,11 +70092,11 @@ in sources."fetch-everywhere-1.0.5" sources."filter-obj-1.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-flag-3.0.0" sources."hasurl-1.0.0" sources."i-0.3.6" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-stream-1.1.0" @@ -70119,10 +70202,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.18.3"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.3.tgz"; - sha512 = "VL6XhOU9roM9wKcDZrJ+MeabNDXI9vb2aUinDHOJx+7e19MIbACfFgMJfVxOkSWNRrTHyOlElnHCcYzS8gk2qQ=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.20.0.tgz"; + sha512 = "iKMyYYkebv31l1LB0EbZtwQ4DeVW0dUh9nXwE0tG3LDahcUNzNi1eXGWeNVxcy+YhWmaLEkLgKTu9DE4zxpACQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70178,10 +70261,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.17.2"; + version = "0.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.2.tgz"; - sha512 = "XXMjJMweK5qAmOFd569HpdSgcFTziumnNWjPYO1Fze3aJ75KtemSWjrKKy6waFTzQH0sWHmq8g/cRs1pjhQckQ=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.5.tgz"; + sha512 = "a5GHhsPEFcby7CkhnpkWyLei/SCcon3Z/Li1Jvxr/h6bewDHFNXA5DZSDJWvhLnktGcwZNBOWGBBZhPWFGYAaA=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -70200,7 +70283,7 @@ in sources."execa-2.1.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."globby-7.1.1" sources."ignore-3.3.10" sources."indent-string-4.0.0" @@ -70225,7 +70308,7 @@ in sources."npm-run-path-3.1.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.0.6" + sources."open-8.2.0" sources."os-homedir-1.0.2" sources."p-finally-2.0.1" sources."p-map-4.0.0" @@ -70264,11 +70347,16 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.3.1.tgz"; - sha512 = "119J+uanlMO9xZA4yeyvjwbWKDckLUKUtJu6mreHuyQbd7x4Ea3qwjpWMlGl2+QLJQ78OPZjpbzzlc8FzDZY2A=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.3.3.tgz"; + sha512 = "xBdnbesjfMVHYjoCCpLReurLFVIVyvN/Xd+T0/oETLs0lotn1p5F3cZPRiZD0jxtCLMV72dqN/Kuro98HoNplg=="; }; + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.3.5" + sources."yallist-4.0.0" + ]; buildInputs = globalBuildInputs; meta = { description = "Git extension for coc.nvim"; @@ -70307,10 +70395,10 @@ in coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.7.tgz"; - sha512 = "crUMz4W5IGSoLX9Lif1Z9XT2e3Eq7oVnkaN1+F0ncGiAh8sI4vPW+hm641tVcXVC/u4wzdvvbj6ngj8Fykxn2g=="; + url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.8.tgz"; + sha512 = "buElMyk/0st73HVkgcic9UJECACHsoTbyCwHiOo20P1sCk8tgQ6+iEY9KW7L4xZorRt1RthfxLqZwayog1SALQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70330,7 +70418,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.2.4" + sources."typescript-4.3.2" ]; buildInputs = globalBuildInputs; meta = { @@ -70415,10 +70503,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.0.tgz"; - sha512 = "AKmM8/+BjncinB4MrS/e8hJ7MzvXL5GtAvusGZb3zsAj4tNO77oWiVzE8V09QEWAsorgHVgNv/OXr4EPJMZvpg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.1.tgz"; + sha512 = "A87irHxQ97+VkgM8SgTLZDyOT/t7V0uMqg/Jk1hx+TQVsAZljBNZq88yaUZIo6SBfmeHroGUUzFs597GJf7N5Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -70451,10 +70539,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.4.tgz"; - sha512 = "nMarefi4Y2ReRiKa/GpyJRKMyF+J+cT3pc1mw6MvmuhpkhrQtf/feMYJ+7/h7l38NqAxjHkBvAiHZqDpWB675Q=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.5.tgz"; + sha512 = "YWnhsa/SDrxdJwcRrvFUiNOYuhDE8STBo5t1Nvokk/OaFoKfTS/OrxE2xTrDPWgJAxytyfnIjxBduokB1+LT3g=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -70493,15 +70581,15 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.13.3" - sources."fp-ts-2.10.4" + sources."follow-redirects-1.14.1" + sources."fp-ts-2.10.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -70514,7 +70602,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -70526,17 +70614,17 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-docker-2.2.1" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -70572,7 +70660,7 @@ in sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -70664,13 +70752,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" ]; @@ -70725,6 +70814,7 @@ in sources."ansi-regex-3.0.0" sources."camelcase-4.1.0" sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -70743,7 +70833,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -70805,7 +70895,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -70841,16 +70931,16 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."eslint-7.25.0" // { + sources."escape-string-regexp-4.0.0" + (sources."eslint-7.27.0" // { dependencies = [ - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" ]; }) sources."eslint-scope-5.1.1" @@ -70971,7 +71061,7 @@ in sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -70982,7 +71072,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -71043,7 +71133,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -71109,12 +71199,12 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" (sources."log-symbols-2.2.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) sources."loglevel-1.7.1" @@ -71123,6 +71213,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" ]; @@ -71249,7 +71340,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-type-1.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -71263,6 +71354,7 @@ in (sources."postcss-6.0.23" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) sources."postcss-html-0.12.0" @@ -71275,6 +71367,7 @@ in sources."supports-color-2.0.0" ]; }) + sources."escape-string-regexp-1.0.5" sources."has-flag-1.0.0" sources."postcss-5.2.18" sources."source-map-0.5.7" @@ -71286,6 +71379,7 @@ in (sources."postcss-reporter-5.0.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) sources."postcss-resolve-nested-selector-0.1.1" @@ -71297,7 +71391,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.2.1" + sources."prettier-2.3.0" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -71310,6 +71404,7 @@ in dependencies = [ sources."chalk-2.4.2" sources."dir-glob-2.0.0" + sources."escape-string-regexp-1.0.5" sources."globby-8.0.2" sources."ignore-3.3.10" sources."path-type-3.0.0" @@ -71435,7 +71530,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -71477,6 +71572,7 @@ in sources."camelcase-keys-4.2.0" sources."chalk-2.4.2" sources."debug-3.2.7" + sources."escape-string-regexp-1.0.5" sources."file-entry-cache-2.0.0" sources."flat-cache-1.3.4" sources."globby-7.1.1" @@ -71504,9 +71600,9 @@ in sources."sugarss-1.0.1" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -71531,6 +71627,7 @@ in (sources."tslint-5.20.1" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" sources."semver-5.7.1" sources."tsutils-2.29.0" ]; @@ -71565,6 +71662,7 @@ in (sources."update-notifier-2.5.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) sources."uri-js-4.4.1" @@ -71636,17 +71734,17 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.134"; + version = "1.1.144"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.134.tgz"; - sha512 = "UUtG3a+ATo6B/B3LbU6PvXzFE8XznGyoyeg9DAeCxT2PpZjdq0HAXjwnqnt7ekhr2q5oA1ERbLM0jQXoxj117g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.144.tgz"; + sha512 = "bUb/GuY0QjlDAws60UNDL8ZiRzp6sLmSqRkMyAAUEb9arsSphvok80P3i/NEsJhG2lgx2LaEz1mKUCnR+UjTlA=="; }; dependencies = [ - sources."pyright-1.1.134" + sources."pyright-1.1.144" ]; buildInputs = globalBuildInputs; meta = { - description = "Pyright extension for coc.nvim"; + description = "Pyright extension for coc.nvim, static type checker for Python"; homepage = "https://github.com/fannheyward/coc-pyright#readme"; license = "MIT"; }; @@ -71716,10 +71814,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.43.1"; + version = "0.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.43.1.tgz"; - sha512 = "NWuXDc9NrqVN1HO7NTUfH68Xr05yJA5bJXfQOSasOxxjsMyijL/aYwmlflSV93DO0zzWmsBPBTmBjBXxAms0cQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.45.1.tgz"; + sha512 = "2BFV6NJDi2s8Z41xf0Zk49fAWkYioZH+D7bKVQTb2LrhhKlmgfw4HGLe/9AZrvUPOcCDEuE9CS+lSnZjeJuUPg=="; }; buildInputs = globalBuildInputs; meta = { @@ -71752,10 +71850,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.1.tgz"; - sha512 = "+81jc8T250Ipl50MMypedTqHvAAGPu/COg9wEUsBzEOHmA0r4ouvRhzjAOWt7G6L2dHdB4KJl8AWfiVZhc5dRA=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.2.tgz"; + sha512 = "e+gsnzl//ilZNhfdVNkzI3lvJoMdB/aLVrMbaecimJG+gabVI/MvjmpsvrOLu9KFkBmECFjpM3T2Hxd6DuvY2Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -71793,31 +71891,31 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.16" - sources."@babel/generator-7.13.16" - sources."@babel/helper-compilation-targets-7.13.16" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/compat-data-7.14.4" + sources."@babel/core-7.14.3" + sources."@babel/generator-7.14.3" + sources."@babel/helper-compilation-targets-7.14.4" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" 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-module-transforms-7.14.2" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-replace-supers-7.14.4" sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.17" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.16" + sources."@babel/parser-7.14.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -71828,7 +71926,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -71843,11 +71941,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71885,7 +71983,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71907,7 +72005,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -71937,7 +72035,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -71960,7 +72058,6 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" @@ -71983,7 +72080,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -72002,9 +72099,9 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" (sources."postcss-7.0.35" // { dependencies = [ (sources."chalk-2.4.2" // { @@ -72023,7 +72120,7 @@ in sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" @@ -72069,7 +72166,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -72080,14 +72177,14 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.13.0" + sources."stylelint-13.13.1" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.5.1" + sources."table-6.7.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" @@ -72131,10 +72228,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.3.tgz"; - sha512 = "6CYtXKaEduGHLjiBdYRcWvl7gzvW92iGTxW7M3KVfn/tRFO+VF+3FuSX7Fg53ol4/USyNOTgXz3uyBjfsZOBXA=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.4.tgz"; + sha512 = "ICnIh+XR8egHeJCfuVpiXQHvHfcRJcHWRHIxTHLAOYG000tK/qZGzyVF7gz55sxgwyFOpo3EBgimdrAn9e/gvg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72148,10 +72245,10 @@ in coc-texlab = nodeEnv.buildNodePackage { name = "coc-texlab"; packageName = "coc-texlab"; - version = "2.3.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-2.3.0.tgz"; - sha512 = "1Nph3BgqAbANW1LWa49kscQdt8i55fB304YohKvA2y78DlvxIfG0J7UnbIz+R1HQX0TpvwWdD/wzFP6ll68l8w=="; + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.1.tgz"; + sha512 = "0uom/t9g+4u1SgRDbfBIbnPRmlRS2odBCDcyP8+JQcEHYS2LXni0udDVZOG/4lbOFEZmMLbAcds0tTJpJ9SZhg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72173,8 +72270,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -72190,12 +72287,12 @@ in sources."esprima-4.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-1.0.3" sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -72203,7 +72300,7 @@ in sources."mkdirp-0.5.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."resolve-1.20.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" @@ -72266,7 +72363,7 @@ in sha512 = "Kye0Bn4ifhNhKFcenXg0z8iNzkBGOCXCb552sY/L55+4+08WU02impRnuYkEwFo2QAjDrRQNYjUfUabRR4LC+A=="; }; dependencies = [ - sources."typescript-4.2.4" + sources."typescript-4.3.2" ]; buildInputs = globalBuildInputs; meta = { @@ -72288,13 +72385,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" ]; @@ -72331,8 +72429,8 @@ in sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."escape-string-regexp-1.0.5" - sources."eslint-7.25.0" + sources."escape-string-regexp-4.0.0" + sources."eslint-7.27.0" sources."eslint-plugin-vue-7.9.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -72340,7 +72438,7 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -72368,9 +72466,9 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -72382,7 +72480,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -72394,7 +72492,7 @@ in sources."levn-0.4.1" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" @@ -72407,9 +72505,9 @@ in sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.2.1" + sources."prettier-2.3.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -72432,9 +72530,9 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -72443,13 +72541,14 @@ in (sources."tslint-6.1.3" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" sources."semver-5.7.1" ]; }) sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.2.4" + sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.2" @@ -72640,7 +72739,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -72667,14 +72766,15 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.3.2.tgz"; - sha512 = "wVYydYWJyPAUj8pNQ4+4mNxwj6EY8JNETRAOA3UjpiLrGr+Np/2lfQW+W3Fjubs9nUDn0JTQ/aaPsjdEs1/6dA=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.4.0.tgz"; + sha512 = "8tSSnS8pjuw6Wtu/3Ufd2elV/3DnE3AUu3L+IYyukLoQNrRY9iS+Qfg3e1APokk7OzSghDkxW7yRZFiAoHF6FQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" sources."async-3.2.0" + sources."bintrees-1.0.1" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -72688,7 +72788,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -72696,19 +72796,18 @@ in sources."isarray-1.0.0" sources."kuler-2.0.0" sources."logform-2.2.0" - sources."lynx-0.2.0" - sources."mersenne-0.0.4" sources."ms-2.1.3" sources."one-time-1.0.0" sources."process-nextick-args-2.0.1" + sources."prom-client-13.1.0" sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" - sources."statsd-parser-0.0.4" sources."strftime-0.10.0" sources."string_decoder-1.3.0" + sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" @@ -72744,7 +72843,7 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/git-2.0.8" + sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -72810,7 +72909,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."bytes-3.0.0" - sources."cacache-15.0.6" + sources."cacache-15.2.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" @@ -72889,7 +72988,7 @@ in }) sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-indent-6.0.0" + sources."detect-indent-6.1.0" sources."detect-newline-3.1.0" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" @@ -72950,7 +73049,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.3" @@ -72978,9 +73077,9 @@ in sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -73034,7 +73133,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -73120,14 +73219,14 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.2" - sources."npm-packlist-2.1.5" + sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.1" + sources."npm-registry-fetch-10.1.2" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -73165,11 +73264,11 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pkg-up-2.0.0" sources."plist-3.0.2" @@ -73249,7 +73348,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."statuses-1.5.0" @@ -73262,7 +73361,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.20" + sources."systeminformation-4.34.23" sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -73347,14 +73446,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73463,7 +73562,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -73494,7 +73593,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -73581,7 +73680,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -73649,7 +73748,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -73677,7 +73776,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."type-fest-0.13.1" sources."union-value-1.0.1" (sources."unset-value-1.0.0" // { @@ -73725,7 +73824,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -73814,7 +73913,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" @@ -73903,7 +74002,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" @@ -74254,7 +74353,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -74319,7 +74418,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" + sources."is-string-1.0.6" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -74376,7 +74475,11 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.3" sources."multi-random-access-2.1.1" - sources."multicast-dns-7.2.2" + (sources."multicast-dns-7.2.3" // { + dependencies = [ + sources."dns-packet-5.2.4" + ]; + }) sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.3.1" @@ -74491,7 +74594,11 @@ in sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."simple-sha1-2.1.2" - sources."siphash24-1.1.1" + (sources."siphash24-1.2.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) sources."slice-ansi-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -74632,7 +74739,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.4.0" // { + (sources."utp-native-2.5.0" // { dependencies = [ sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" @@ -74692,10 +74799,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.8.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.1.tgz"; - sha512 = "W8lFslQXZ6HEjy9Ba7jLYDzqJZFkWVINWZjNDUZslozm2ZLMH7QWNIa74DKZXLA972ZgY8iJ0WIMxn0Y4+1POw=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.11.0.tgz"; + sha512 = "4kjsgc/rV+qtH3dTqEnR/ug36yKNjyo5z674ySkD6k08DwlLs10fsP/I+d8BAsbtjpL36bqZxLa9iNgTDqioXQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -74717,7 +74824,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.3" sources."graceful-fs-4.2.6" @@ -74744,7 +74851,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -74827,15 +74934,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.69.2"; + version = "6.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.69.2.tgz"; - sha512 = "HvwyYhkQ1Sw/eGCJkgNHEdPHy9W15WNeON35kzYeuQvY46df2W/p/L8Lik13iyWUMW7ky+v1qm9sGBhs40D/OQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.71.0.tgz"; + sha512 = "bx902tD9qzZFnM7YbL9KOqdcE8iW1KKEyxdvE5rEJVdzny7FMHpLRF/YpP+bjKdXvnCcZMNsePqNum+i2qp8Ng=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.41" + sources."@types/node-14.17.1" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -74973,30 +75080,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.54"; + version = "6.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz"; - sha512 = "+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.57.tgz"; + sha512 = "ouIL3FI6C0W3iLwwwQzKufjoP/OZagUDMCDjGLN/dqeg+lZ+cR40bdfaNTFha9ajz+zSe2SmhCOMVUVNNkJ5Sg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.54" - sources."@electron-forge/core-6.0.0-beta.54" - sources."@electron-forge/installer-base-6.0.0-beta.54" - sources."@electron-forge/installer-darwin-6.0.0-beta.54" - sources."@electron-forge/installer-deb-6.0.0-beta.54" - sources."@electron-forge/installer-dmg-6.0.0-beta.54" - sources."@electron-forge/installer-exe-6.0.0-beta.54" - sources."@electron-forge/installer-linux-6.0.0-beta.54" - sources."@electron-forge/installer-rpm-6.0.0-beta.54" - sources."@electron-forge/installer-zip-6.0.0-beta.54" - sources."@electron-forge/maker-base-6.0.0-beta.54" - sources."@electron-forge/plugin-base-6.0.0-beta.54" - sources."@electron-forge/publisher-base-6.0.0-beta.54" - sources."@electron-forge/shared-types-6.0.0-beta.54" - sources."@electron-forge/template-base-6.0.0-beta.54" - sources."@electron-forge/template-typescript-6.0.0-beta.54" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.54" - sources."@electron-forge/template-webpack-6.0.0-beta.54" + sources."@electron-forge/async-ora-6.0.0-beta.57" + sources."@electron-forge/core-6.0.0-beta.57" + sources."@electron-forge/installer-base-6.0.0-beta.57" + sources."@electron-forge/installer-darwin-6.0.0-beta.57" + sources."@electron-forge/installer-deb-6.0.0-beta.57" + sources."@electron-forge/installer-dmg-6.0.0-beta.57" + sources."@electron-forge/installer-exe-6.0.0-beta.57" + sources."@electron-forge/installer-linux-6.0.0-beta.57" + sources."@electron-forge/installer-rpm-6.0.0-beta.57" + sources."@electron-forge/installer-zip-6.0.0-beta.57" + sources."@electron-forge/maker-base-6.0.0-beta.57" + sources."@electron-forge/plugin-base-6.0.0-beta.57" + sources."@electron-forge/publisher-base-6.0.0-beta.57" + sources."@electron-forge/shared-types-6.0.0-beta.57" + sources."@electron-forge/template-base-6.0.0-beta.57" + sources."@electron-forge/template-typescript-6.0.0-beta.57" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.57" + sources."@electron-forge/template-webpack-6.0.0-beta.57" (sources."@electron/get-1.12.4" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -75013,11 +75120,13 @@ in sources."get-stream-4.1.0" sources."got-9.6.0" sources."json-buffer-3.0.0" + sources."jsonfile-4.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" + sources."universalify-0.1.2" ]; }) sources."@malept/cross-spawn-promise-1.1.1" @@ -75028,7 +75137,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75066,7 +75175,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.0.3" + sources."boolean-3.0.4" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -75104,7 +75213,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75123,6 +75232,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" + sources."define-lazy-prop-2.0.0" (sources."define-properties-1.1.3" // { dependencies = [ sources."object-keys-1.1.1" @@ -75131,17 +75241,29 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."electron-notarize-1.0.0" + (sources."electron-notarize-1.0.0" // { + dependencies = [ + sources."fs-extra-9.1.0" + ]; + }) (sources."electron-osx-sign-0.5.0" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."electron-packager-15.2.0" - sources."electron-rebuild-2.3.5" + (sources."electron-packager-15.2.0" // { + dependencies = [ + sources."fs-extra-9.1.0" + ]; + }) + (sources."electron-rebuild-2.3.5" // { + dependencies = [ + sources."fs-extra-9.1.0" + ]; + }) sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75171,7 +75293,7 @@ in sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" - sources."filenamify-4.2.0" + sources."filenamify-4.3.0" (sources."find-up-5.0.0" // { dependencies = [ sources."locate-path-6.0.0" @@ -75183,16 +75305,13 @@ in (sources."flora-colossus-1.0.1" // { dependencies = [ sources."fs-extra-7.0.1" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" ]; }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - (sources."fs-extra-9.1.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - ]; - }) + sources."fs-extra-10.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -75200,7 +75319,9 @@ in dependencies = [ sources."debug-3.2.7" sources."fs-extra-4.0.3" + sources."jsonfile-4.0.0" sources."ms-2.1.3" + sources."universalify-0.1.2" ]; }) (sources."gauge-2.7.4" // { @@ -75219,7 +75340,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."global-agent-2.2.0" sources."global-modules-1.0.0" (sources."global-prefix-1.0.2" // { @@ -75243,19 +75364,19 @@ in sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { + (sources."inquirer-8.1.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-2.2.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -75275,7 +75396,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."jsprim-1.4.1" sources."junk-3.1.0" sources."keyv-4.0.3" @@ -75335,7 +75456,7 @@ in ]; }) sources."nice-try-1.0.5" - (sources."node-abi-2.26.0" // { + (sources."node-abi-2.30.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -75360,7 +75481,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ @@ -75386,12 +75507,12 @@ in sources."object-keys-0.4.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.4.2" + sources."open-8.2.0" sources."ora-5.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" @@ -75405,7 +75526,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-2.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -75474,7 +75595,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -75523,7 +75644,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.13.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."username-5.1.0" @@ -75604,50 +75725,50 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.16" + sources."@babel/generator-7.14.3" sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" 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-module-transforms-7.14.2" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-replace-supers-7.14.4" sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" - sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.13.17" - sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-react-jsx-7.13.12" + sources."@babel/plugin-transform-destructuring-7.14.4" + sources."@babel/plugin-transform-parameters-7.14.2" + sources."@babel/plugin-transform-react-jsx-7.14.3" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75666,7 +75787,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.1" // { dependencies = [ @@ -75682,7 +75803,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75719,7 +75840,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -75736,7 +75857,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."globals-11.12.0" sources."got-11.8.2" sources."hard-rejection-2.1.0" @@ -75772,7 +75893,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -75816,9 +75937,9 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -75827,7 +75948,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -75838,7 +75959,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" @@ -75853,7 +75974,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.4" + sources."react-devtools-core-4.13.5" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -75896,7 +76017,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -75915,7 +76036,7 @@ in sources."strip-indent-3.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" sources."uri-js-4.4.1" @@ -75930,7 +76051,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -75969,8 +76090,8 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -75980,7 +76101,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.168.0" + sources."@fluentui/react-7.170.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -75994,7 +76115,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.165" + sources."@microsoft/load-themed-styles-1.10.173" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -76012,7 +76133,7 @@ in sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.19" + sources."@types/express-serve-static-core-4.17.20" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -76228,7 +76349,7 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.0.6" // { + (sources."cacache-15.2.0" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -76418,7 +76539,7 @@ in sources."dir-glob-3.0.1" sources."diskusage-1.1.3" sources."domain-browser-1.2.0" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -76440,7 +76561,7 @@ in sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."end-of-stream-1.4.4" @@ -76603,7 +76724,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -76706,7 +76827,7 @@ in sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexof-0.0.1" @@ -76724,7 +76845,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -76991,7 +77112,7 @@ in ]; }) sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."now-and-later-2.0.1" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" @@ -77021,7 +77142,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.168.0" + sources."office-ui-fabric-react-7.170.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77122,7 +77243,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-to-regexp-0.1.7" @@ -77140,7 +77261,7 @@ in sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -77248,7 +77369,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.32.11" // { + (sources."sass-1.34.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -77349,7 +77470,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -77433,7 +77554,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.6.1" // { + (sources."terser-5.7.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -77618,7 +77739,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -77664,20 +77785,21 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.25.0"; + version = "7.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; - sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; + sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" ]; @@ -77711,14 +77833,14 @@ in sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -77745,9 +77867,9 @@ in sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -77767,9 +77889,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" @@ -77802,9 +77923,9 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -77831,22 +77952,23 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "10.0.4"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.4.tgz"; - sha512 = "DEJaGxP6VDs3byYKQYw6Py8l2b1KH9S5vUo4IjvhWIEcdo5gjNkJjjzUCoExTIb0Bo7/GbKyNRI/dctUQ5f+7w=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.1.3.tgz"; + sha512 = "B8ESWH1KrLNgV0CR9r/Mc4lbgArnbWIuHnHrJlmuWx+02UriPXNnk4+nNFakzXHRh/sTHeCA4LiArkSfIqsfsw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" ]; @@ -77873,22 +77995,22 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."core_d-3.0.0" + sources."core_d-3.2.0" sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."escape-string-regexp-1.0.5" - sources."eslint-7.25.0" + sources."escape-string-regexp-4.0.0" + sources."eslint-7.27.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -77915,9 +78037,9 @@ in sources."flatted-3.1.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -77937,9 +78059,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" @@ -77973,9 +78094,9 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -78019,70 +78140,70 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.4.3"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.4.3.tgz"; - sha512 = "wSap0vOOFRgg+SUrB4QPNdJH7FeTZAXgEIdrQIayoliRe+e/466Buh1j9v5g0CE6INhRjX+Ak2u9z5pVJxa4MQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.0.tgz"; + sha512 = "SY+ff6RtgviIV5p776TbeiG3qfI8lRGKBwUbrGQNVWnlgFhrRIY8H8Dixc3jcZmNV669Id5Ha0v+UqBF1duQzw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" + sources."@babel/compat-data-7.14.4" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.13.16" + sources."@babel/generator-7.14.3" 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.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { 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.2.0" // { + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + (sources."@babel/helper-define-polyfill-provider-0.2.3" // { 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-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.16" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/parser-7.14.4" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.13.8" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" sources."@babel/plugin-proposal-export-default-from-7.12.13" - 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-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" 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" @@ -78104,10 +78225,10 @@ in 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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -78116,23 +78237,23 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-assign-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.13.0" + sources."@babel/plugin-transform-parameters-7.14.2" 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-display-name-7.14.2" + sources."@babel/plugin-transform-react-jsx-7.14.3" sources."@babel/plugin-transform-react-jsx-self-7.12.13" - sources."@babel/plugin-transform-react-jsx-source-7.12.13" + sources."@babel/plugin-transform-react-jsx-source-7.14.2" sources."@babel/plugin-transform-regenerator-7.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.13.15" // { + (sources."@babel/plugin-transform-runtime-7.14.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78142,7 +78263,7 @@ in 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-typescript-7.14.4" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" (sources."@babel/preset-env-7.12.17" // { @@ -78152,22 +78273,22 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" - sources."@expo/apple-utils-0.0.0-alpha.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" + sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-3.3.38" - sources."@expo/config-plugins-1.0.28" + sources."@expo/config-4.0.0" + sources."@expo/config-plugins-2.0.0" sources."@expo/config-types-40.0.0-beta.2" - (sources."@expo/configure-splash-screen-0.3.4" // { + (sources."@expo/configure-splash-screen-0.4.0" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.64" // { + (sources."@expo/dev-server-0.1.70" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -78182,7 +78303,7 @@ in sources."statuses-1.5.0" ]; }) - sources."@expo/dev-tools-0.13.94" + sources."@expo/dev-tools-0.13.100" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -78190,33 +78311,35 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.13" // { + (sources."@expo/image-utils-0.3.14" // { dependencies = [ + sources."mime-2.5.2" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.29" // { + (sources."@expo/json-file-8.2.30" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.64" - sources."@expo/osascript-2.0.26" - (sources."@expo/package-manager-0.0.41" // { + sources."@expo/metro-config-0.1.70" + sources."@expo/osascript-2.0.28" + (sources."@expo/package-manager-0.0.43" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" ]; }) - (sources."@expo/plist-0.0.12" // { + (sources."@expo/plist-0.0.13" // { dependencies = [ sources."xmlbuilder-14.0.0" ]; }) + sources."@expo/prebuild-config-1.0.1" sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.28" // { + (sources."@expo/schemer-1.3.29" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -78225,13 +78348,13 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.68" // { + (sources."@expo/webpack-config-0.12.74" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xcpretty-2.0.0" // { + (sources."@expo/xcpretty-2.0.1" // { dependencies = [ sources."@babel/code-frame-7.10.4" ]; @@ -78286,7 +78409,7 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - (sources."@npmcli/git-2.0.8" // { + (sources."@npmcli/git-2.0.9" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -78314,12 +78437,12 @@ in (sources."@react-native-community/cli-tools-4.13.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."array-filter-0.0.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."is-wsl-1.1.0" + sources."mime-2.5.2" sources."open-6.4.0" sources."shell-quote-1.6.1" sources."supports-color-7.2.0" @@ -78329,7 +78452,6 @@ in sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@tootallnate/once-1.1.2" - sources."@types/anymatch-1.3.1" sources."@types/cacheable-request-6.0.1" sources."@types/glob-7.1.3" sources."@types/html-minifier-terser-5.1.1" @@ -78351,7 +78473,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.27" // { + (sources."@types/webpack-4.41.29" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -78428,7 +78550,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-filter-1.0.0" + sources."array-filter-0.0.1" sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -78456,7 +78578,6 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" @@ -78469,20 +78590,19 @@ in ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.2.0" // { + (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" - sources."babel-preset-fbjs-3.3.0" + sources."babel-preset-fbjs-3.4.0" (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.12" sources."regenerator-runtime-0.11.1" ]; }) @@ -78515,7 +78635,6 @@ in (sources."bonjour-3.5.0" // { dependencies = [ sources."array-flatten-2.1.2" - sources."deep-equal-1.1.1" ]; }) sources."boolbase-1.0.0" @@ -78541,7 +78660,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" @@ -78550,7 +78669,7 @@ in sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" - (sources."cacache-15.0.6" // { + (sources."cacache-15.2.0" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -78572,7 +78691,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78587,7 +78706,7 @@ in sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.1.1" + sources."ci-info-3.2.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -78705,8 +78824,8 @@ in sources."semver-6.3.0" ]; }) - sources."core-js-3.11.0" - (sources."core-js-compat-3.11.0" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -78782,7 +78901,7 @@ in sources."mimic-response-3.1.0" ]; }) - sources."deep-equal-2.0.5" + sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-scope-analyser-1.7.0" sources."deepmerge-4.2.2" @@ -78802,7 +78921,7 @@ in sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" sources."destroy-1.0.4" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { dependencies = [ sources."debug-2.6.9" @@ -78816,10 +78935,10 @@ in }) sources."dir-glob-3.0.1" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - (sources."dom-serializer-1.3.1" // { + (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.0" ]; @@ -78845,7 +78964,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -78856,7 +78975,7 @@ in sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."end-of-stream-1.4.4" @@ -78879,8 +78998,7 @@ in }) sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" - sources."es-abstract-1.18.0" - sources."es-get-iterator-1.1.2" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -78927,7 +79045,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.74" // { + (sources."expo-pwa-0.0.80" // { dependencies = [ sources."commander-2.20.0" ]; @@ -78973,9 +79091,8 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."for-in-1.0.2" - sources."foreach-2.0.5" sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-4.1.6" // { dependencies = [ @@ -79133,7 +79250,7 @@ in sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."immer-8.0.1" (sources."import-fresh-2.0.0" // { dependencies = [ @@ -79157,15 +79274,15 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.3.2" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.2" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-docker-2.2.1" @@ -79181,10 +79298,9 @@ in ]; }) sources."is-lambda-1.0.1" - sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { @@ -79217,23 +79333,19 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" - sources."is-set-2.0.2" sources."is-stream-2.0.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.5" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" - sources."is-weakmap-2.0.1" - sources."is-weakset-2.0.1" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-2.0.5" + sources."isarray-1.0.0" sources."isemail-3.2.0" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -79284,11 +79396,7 @@ in sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" - (sources."load-bmfont-1.4.1" // { - dependencies = [ - sources."mime-1.6.0" - ]; - }) + sources."load-bmfont-1.4.1" sources."loader-runner-2.4.0" sources."loader-utils-2.0.0" sources."locate-path-6.0.0" @@ -79352,7 +79460,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-2.5.2" + sources."mime-1.4.1" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."mimic-fn-1.2.0" @@ -79456,14 +79564,13 @@ in (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" - sources."isarray-1.0.0" sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -79473,7 +79580,7 @@ in sources."semver-5.7.1" ]; }) - sources."npm-packlist-2.1.5" + sources."npm-packlist-2.2.2" (sources."npm-pick-manifest-6.1.1" // { dependencies = [ sources."hosted-git-info-4.0.2" @@ -79481,7 +79588,7 @@ in sources."semver-7.3.5" ]; }) - (sources."npm-registry-fetch-10.1.1" // { + (sources."npm-registry-fetch-10.1.2" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" @@ -79492,6 +79599,7 @@ in sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."nth-check-1.0.2" + sources."nullthrows-1.1.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."ob1-0.59.0" @@ -79509,15 +79617,15 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" 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.entries-1.1.3" + sources."object.entries-1.1.4" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" - sources."object.values-1.1.3" + sources."object.values-1.1.4" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -79530,7 +79638,7 @@ in sources."is-wsl-1.1.0" ]; }) - sources."optimize-css-assets-webpack-plugin-5.0.4" + sources."optimize-css-assets-webpack-plugin-5.0.6" sources."options-0.0.6" (sources."ora-3.4.0" // { dependencies = [ @@ -79545,7 +79653,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-any-2.1.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -79621,13 +79729,13 @@ in 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-0.1.7" sources."path-type-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."phin-2.9.3" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -79774,7 +79882,7 @@ in ]; }) sources."postcss-safe-parser-4.0.2" - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -79861,11 +79969,7 @@ in sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" sources."read-package-json-fast-2.0.2" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) + sources."readable-stream-2.3.7" sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" @@ -79953,12 +80057,11 @@ in sources."sax-1.2.4" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" - sources."selfsigned-1.10.8" + sources."selfsigned-1.10.11" sources."semver-7.3.2" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" - sources."mime-1.4.1" sources."ms-2.0.0" ]; }) @@ -79987,7 +80090,6 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" sources."simple-swizzle-0.2.2" @@ -79998,7 +80100,7 @@ in sources."uuid-2.0.3" ]; }) - sources."slugify-1.5.0" + sources."slugify-1.5.3" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -80038,7 +80140,7 @@ in (sources."sockjs-client-1.4.0" // { dependencies = [ sources."debug-3.2.7" - sources."faye-websocket-0.11.3" + sources."faye-websocket-0.11.4" ]; }) sources."socks-2.6.1" @@ -80236,7 +80338,6 @@ in ]; }) sources."has-values-0.1.4" - sources."isarray-1.0.0" ]; }) sources."untildify-3.0.3" @@ -80328,7 +80429,11 @@ in ]; }) sources."webpack-deep-scope-plugin-1.6.0" - sources."webpack-dev-middleware-3.7.3" + (sources."webpack-dev-middleware-3.7.3" // { + dependencies = [ + sources."mime-2.5.2" + ]; + }) (sources."webpack-dev-server-3.11.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -80431,9 +80536,7 @@ in sources."websocket-extensions-0.1.4" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.4" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -80489,7 +80592,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.34" // { + (sources."xdl-59.0.40" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -80610,7 +80713,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -80663,7 +80766,7 @@ in sources."os-tmpdir-1.0.2" sources."parse-json-2.2.0" sources."path-exists-2.1.0" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -80693,7 +80796,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -80729,12 +80832,23 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.3.tgz"; - sha512 = "2K8kh4MAteqj7kOnUq8Goux4Zw0oIZEGN1xoW14cGxrOTDRXvBm3eBndI9gt24rSC8h7T8qdIeLY7O9hn6LSUg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.4.tgz"; + sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; }; dependencies = [ + sources."@babel/code-frame-7.12.13" + sources."@babel/generator-7.14.3" + sources."@babel/helper-function-name-7.14.2" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -80792,8 +80906,17 @@ in }) sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."abortcontroller-polyfill-1.7.1" + sources."abort-controller-3.0.0" sources."ajv-6.12.6" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -80812,6 +80935,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" + sources."babel-eslint-10.1.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -80821,6 +80945,13 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" + (sources."boxen-5.0.1" // { + dependencies = [ + sources."chalk-4.1.1" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."btoa-lite-1.0.0" @@ -80831,6 +80962,7 @@ in ]; }) sources."call-me-maybe-1.0.1" + sources."camelcase-6.2.0" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -80859,6 +80991,7 @@ in ]; }) sources."clean-stack-3.0.1" + sources."cli-boxes-2.2.1" sources."cli-table-0.3.6" (sources."cli-ux-4.9.3" // { dependencies = [ @@ -80899,15 +81032,23 @@ in sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" - sources."escodegen-1.14.3" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."eslint-config-prettier-8.3.0" + sources."eslint-plugin-prettier-3.4.0" + sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" + sources."event-target-shim-5.0.1" sources."execa-0.10.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -80944,11 +81085,18 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.11.0" - sources."faunadb-4.0.3" + (sources."faunadb-4.3.0" // { + dependencies = [ + sources."chalk-4.1.1" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -80958,12 +81106,14 @@ in sources."from2-2.3.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" + sources."globals-11.12.0" (sources."globby-8.0.2" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -80998,6 +81148,7 @@ in sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" @@ -81033,6 +81184,7 @@ in sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -81054,7 +81206,9 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" + sources."js-tokens-4.0.0" sources."jsbn-0.1.1" + sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -81124,13 +81278,16 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" + sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" + sources."prettier-2.3.0" + sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -81149,6 +81306,7 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" + sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" @@ -81185,7 +81343,6 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" - sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -81199,7 +81356,7 @@ in ]; }) sources."sort-keys-2.0.0" - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-string-3.1.0" @@ -81238,6 +81395,7 @@ in ]; }) sources."timed-out-4.0.1" + sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -81251,6 +81409,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."type-fest-0.20.2" sources."union-value-1.0.1" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -81291,10 +81450,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.10.0"; + version = "9.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.10.0.tgz"; - sha512 = "0HoQEB6K5WiD/p/ca7KxzGZHCxtuVdck888N924TPkjkZ6YxYT8xJtuoKXCLRjJgw4yovJ/LnxZoU66w8JD1cQ=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.12.0.tgz"; + sha512 = "rPk4JyzPaSHyHQDGCh0/U63MW2nXgnZ4h0IRE2EjFHRz+KyNl/hakGX7EQKVej5HpMKFhWRjGOvDHn1PXooQgw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.7" @@ -81303,18 +81462,19 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.11.0" // { + (sources."@google-cloud/pubsub-2.12.0" // { dependencies = [ - sources."google-auth-library-7.0.4" + sources."google-auth-library-7.1.0" ]; }) - (sources."@grpc/grpc-js-1.2.12" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@grpc/proto-loader-0.5.6" + sources."@grpc/grpc-js-1.3.2" + sources."@grpc/proto-loader-0.6.2" sources."@jsdevtools/ono-7.1.3" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."@opentelemetry/api-0.18.1" sources."@opentelemetry/semantic-conventions-0.18.2" sources."@protobufjs/aspromise-1.1.2" @@ -81335,21 +81495,31 @@ in sources."@types/glob-7.1.3" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.7" sources."agent-base-6.0.2" - sources."ajv-6.12.6" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" + (sources."ajv-6.12.6" // { + dependencies = [ + sources."json-schema-traverse-0.4.1" + ]; + }) (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."anymatch-3.1.2" sources."aproba-1.2.0" @@ -81403,16 +81573,8 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" ]; }) @@ -81424,6 +81586,12 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.0" + (sources."cacache-15.2.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."tar-6.1.0" + ]; + }) (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -81435,24 +81603,41 @@ in sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) sources."chardet-0.7.0" sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cjson-0.3.3" + sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - sources."cli-color-1.4.0" + (sources."cli-color-1.4.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."cli-cursor-2.1.0" sources."cli-spinners-2.6.0" sources."cli-table-0.3.6" 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.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."color-3.0.0" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-string-1.5.5" sources."colors-1.0.3" sources."colorspace-1.1.2" @@ -81534,15 +81719,22 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" + sources."err-code-2.0.3" sources."es5-ext-0.10.53" 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" @@ -81554,12 +81746,12 @@ in sources."event-emitter-0.3.5" sources."event-target-shim-5.0.1" sources."events-listener-1.1.0" - (sources."exegesis-2.5.6" // { + (sources."exegesis-2.5.7" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."exegesis-express-2.0.0" + sources."exegesis-express-2.0.1" sources."exit-code-1.0.2" sources."exit-on-epipe-1.0.1" (sources."express-4.17.1" // { @@ -81615,11 +81807,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-constants-1.0.0" - (sources."fs-extra-0.23.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."fs-extra-5.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -81637,30 +81825,31 @@ in }) (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) - sources."gaxios-4.2.0" + sources."gaxios-4.3.0" sources."gcp-metadata-4.2.1" + sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" (sources."get-uri-3.0.2" // { dependencies = [ sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" ]; }) sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.11.2" // { + (sources."google-gax-2.14.1" // { dependencies = [ - sources."google-auth-library-7.0.4" + sources."google-auth-library-7.1.0" ]; }) sources."google-p12-pem-3.0.3" @@ -81669,7 +81858,11 @@ in sources."gtoken-5.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-ansi-2.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -81683,14 +81876,32 @@ in sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" + sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - sources."inquirer-6.3.1" + (sources."inquirer-6.3.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + ]; + }) sources."install-artifact-from-github-1.2.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -81699,9 +81910,10 @@ in sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" + sources."is-lambda-1.0.1" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -81713,7 +81925,7 @@ in sources."is-url-1.2.4" sources."is-wsl-1.1.0" sources."is-yarn-global-0.3.0" - sources."is2-2.0.6" + sources."is2-2.0.7" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -81724,11 +81936,11 @@ in sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" - sources."json-ptr-1.3.2" + sources."json-ptr-2.2.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" + sources."jsonfile-4.0.0" sources."jsonparse-1.3.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ @@ -81789,6 +82001,7 @@ in sources."semver-6.3.0" ]; }) + sources."make-fetch-happen-8.0.14" sources."marked-0.7.0" sources."marked-terminal-3.3.0" sources."media-typer-0.3.0" @@ -81807,6 +82020,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + 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.5" (sources."morgan-1.10.0" // { @@ -81831,7 +82049,7 @@ in sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" - (sources."node-gyp-7.1.2" // { + (sources."node-gyp-8.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -81841,23 +82059,30 @@ in }) sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + sources."object-hash-2.2.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-2.0.1" sources."open-6.4.0" - sources."openapi3-ts-1.4.0" + sources."openapi3-ts-2.0.1" sources."optionator-0.8.3" - sources."ora-3.4.0" + (sources."ora-3.4.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" + sources."p-map-4.0.0" sources."pac-proxy-agent-4.1.0" sources."pac-resolver-4.2.0" (sources."package-json-6.5.0" // { @@ -81870,7 +82095,7 @@ in sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" @@ -81883,11 +82108,9 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" - (sources."protobufjs-6.10.2" // { - dependencies = [ - sources."@types/node-13.13.50" - ]; - }) + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" + sources."protobufjs-6.11.2" sources."proxy-addr-2.0.6" (sources."proxy-agent-4.0.1" // { dependencies = [ @@ -81904,7 +82127,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."re2-1.15.9" + sources."re2-1.16.0" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.5.0" @@ -81916,8 +82139,10 @@ in sources."qs-6.5.2" ]; }) + sources."require-directory-2.1.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" + sources."retry-0.12.0" sources."retry-request-4.1.3" sources."rimraf-3.0.2" (sources."router-1.3.5" // { @@ -81968,37 +82193,38 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" + sources."ssri-8.0.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."stream-shift-1.0.1" (sources."string-length-1.0.1" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" ]; }) - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-4.2.2" sources."string_decoder-1.3.0" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" (sources."superstatic-7.1.0" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."fs-extra-8.1.0" + sources."has-flag-4.0.0" sources."isarray-0.0.1" - sources."jsonfile-4.0.0" sources."path-to-regexp-1.8.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" + (sources."update-notifier-4.1.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."supports-color-7.2.0" + ]; + }) ]; }) sources."supports-color-5.5.0" @@ -82054,6 +82280,8 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" 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."universal-analytics-0.4.23" sources."universalify-0.1.2" @@ -82065,14 +82293,19 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."update-notifier-4.1.3" // { + (sources."update-notifier-5.1.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."boxen-5.0.1" + sources."camelcase-6.2.0" + sources."chalk-4.1.1" + sources."global-dirs-3.0.0" sources."has-flag-4.0.0" + sources."ini-2.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + sources."semver-7.3.5" sources."supports-color-7.2.0" + sources."type-fest-0.20.2" ]; }) sources."uri-js-4.4.1" @@ -82086,16 +82319,15 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."wide-align-1.1.3" - (sources."widest-line-3.1.0" // { + (sources."wide-align-1.1.3" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" ]; }) + sources."widest-line-3.1.0" sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ @@ -82105,13 +82337,18 @@ in ]; }) 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.4.5" + sources."ws-7.4.6" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" + sources."y18n-5.0.8" sources."yallist-4.0.0" + sources."yaml-1.10.2" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.7" sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; @@ -82141,12 +82378,12 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."detect-indent-6.0.0" + sources."detect-indent-6.1.0" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" @@ -82183,8 +82420,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -82241,7 +82478,7 @@ in sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -82281,7 +82518,7 @@ in sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pid-port-0.1.1" (sources."process-exists-4.0.0" // { dependencies = [ @@ -82318,7 +82555,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -82333,7 +82570,7 @@ in }) sources."through-2.3.8" sources."tmp-0.0.33" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."validate-npm-package-license-3.0.4" @@ -82363,7 +82600,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82403,7 +82640,7 @@ in sources."decompress-response-3.3.0" sources."delayed-stream-1.0.0" sources."dom-walk-0.1.2" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."ecc-jsbn-0.1.2" sources."elliptic-6.5.4" sources."emoji-regex-8.0.0" @@ -82440,7 +82677,7 @@ in sources."immediate-3.0.6" sources."inherits-2.0.4" sources."inquirer-7.3.3" - sources."inversify-5.0.5" + sources."inversify-5.1.1" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-function-1.0.2" @@ -82536,9 +82773,9 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.3.5" // { + (sources."web3-utils-1.3.6" // { dependencies = [ - sources."underscore-1.9.1" + sources."underscore-1.12.1" ]; }) sources."which-module-2.0.0" @@ -82565,10 +82802,10 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.5.4"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.5.4.tgz"; - sha512 = "3fDbGf4fUWsF6Si60EezRNZEBK3gz6y/IofZ10pyq4yl88hATkWyrvG3xHVdP1cfyKZzV1D4uiLStkLzKbpOWQ=="; + url = "https://registry.npmjs.org/flood/-/flood-4.6.0.tgz"; + sha512 = "uio2KGAC9wNNM9wa6BrmIwRunE/AWJNDz9SnP06zHIpIHX9FC0UEHbj2kairn9CmhzhEwprBNYeFh79eyfqxvw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82720,7 +82957,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -82745,7 +82982,7 @@ in sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -82757,7 +82994,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" @@ -83021,10 +83258,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.3.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.3.0.tgz"; - sha512 = "zqVRm6QzMNGFPv3iSjSiysNuSBYJmvPoWWR/BdXyFU8mWP3Fou3d7HdxxIQak25GVRYlMGU5ryuM9mfN/k/Jdg=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.6.0.tgz"; + sha512 = "GJ0BviJw3qnONdoNpCvqgRA8jxYk7rpqi+7MrvT0U+YMcT2HGhZbhY0RxlZqYRL8qOCJTtLB/N4Z7cCUwi8g1w=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -83033,62 +83270,58 @@ in ]; }) sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.16" // { + (sources."@babel/generator-7.14.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" 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-module-transforms-7.14.2" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.17" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.16" + sources."@babel/parser-7.14.4" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.13.12" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-react-jsx-7.13.12" - sources."@babel/runtime-7.13.17" - sources."@babel/standalone-7.13.17" + sources."@babel/plugin-transform-parameters-7.14.2" + sources."@babel/plugin-transform-react-jsx-7.14.3" + sources."@babel/runtime-7.14.0" + sources."@babel/standalone-7.14.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" - sources."@graphql-tools/schema-7.1.3" - (sources."@graphql-tools/utils-7.7.3" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" + sources."@graphql-tools/schema-7.1.5" + sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -83105,7 +83338,7 @@ in ]; }) sources."@mdx-js/util-2.0.0-next.8" - (sources."@sideway/address-4.1.1" // { + (sources."@sideway/address-4.1.2" // { dependencies = [ sources."@hapi/hoek-9.2.0" ]; @@ -83123,15 +83356,15 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/node-fetch-2.5.10" - sources."@types/readable-stream-2.3.9" + sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" sources."@types/yargs-15.0.13" sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.2.1" + sources."acorn-8.2.4" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83179,19 +83412,19 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" ]; }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83241,8 +83474,8 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.17.1" - sources."contentful-sdk-core-6.7.0" + sources."contentful-management-7.22.4" + sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.7.0" // { dependencies = [ @@ -83252,7 +83485,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.3.0" + sources."create-gatsby-1.6.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -83288,10 +83521,10 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.3.0" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83344,7 +83577,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.3.0" + sources."file-type-16.5.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -83354,7 +83587,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."form-data-3.0.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" @@ -83363,8 +83596,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.3.0" - (sources."gatsby-recipes-0.14.0" // { + sources."gatsby-core-utils-2.6.0" + (sources."gatsby-recipes-0.17.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -83378,14 +83611,14 @@ in sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.3.0" + sources."gatsby-telemetry-2.6.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."git-up-4.0.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."global-dirs-3.0.0" sources."globals-11.12.0" @@ -83434,7 +83667,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -83453,7 +83686,7 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-2.1.0" - sources."is-ssh-1.3.2" + sources."is-ssh-1.3.3" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" @@ -83541,14 +83774,14 @@ in sources."no-case-3.0.4" sources."node-eta-0.9.0" sources."node-fetch-2.6.1" - sources."node-object-hash-2.3.1" - sources."node-releases-1.1.71" + sources."node-object-hash-2.3.2" + sources."node-releases-1.1.72" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-run-path-2.0.2" sources."nth-check-1.0.2" sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-path-0.11.5" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -83574,13 +83807,13 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."peek-readable-3.1.3" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.2.1" + sources."prettier-2.3.0" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -83720,7 +83953,7 @@ in sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" - sources."tslib-2.1.0" + sources."tslib-2.2.0" sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" @@ -83755,6 +83988,7 @@ in sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."value-or-promise-1.0.6" sources."vary-1.1.2" sources."vfile-4.2.1" sources."vfile-location-2.0.6" @@ -83772,9 +84006,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xdg-basedir-4.0.0" - sources."xstate-4.18.0" + sources."xstate-4.19.2" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -83911,15 +84145,14 @@ in sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.7.1" + sources."multiserver-3.7.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.5.2" + sources."muxrpc-6.5.3" sources."nearley-2.20.1" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" - sources."options-0.0.6" sources."os-homedir-1.0.2" sources."packet-stream-2.0.6" sources."packet-stream-codec-1.1.3" @@ -83969,7 +84202,7 @@ in sources."looper-3.0.0" ]; }) - sources."pull-ws-3.3.2" + sources."pull-websocket-3.4.2" sources."punycode-1.4.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -84029,8 +84262,8 @@ in sources."through-2.2.7" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" - sources."ultron-1.0.2" - sources."ws-1.1.5" + sources."typedarray-to-buffer-4.0.0" + sources."ws-7.4.6" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84064,15 +84297,15 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.4.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.4.1.tgz"; - sha512 = "FbNXUYEfnLjtjGovvCT0gegtJRpp2bRjjnP9rI2WXN4j7Sn6L63jSnlCB47iLU28PuUjxCpSAwpFaR0ykdQZMQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.1.0.tgz"; + sha512 = "xf6lKP7Ptas6bIdn/KvOn7UqkPS9/BBKcGCDVrsak/e0dWYeDZIOCMNwWxLp/zEjwBMSiPZtJdOdsIdmWap3bQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84084,10 +84317,12 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-1.1.2" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" - sources."ajv-7.2.4" - sources."ajv-formats-1.6.1" + sources."agent-base-6.0.2" + sources."ajv-8.5.0" + sources."ajv-formats-2.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -84101,6 +84336,11 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" + (sources."ast-types-0.13.4" // { + dependencies = [ + sources."tslib-2.2.0" + ]; + }) sources."atomically-1.7.0" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -84111,6 +84351,7 @@ in ]; }) sources."buffer-5.7.1" + sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -84130,15 +84371,18 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-9.0.2" + sources."conf-10.0.1" (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" ]; }) + sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" + sources."data-uri-to-buffer-3.0.1" sources."debounce-fn-4.0.0" + sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -84147,8 +84391,11 @@ in }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" + sources."degenerator-2.2.0" + sources."depd-1.1.2" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -84157,14 +84404,28 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."execa-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" + sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" + sources."file-uri-to-path-2.0.0" sources."find-up-3.0.0" + sources."fs-extra-8.1.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."function-bind-1.1.1" sources."fuse.js-6.4.6" sources."get-stream-6.0.1" + sources."get-uri-3.0.2" sources."global-dirs-3.0.0" (sources."got-9.6.0" // { dependencies = [ @@ -84178,6 +84439,9 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" + sources."http-errors-1.7.3" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -84188,9 +84452,10 @@ in sources."ini-2.0.0" sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.3.0" + sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -84202,15 +84467,18 @@ in sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" + sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."json-schema-typed-7.0.3" + sources."jsonfile-4.0.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" + sources."levn-0.3.0" sources."lines-and-columns-1.1.6" (sources."locate-path-3.0.0" // { dependencies = [ @@ -84238,10 +84506,12 @@ in sources."min-indent-1.0.1" sources."minimist-1.2.5" sources."minimist-options-4.1.0" + sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."netmask-2.0.2" sources."node-fetch-2.6.1" sources."normalize-package-data-3.0.2" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" sources."once-1.4.0" (sources."onetime-5.1.2" // { @@ -84249,12 +84519,15 @@ in sources."mimic-fn-2.1.0" ]; }) + sources."optionator-0.8.3" sources."ora-5.4.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" + sources."pac-proxy-agent-4.1.0" + sources."pac-resolver-4.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -84263,13 +84536,22 @@ in sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pkg-up-3.1.0" + sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" + (sources."proxy-agent-4.0.1" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" + sources."raw-body-2.4.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -84309,13 +84591,19 @@ in sources."semver-6.3.0" ]; }) + sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" + sources."smart-buffer-4.1.0" + sources."socks-2.6.1" + sources."socks-proxy-agent-5.0.0" + sources."source-map-0.6.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.9" + sources."statuses-1.5.0" sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" @@ -84326,11 +84614,15 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" - sources."trim-newlines-3.0.0" + sources."toidentifier-1.0.0" + sources."trim-newlines-3.0.1" sources."tslib-1.14.1" + sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" sources."update-notifier-5.1.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -84339,10 +84631,12 @@ in sources."wcwidth-1.0.1" sources."which-2.0.2" sources."widest-line-3.1.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."xdg-basedir-4.0.0" + sources."xregexp-2.0.0" sources."yallist-4.0.0" sources."yargs-parser-20.2.7" ]; @@ -84367,8 +84661,8 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84381,25 +84675,21 @@ in sources."@exodus/schemasafe-1.0.0-rc.3" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" - (sources."@graphql-tools/batch-execute-7.1.0" // { + (sources."@graphql-tools/batch-execute-7.1.2" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) - sources."tslib-2.1.0" + sources."@graphql-tools/utils-7.10.0" + sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/delegate-7.1.2" // { + (sources."@graphql-tools/delegate-7.1.5" // { dependencies = [ - sources."@graphql-tools/utils-7.7.3" + sources."@graphql-tools/utils-7.10.0" sources."tslib-2.2.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { + (sources."@graphql-tools/utils-7.10.0" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -84407,14 +84697,14 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.3.0" // { + (sources."@graphql-tools/import-6.3.1" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.2.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { + (sources."@graphql-tools/utils-7.10.0" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -84422,25 +84712,21 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.13" // { + (sources."@graphql-tools/merge-6.2.14" // { dependencies = [ - sources."@graphql-tools/utils-7.7.3" + sources."@graphql-tools/utils-7.10.0" sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/schema-7.1.3" // { + (sources."@graphql-tools/schema-7.1.5" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) - sources."tslib-2.1.0" + sources."@graphql-tools/utils-7.10.0" + sources."tslib-2.2.0" ]; }) - (sources."@graphql-tools/url-loader-6.8.3" // { + (sources."@graphql-tools/url-loader-6.10.1" // { dependencies = [ - sources."@graphql-tools/utils-7.7.3" + sources."@graphql-tools/utils-7.10.0" sources."cross-fetch-3.1.4" sources."form-data-4.0.0" sources."tslib-2.2.0" @@ -84455,25 +84741,24 @@ in }) ]; }) - (sources."@graphql-tools/wrap-7.0.5" // { + (sources."@graphql-tools/wrap-7.0.8" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) + sources."@graphql-tools/utils-7.10.0" + sources."tslib-2.2.0" ]; }) sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" + sources."@microsoft/fetch-event-source-2.0.1" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" + sources."abort-controller-3.0.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -84484,22 +84769,22 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."array-filter-1.0.0" sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" + sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."busboy-0.3.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -84559,22 +84844,21 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."dicer-0.3.0" sources."dir-glob-3.0.1" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."eventsource-1.1.0" + sources."event-target-shim-5.0.1" + sources."eventemitter3-3.1.2" sources."execa-1.0.0" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { @@ -84597,7 +84881,6 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."form-urlencoded-4.5.1" - sources."fs-capacitor-6.2.0" sources."fs-extra-9.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -84607,7 +84890,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.1" (sources."got-9.6.0" // { @@ -84624,8 +84907,7 @@ in }) sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" - sources."graphql-upload-11.0.0" - sources."graphql-ws-4.4.2" + sources."graphql-ws-4.5.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -84633,7 +84915,6 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."http2-client-1.3.3" sources."iconv-lite-0.4.24" @@ -84661,10 +84942,10 @@ in }) sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -84673,13 +84954,13 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-promise-4.0.0" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-set-2.0.2" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" @@ -84688,7 +84969,6 @@ in sources."is-wsl-2.2.0" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."isobject-4.0.0" sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" sources."iterall-1.3.0" @@ -84736,6 +85016,7 @@ in ]; }) sources."merge2-1.4.1" + sources."meros-1.1.4" sources."micromatch-4.0.4" sources."mime-db-1.47.0" sources."mime-types-2.1.30" @@ -84759,7 +85040,7 @@ in sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" @@ -84771,10 +85052,9 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.5" sources."oauth-sign-0.9.0" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" - sources."object-path-0.11.5" sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" @@ -84791,10 +85071,9 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."original-1.0.2" sources."os-tmpdir-1.0.2" sources."p-any-2.1.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" @@ -84819,14 +85098,13 @@ in sources."path-key-2.0.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."reftools-1.1.8" @@ -84836,7 +85114,6 @@ in sources."remove-trailing-separator-1.1.0" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."requires-port-1.0.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -84852,7 +85129,6 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" - sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."should-13.2.3" @@ -84866,10 +85142,7 @@ in sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" - sources."sse-z-0.3.0" sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."streamsearch-0.1.2" sources."string-env-interpolation-1.0.1" (sources."string-width-4.2.2" // { dependencies = [ @@ -84882,19 +85155,24 @@ in sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" + (sources."subscriptions-transport-ws-0.9.18" // { + dependencies = [ + sources."ws-5.2.2" + ]; + }) sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.5" // { dependencies = [ sources."yargs-16.2.0" ]; }) + sources."symbol-observable-1.2.0" sources."sync-fetch-0.3.0" sources."tar-6.0.5" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."tslib-2.0.2" sources."tunnel-agent-0.6.0" @@ -84904,10 +85182,10 @@ in sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.4.1" - sources."url-parse-1.5.1" sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" sources."valid-url-1.0.9" + sources."value-or-promise-1.0.6" sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -84941,10 +85219,10 @@ in grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz"; - sha512 = "wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw=="; + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz"; + sha512 = "9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -84963,13 +85241,13 @@ in sources."function-bind-1.1.1" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."grunt-known-options-1.1.1" + sources."grunt-known-options-2.0.0" sources."has-1.0.3" sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -84993,10 +85271,10 @@ in sources."osenv-0.1.5" sources."parse-filepath-1.0.2" sources."parse-passwd-1.0.0" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."rechoir-0.7.0" sources."resolve-1.20.0" sources."resolve-dir-1.0.1" @@ -85130,7 +85408,7 @@ in sources."esutils-2.0.3" sources."graphql-14.7.0" sources."has-ansi-2.0.0" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."is-stream-1.1.0" sources."iterall-1.3.0" sources."js-tokens-3.0.2" @@ -85227,7 +85505,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.20" + sources."systeminformation-4.34.23" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -85431,7 +85709,7 @@ in sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -85465,7 +85743,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -85552,7 +85830,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-type-1.1.0" @@ -85629,7 +85907,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -85867,7 +86145,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -85963,7 +86241,7 @@ in sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-2.1.0" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-type-1.1.0" @@ -86026,7 +86304,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -86123,7 +86401,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -86247,7 +86525,7 @@ in sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" @@ -86259,7 +86537,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.10.1" @@ -86410,7 +86688,7 @@ in sources."extsprintf-1.4.0" sources."fs.realpath-1.0.0" sources."fuzzyset.js-0.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."hue-sdk-0.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -86784,7 +87062,7 @@ in }; dependencies = [ sources."@types/jquery-3.5.5" - sources."@types/sizzle-2.3.2" + sources."@types/sizzle-2.3.3" sources."arch-2.2.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -86801,7 +87079,7 @@ in sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."good-listener-1.2.2" sources."graceful-fs-4.2.6" sources."historic-readline-1.0.8" @@ -86812,7 +87090,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.23.2" + sources."jquery.terminal-2.24.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -86956,7 +87234,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-uri-3.0.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -87037,7 +87315,7 @@ in sources."path-key-2.0.1" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.4.2" @@ -87144,7 +87422,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -87169,9 +87447,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.4" - sources."@ot-builder/bin-util-1.0.4" - (sources."@ot-builder/cli-help-shower-1.0.4" // { + sources."@ot-builder/bin-composite-types-1.0.7" + sources."@ot-builder/bin-util-1.0.7" + (sources."@ot-builder/cli-help-shower-1.0.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87181,7 +87459,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.4" // { + (sources."@ot-builder/cli-proc-1.0.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87191,7 +87469,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.4" // { + (sources."@ot-builder/cli-shared-1.0.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87201,36 +87479,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.4" - sources."@ot-builder/errors-1.0.4" - sources."@ot-builder/io-bin-cff-1.0.4" - sources."@ot-builder/io-bin-encoding-1.0.4" - sources."@ot-builder/io-bin-ext-private-1.0.4" - sources."@ot-builder/io-bin-font-1.0.4" - sources."@ot-builder/io-bin-glyph-store-1.0.4" - sources."@ot-builder/io-bin-layout-1.0.4" - sources."@ot-builder/io-bin-metadata-1.0.4" - sources."@ot-builder/io-bin-metric-1.0.4" - sources."@ot-builder/io-bin-name-1.0.4" - sources."@ot-builder/io-bin-sfnt-1.0.4" - sources."@ot-builder/io-bin-ttf-1.0.4" - sources."@ot-builder/ot-1.0.4" - sources."@ot-builder/ot-encoding-1.0.4" - sources."@ot-builder/ot-ext-private-1.0.4" - sources."@ot-builder/ot-glyphs-1.0.4" - sources."@ot-builder/ot-layout-1.0.4" - sources."@ot-builder/ot-metadata-1.0.4" - sources."@ot-builder/ot-name-1.0.4" - sources."@ot-builder/ot-sfnt-1.0.4" - sources."@ot-builder/ot-standard-glyph-namer-1.0.4" - sources."@ot-builder/prelude-1.0.4" - sources."@ot-builder/primitive-1.0.4" - sources."@ot-builder/rectify-1.0.4" - sources."@ot-builder/stat-glyphs-1.0.4" - sources."@ot-builder/trace-1.0.4" - sources."@ot-builder/var-store-1.0.4" - sources."@ot-builder/variance-1.0.4" + sources."@ot-builder/common-impl-1.0.7" + sources."@ot-builder/errors-1.0.7" + sources."@ot-builder/io-bin-cff-1.0.7" + sources."@ot-builder/io-bin-encoding-1.0.7" + sources."@ot-builder/io-bin-ext-private-1.0.7" + sources."@ot-builder/io-bin-font-1.0.7" + sources."@ot-builder/io-bin-glyph-store-1.0.7" + sources."@ot-builder/io-bin-layout-1.0.7" + sources."@ot-builder/io-bin-metadata-1.0.7" + sources."@ot-builder/io-bin-metric-1.0.7" + sources."@ot-builder/io-bin-name-1.0.7" + sources."@ot-builder/io-bin-sfnt-1.0.7" + sources."@ot-builder/io-bin-ttf-1.0.7" + sources."@ot-builder/ot-1.0.7" + sources."@ot-builder/ot-encoding-1.0.7" + sources."@ot-builder/ot-ext-private-1.0.7" + sources."@ot-builder/ot-glyphs-1.0.7" + sources."@ot-builder/ot-layout-1.0.7" + sources."@ot-builder/ot-metadata-1.0.7" + sources."@ot-builder/ot-name-1.0.7" + sources."@ot-builder/ot-sfnt-1.0.7" + sources."@ot-builder/ot-standard-glyph-namer-1.0.7" + sources."@ot-builder/prelude-1.0.7" + sources."@ot-builder/primitive-1.0.7" + sources."@ot-builder/rectify-1.0.7" + sources."@ot-builder/stat-glyphs-1.0.7" + sources."@ot-builder/trace-1.0.7" + sources."@ot-builder/var-store-1.0.7" + sources."@ot-builder/variance-1.0.7" sources."@unicode/unicode-13.0.0-1.0.6" + sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -87293,11 +87572,11 @@ in sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."hashish-0.0.4" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" @@ -87315,8 +87594,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.4" - (sources."otb-ttc-bundle-1.0.4" // { + sources."ot-builder-1.0.7" + (sources."otb-ttc-bundle-1.0.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87486,7 +87765,7 @@ in sources."fast-json-patch-2.2.1" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-flag-3.0.0" sources."hexer-1.5.0" sources."inflight-1.0.6" @@ -87544,26 +87823,30 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.6.4"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.6.4.tgz"; - sha512 = "jfiqk9aqN3mAZ+TIGqubTKGTBB5Q8KRmeXS2qr/2N80KFJHCqdCFhsyI/E2hfdd3CA4Gu5Ls9WTxXA3MW/XjwA=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.8.1.tgz"; + sha512 = "ukyHTdD3LgHl5A9No350YkAlxMRoWVhP9FR8MVhyXS1I8p6kSW27FZF3r8FBLxfwHnGvRQM7gwBRHJDKprEG8A=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.23" - sources."@joplin/fork-sax-1.2.27" - sources."@joplin/lib-1.0.18" - (sources."@joplin/renderer-1.0.26" // { + sources."@joplin/fork-htmlparser2-4.1.24" + sources."@joplin/fork-sax-1.2.28" + sources."@joplin/lib-1.8.2" + (sources."@joplin/renderer-1.8.2" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - sources."@joplin/turndown-4.0.45" - sources."@joplin/turndown-plugin-gfm-1.0.27" + (sources."@joplin/turndown-4.0.46" // { + dependencies = [ + sources."css-2.2.4" + ]; + }) + sources."@joplin/turndown-plugin-gfm-1.0.28" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -87603,7 +87886,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.892.0" // { + (sources."aws-sdk-2.918.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -87639,7 +87922,7 @@ in sources."charenc-0.0.2" sources."chokidar-3.5.1" sources."chownr-1.1.4" - sources."chroma-js-2.1.1" + sources."chroma-js-2.1.2" sources."clean-css-4.2.3" sources."clean-html-1.5.0" sources."cliss-0.0.2" @@ -87659,7 +87942,11 @@ in sources."cross-env-6.0.3" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" - sources."css-2.2.4" + (sources."css-3.0.0" // { + dependencies = [ + sources."source-map-resolve-0.6.0" + ]; + }) sources."css-b64-images-0.2.5" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -87715,7 +88002,7 @@ in sources."depd-1.1.2" sources."detect-libc-1.0.3" sources."diff-match-patch-1.0.5" - (sources."dom-serializer-1.3.1" // { + (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.0" ]; @@ -87740,7 +88027,7 @@ in }) (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."end-of-stream-1.4.4" @@ -87764,7 +88051,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -87790,7 +88077,7 @@ in sources."get-stdin-5.0.1" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" @@ -87824,7 +88111,7 @@ in sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" (sources."image-data-uri-2.0.1" // { dependencies = [ sources."fs-extra-0.26.7" @@ -87897,12 +88184,12 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - (sources."katex-0.12.0" // { + (sources."katex-0.13.11" // { dependencies = [ - sources."commander-2.20.3" + sources."commander-6.2.1" ]; }) - sources."keytar-7.6.0" + sources."keytar-7.7.0" sources."khroma-1.4.1" sources."klaw-1.3.1" sources."lazyness-1.2.0" @@ -87935,7 +88222,7 @@ in sources."markdown-it-deflist-2.1.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-expand-tabs-1.0.13" - sources."markdown-it-footnote-3.0.2" + 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.0" // { @@ -87951,7 +88238,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.9.2" + sources."mermaid-8.10.1" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."mimic-response-2.1.0" @@ -87961,7 +88248,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" ]; }) sources."minimatch-3.0.4" @@ -87979,19 +88266,19 @@ in sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.2.0" - sources."nanoid-3.1.22" + sources."nanoid-3.1.23" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" sources."needle-2.6.0" - sources."nextgen-events-1.3.4" + sources."nextgen-events-1.4.0" sources."no-case-2.3.2" - (sources."node-abi-2.26.0" // { + (sources."node-abi-2.30.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."node-addon-api-3.1.0" + sources."node-addon-api-3.2.1" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -88047,7 +88334,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" @@ -88256,7 +88543,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -88291,7 +88578,7 @@ in sources."config-chain-1.1.12" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -88342,16 +88629,16 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; - sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; + sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.13.16" + sources."@babel/parser-7.14.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" - sources."catharsis-0.8.11" + sources."catharsis-0.9.0" sources."entities-2.0.3" sources."escape-string-regexp-2.0.0" sources."graceful-fs-4.2.6" @@ -88361,7 +88648,7 @@ in sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" - sources."marked-0.8.2" + sources."marked-2.0.6" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -88369,7 +88656,7 @@ in sources."strip-json-comments-3.1.1" sources."taffydb-2.6.2" sources."uc.micro-1.0.6" - sources."underscore-1.10.2" + sources."underscore-1.13.1" sources."xmlcreate-2.0.3" ]; buildInputs = globalBuildInputs; @@ -88410,7 +88697,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -88438,10 +88725,10 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "10.0.0"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-10.0.0.tgz"; - sha512 = "iK7tAZtpoghibjdB1ncCWykeBMmke3JThUe+rnkD4qkZaglOIQ70Pw7r5UJ4lyUT+7gnw7ehmmLUHDuhqzQD+g=="; + url = "https://registry.npmjs.org/json/-/json-11.0.0.tgz"; + sha512 = "N/ITv3Yw9Za8cGxuQqSqrq6RHnlaHWZkAFavcfpH/R52522c26EbihMxnY7A1chxfXJ4d+cEFIsyTgfi9GihrA=="; }; buildInputs = globalBuildInputs; meta = { @@ -88515,7 +88802,7 @@ in sources."mime-types-2.1.30" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -88682,9 +88969,9 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.22" + sources."nanoid-3.1.23" sources."negotiator-0.6.2" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -88854,7 +89141,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@putdotio/api-client-8.15.3" + sources."@putdotio/api-client-8.16.0" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -88909,7 +89196,7 @@ in sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" sources."es5-ext-0.10.53" @@ -88991,7 +89278,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.18" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -89006,7 +89293,7 @@ in sources."path-exists-3.0.0" sources."path-key-2.0.1" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pkg-up-3.1.0" sources."punycode-2.1.1" sources."qs-6.10.1" @@ -89063,10 +89350,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.13.3"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.3.tgz"; - sha512 = "/w0eycuK1xh201T0uFXYOZWPDoeqDHqR+6SLLKsYvNtUCYtmRjq8F+M74sdpzs+dJZYWv2eUsSW0r1AJfhZOCw=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; + sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; }; dependencies = [ sources."commander-6.2.1" @@ -89093,7 +89380,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89141,12 +89428,12 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.2" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.6" sources."http-errors-1.7.2" @@ -89159,7 +89446,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."isbinaryfile-4.0.6" + sources."isbinaryfile-4.0.8" sources."jsonfile-4.0.0" sources."lodash-4.17.21" (sources."log4js-6.3.0" // { @@ -89181,7 +89468,7 @@ in sources."once-1.4.0" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."qjobs-1.2.0" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -89229,7 +89516,7 @@ in sources."void-elements-2.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.7" @@ -89274,7 +89561,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.6" @@ -89419,7 +89706,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -89673,7 +89960,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -89845,8 +90132,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -89950,7 +90237,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.8" + sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -89963,20 +90250,20 @@ in sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.1" - sources."@octokit/openapi-types-6.1.1" + sources."@octokit/graphql-4.6.2" + sources."@octokit/openapi-types-7.2.3" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.13.3" sources."@octokit/plugin-request-log-1.0.3" - sources."@octokit/plugin-rest-endpoint-methods-5.0.1" + sources."@octokit/plugin-rest-endpoint-methods-5.3.1" (sources."@octokit/request-5.4.15" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.3" - sources."@octokit/types-6.13.2" + sources."@octokit/rest-18.5.5" + sources."@octokit/types-6.16.2" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90025,7 +90312,7 @@ in sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-7.0.1" - sources."cacache-15.0.6" + sources."cacache-15.2.0" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" @@ -90111,7 +90398,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -90191,7 +90478,7 @@ in sources."git-up-4.0.2" sources."git-url-parse-11.4.4" sources."gitconfiglocal-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.3" sources."graceful-fs-4.2.6" @@ -90211,9 +90498,9 @@ in sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -90241,12 +90528,12 @@ in sources."interpret-1.4.0" sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" - sources."is-date-object-1.0.2" + sources."is-core-module-2.4.0" + sources."is-date-object-1.0.4" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-3.0.0" @@ -90254,15 +90541,15 @@ in sources."is-lambda-1.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" - sources."is-ssh-1.3.2" + sources."is-regex-1.1.3" + sources."is-ssh-1.3.3" sources."is-stream-2.0.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -90387,15 +90674,15 @@ in }) sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.2" - sources."npm-packlist-2.1.5" + sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.1" + sources."npm-registry-fetch-10.1.2" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -90428,10 +90715,10 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -90510,7 +90797,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split2-3.2.2" @@ -90546,8 +90833,8 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - sources."tr46-2.0.2" - sources."trim-newlines-3.0.0" + sources."tr46-2.1.0" + sources."trim-newlines-3.0.1" sources."trim-off-newlines-1.0.1" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" @@ -90555,7 +90842,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -90595,7 +90882,7 @@ in sources."write-file-atomic-2.4.3" (sources."write-json-file-4.3.0" // { dependencies = [ - sources."detect-indent-6.0.0" + sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" sources."make-dir-3.1.0" sources."semver-6.3.0" @@ -90792,7 +91079,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."faye-websocket-0.11.3" + sources."faye-websocket-0.11.4" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -91121,7 +91408,7 @@ in sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.5.1" // { + (sources."engine.io-client-3.5.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -91502,8 +91789,8 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.5" - sources."xmlhttprequest-ssl-1.5.5" + sources."ws-7.4.6" + sources."xmlhttprequest-ssl-1.6.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -91523,57 +91810,60 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.16" - sources."@babel/generator-7.13.16" + sources."@babel/compat-data-7.14.4" + sources."@babel/core-7.14.3" + sources."@babel/generator-7.14.3" 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.16" - 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.2.0" + sources."@babel/helper-compilation-targets-7.14.4" + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.16" + sources."@babel/parser-7.14.4" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" 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-class-static-block-7.14.3" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" + sources."@babel/plugin-proposal-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" 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.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-import-meta-7.10.4" @@ -91584,14 +91874,15 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" sources."@babel/plugin-syntax-top-level-await-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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -91599,18 +91890,18 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-parameters-7.14.2" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-runtime-7.13.15" + sources."@babel/plugin-transform-runtime-7.14.3" 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" @@ -91618,13 +91909,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.13.15" + sources."@babel/preset-env-7.14.4" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -91645,7 +91936,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -91734,9 +92025,9 @@ in sources."babel-plugin-minify-replace-0.5.0" sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" - sources."babel-plugin-polyfill-corejs2-0.2.0" - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs2-0.2.2" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" @@ -91802,7 +92093,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -91818,7 +92109,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -91890,7 +92181,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.11.0" // { + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -91942,7 +92233,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92047,7 +92338,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" (sources."global-modules-2.0.0" // { dependencies = [ @@ -92117,7 +92408,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -92245,7 +92536,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -92291,12 +92582,12 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-platform-0.11.15" sources."pbkdf2-3.1.2" sources."peek-stream-1.1.3" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" @@ -92454,7 +92745,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -92674,7 +92965,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -92694,6 +92985,57 @@ in bypassCache = true; reconstructLock = true; }; + markdownlint-cli = nodeEnv.buildNodePackage { + name = "markdownlint-cli"; + packageName = "markdownlint-cli"; + version = "0.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.27.1.tgz"; + sha512 = "p1VV6aSbGrDlpUWzHizAnSNEQAweVR3qUI/AIUubxW7BGPXziSXkIED+uRtSohUlRS/jmqp3Wi4es5j6fIrdeQ=="; + }; + dependencies = [ + sources."argparse-2.0.1" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."commander-7.1.0" + sources."concat-map-0.0.1" + sources."deep-extend-0.6.0" + sources."entities-2.1.0" + sources."fs.realpath-1.0.0" + sources."get-stdin-8.0.0" + sources."glob-7.1.7" + sources."ignore-5.1.8" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."js-yaml-4.1.0" + sources."jsonc-parser-3.0.0" + sources."linkify-it-3.0.2" + sources."lodash.differencewith-4.5.0" + sources."lodash.flatten-4.4.0" + sources."markdown-it-12.0.4" + sources."markdownlint-0.23.1" + sources."markdownlint-rule-helpers-0.14.0" + sources."mdurl-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."rc-1.2.8" + sources."strip-json-comments-2.0.1" + sources."uc.micro-1.0.6" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "MarkdownLint Command Line Interface"; + homepage = "https://github.com/igorshubovych/markdownlint-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; @@ -92745,8 +93087,8 @@ in sources."jsprim-1.4.1" sources."link-check-4.5.4" sources."lodash-4.17.21" - sources."markdown-link-extractor-1.2.7" - sources."marked-2.0.3" + sources."markdown-link-extractor-1.3.0" + sources."marked-2.0.6" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."ms-2.1.3" @@ -92901,7 +93243,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."globals-9.18.0" sources."glogg-1.0.2" sources."graceful-fs-4.2.6" @@ -92928,7 +93270,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -92989,7 +93331,7 @@ in sources."parse-node-version-1.0.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."performance-now-2.1.0" sources."pluralize-1.2.1" sources."prelude-ls-1.1.2" @@ -93131,14 +93473,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.9.2"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.2.tgz"; - sha512 = "Hw44+V/n4s6ViCnh5RR/uiza5QxaeUv/A4Q62ho+U1W1yoCLHle6kbx1ZXRSF3Jvl3BfQHuaoE3t+dyx2L4hnA=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.1.tgz"; + sha512 = "X2wIJwN22Hwh5zkpGteKg31K+wYCO8W5NUsQYlnSWyv8RpHoZfK7+kDVRzvHvVqnizTM3D+KgSnONvh+Z0EB6g=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93197,7 +93539,7 @@ in sources."dagre-0.8.5" sources."dagre-d3-0.6.4" sources."debug-4.3.2" - sources."devtools-protocol-0.0.854822" + sources."devtools-protocol-0.0.869402" sources."end-of-stream-1.4.4" sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" @@ -93206,7 +93548,7 @@ in sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."he-1.2.0" @@ -93224,7 +93566,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lower-case-1.1.4" - sources."mermaid-8.9.2" + sources."mermaid-8.10.1" sources."minify-4.1.3" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" @@ -93244,7 +93586,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-8.0.0" + sources."puppeteer-9.1.1" sources."readable-stream-3.6.0" sources."relateurl-0.2.7" sources."rimraf-3.0.2" @@ -93266,12 +93608,12 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."unbzip2-stream-1.4.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -93296,11 +93638,11 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.168.0" + sources."@fluentui/react-7.170.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.165" + sources."@microsoft/load-themed-styles-1.10.173" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -93359,13 +93701,13 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."difunc-0.0.4" - sources."dotenv-8.2.0" + sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."end-of-stream-1.4.4" @@ -93387,7 +93729,7 @@ in sources."fs-routes-7.0.1" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."got-9.6.0" sources."has-ansi-2.0.0" sources."http-cache-semantics-4.1.0" @@ -93434,9 +93776,9 @@ in sources."mute-stream-0.0.7" sources."negotiator-0.6.2" sources."node-fetch-1.6.3" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.168.0" + sources."office-ui-fabric-react-7.170.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -93527,7 +93869,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.47.1" + sources."swagger-ui-dist-3.49.0" sources."tail-2.2.2" sources."through-2.3.8" sources."tmp-0.0.33" @@ -93559,10 +93901,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.3.2"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; - sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz"; + sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -93636,7 +93978,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."randombytes-2.1.0" sources."readdirp-3.5.0" sources."require-directory-2.1.1" @@ -93725,7 +94067,7 @@ in sources."mime-types-2.1.30" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -93812,70 +94154,81 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.21.9"; + version = "3.31.16"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.21.9.tgz"; - sha512 = "GRdQHPz8gVmU1Gy6ZWv/B2t3MjQN2hLHBG4yRY6S7DbRQc8XaY9PLJPrmodycumFdzx6Da+SMmhZrzkKfZ/xSg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.31.16.tgz"; + sha512 = "zUjRjBkXVRFO4M5pvffRXjYs+E+4guB927kRN1HbU1+pwQoqbyxj5qemCbnNBglpWlU4DPW2Quvch7IVevWzCg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.16" + sources."@babel/generator-7.14.3" 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.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { 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.2.0" // { + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + (sources."@babel/helper-define-polyfill-provider-0.2.3" // { 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-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."supports-color-5.5.0" + ]; + }) + sources."@babel/parser-7.14.4" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" 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-class-static-block-7.14.3" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" + sources."@babel/plugin-proposal-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.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-class-static-block-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-json-strings-7.8.3" @@ -93885,14 +94238,15 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" sources."@babel/plugin-syntax-top-level-await-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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -93900,14 +94254,14 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-parameters-7.14.2" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" @@ -93918,26 +94272,26 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.15" // { + (sources."@babel/preset-env-7.14.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" - sources."@bugsnag/browser-7.9.2" - sources."@bugsnag/core-7.9.2" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" + sources."@bugsnag/browser-7.10.1" + sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.9.2" - sources."@bugsnag/node-7.9.2" + sources."@bugsnag/js-7.10.1" + sources."@bugsnag/node-7.10.1" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-11.2.5" // { + (sources."@netlify/build-11.29.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -93946,6 +94300,8 @@ in sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" + sources."update-notifier-4.1.3" + sources."uuid-7.0.3" ]; }) (sources."@netlify/cache-utils-1.0.7" // { @@ -93953,22 +94309,24 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-6.2.0" // { + (sources."@netlify/config-6.7.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" + sources."find-up-4.1.0" sources."is-plain-obj-2.1.0" + sources."locate-path-5.0.0" ]; }) - (sources."@netlify/framework-info-3.3.0" // { + (sources."@netlify/framework-info-5.0.0" // { dependencies = [ sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.28" - (sources."@netlify/git-utils-1.0.9" // { + sources."@netlify/functions-utils-1.3.35" + (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" sources."execa-3.4.0" @@ -93978,10 +94336,11 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-1.3.0" - (sources."@netlify/plugin-edge-handlers-1.11.6" // { + sources."@netlify/open-api-2.4.0" + (sources."@netlify/plugin-edge-handlers-1.11.12" // { dependencies = [ sources."@nodelib/fs.stat-2.0.4" + sources."@types/node-14.17.1" sources."array-union-2.1.0" sources."braces-3.0.2" sources."del-6.0.0" @@ -93993,12 +94352,11 @@ in sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.4" - sources."p-map-4.0.0" sources."slash-3.0.0" sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/plugins-list-2.8.0" + sources."@netlify/plugins-list-2.14.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -94008,9 +94366,9 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-3.7.0" // { + (sources."@netlify/zip-it-and-ship-it-4.2.1" // { dependencies = [ - sources."locate-path-5.0.0" + sources."p-map-3.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" ]; @@ -94035,29 +94393,16 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - ]; - }) - (sources."@oclif/command-1.8.0" // { - dependencies = [ - sources."@oclif/plugin-help-3.2.2" - sources."ansi-regex-3.0.0" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - (sources."wrap-ansi-4.0.0" // { + (sources."supports-color-5.5.0" // { dependencies = [ - sources."ansi-styles-3.2.1" + sources."has-flag-3.0.0" ]; }) ]; }) + sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ sources."@nodelib/fs.stat-2.0.4" @@ -94083,23 +94428,22 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.5" - (sources."@oclif/plugin-help-2.2.3" // { + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."supports-color-5.5.0" + ]; + }) + (sources."@oclif/plugin-help-3.2.2" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) (sources."wrap-ansi-4.0.0" // { dependencies = [ sources."string-width-2.1.1" @@ -94112,11 +94456,11 @@ in dependencies = [ sources."ansi-escapes-3.2.0" sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."cli-ux-4.9.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."fs-extra-7.0.1" - sources."has-flag-3.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" @@ -94126,8 +94470,6 @@ in }) (sources."@oclif/plugin-plugins-1.10.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" sources."tslib-2.2.0" @@ -94136,40 +94478,27 @@ in }) sources."@oclif/screen-1.0.4" sources."@octokit/auth-token-2.4.5" + sources."@octokit/core-3.4.0" (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" - sources."universal-user-agent-6.0.0" - ]; - }) - sources."@octokit/openapi-types-6.1.1" - (sources."@octokit/plugin-paginate-rest-1.1.2" // { - dependencies = [ - sources."@octokit/types-2.16.2" ]; }) + sources."@octokit/graphql-4.6.2" + sources."@octokit/openapi-types-7.2.3" + sources."@octokit/plugin-paginate-rest-2.13.3" sources."@octokit/plugin-request-log-1.0.3" - (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { - dependencies = [ - sources."@octokit/types-2.16.2" - ]; - }) + sources."@octokit/plugin-rest-endpoint-methods-5.3.1" (sources."@octokit/request-5.4.15" // { dependencies = [ - sources."@octokit/request-error-2.0.5" 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.13.2" + sources."@octokit/request-error-2.0.5" + sources."@octokit/rest-18.5.5" + sources."@octokit/types-6.16.2" sources."@rollup/plugin-babel-5.3.0" - (sources."@rollup/plugin-commonjs-17.1.0" // { + (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ sources."estree-walker-2.0.2" ]; @@ -94198,14 +94527,14 @@ in sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/http-cache-semantics-4.0.0" - sources."@types/http-proxy-1.17.5" + sources."@types/http-proxy-1.17.6" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -94218,7 +94547,7 @@ in sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.1.0" + sources."ajv-8.5.0" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -94251,7 +94580,7 @@ in sources."file-type-4.4.0" ]; }) - sources."archiver-4.0.2" + sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -94275,8 +94604,7 @@ in 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-sdk-2.892.0" // { + (sources."aws-sdk-2.918.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94284,13 +94612,13 @@ in ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.2.0" // { + (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -94303,6 +94631,7 @@ in sources."better-opn-2.1.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" + sources."blueimp-md5-2.18.0" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -94322,8 +94651,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.5" - sources."btoa-lite-1.0.0" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -94351,16 +94679,12 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."cardinal-2.1.1" sources."caw-2.0.1" - (sources."chalk-2.4.2" // { + (sources."chalk-4.1.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."ansi-styles-4.3.0" ]; }) sources."chardet-0.7.0" @@ -94374,7 +94698,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."ci-info-3.1.1" + sources."ci-info-3.2.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -94410,10 +94734,10 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."chalk-4.1.1" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" + sources."has-flag-4.0.0" sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.2.0" sources."tslib-2.2.0" @@ -94447,18 +94771,9 @@ in sources."common-path-prefix-2.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" - (sources."compress-commons-3.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) + sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - (sources."concordance-4.0.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."concordance-5.0.4" sources."config-chain-1.1.12" sources."configstore-5.0.1" (sources."content-disposition-0.5.3" // { @@ -94483,7 +94798,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.11.0" // { + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -94493,15 +94808,16 @@ in (sources."cpy-8.1.2" // { dependencies = [ sources."globby-9.2.0" + sources."p-map-3.0.0" ]; }) - sources."crc-3.8.0" - sources."crc32-stream-3.0.1" + sources."crc-32-1.2.0" + sources."crc32-stream-4.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-fns-1.30.1" - sources."date-time-2.1.0" + sources."date-time-3.1.0" (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" @@ -94558,6 +94874,7 @@ in sources."define-property-2.0.2" (sources."del-5.1.0" // { dependencies = [ + sources."p-map-3.0.0" sources."slash-3.0.0" ]; }) @@ -94585,7 +94902,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."dotenv-8.2.0" + sources."dotenv-10.0.0" (sources."download-7.1.0" // { dependencies = [ sources."@sindresorhus/is-0.7.0" @@ -94606,7 +94923,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -94617,7 +94934,7 @@ in sources."envinfo-7.8.1" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.11.14" + sources."esbuild-0.11.10" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -94641,6 +94958,7 @@ in sources."human-signals-2.1.0" ]; }) + sources."exit-on-epipe-1.0.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."debug-2.6.9" @@ -94689,7 +95007,7 @@ in sources."extract-stack-1.0.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-equals-2.0.1" + sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" @@ -94710,7 +95028,6 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."cacheable-request-7.0.1" - sources."chalk-4.1.1" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."got-10.7.0" @@ -94724,7 +95041,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" sources."type-fest-0.10.0" @@ -94746,16 +95063,12 @@ in sources."debug-2.6.9" ]; }) - (sources."find-up-4.1.0" // { - dependencies = [ - sources."locate-path-5.0.0" - ]; - }) + sources."find-up-5.0.0" sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."for-in-1.0.2" sources."form-data-3.0.1" sources."forwarded-0.1.2" @@ -94789,7 +95102,7 @@ in }) sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -94797,11 +95110,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" - (sources."global-dirs-2.1.0" // { - dependencies = [ - sources."ini-1.3.7" - ]; - }) + sources."global-dirs-2.1.0" sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ @@ -94833,7 +95142,7 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -94872,7 +95181,7 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-1.2.1" // { + (sources."http-proxy-middleware-1.3.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -94893,11 +95202,15 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" + sources."ini-1.3.7" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."figures-2.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { @@ -94910,14 +95223,10 @@ in sources."ansi-regex-4.1.0" ]; }) + sources."supports-color-5.5.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.3.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" - ]; - }) + sources."inquirer-autocomplete-prompt-1.3.0" sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -94929,7 +95238,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -94970,7 +95279,15 @@ in sources."isobject-3.0.1" sources."isurl-1.0.0" sources."jest-get-type-24.9.0" - sources."jest-validate-24.9.0" + (sources."jest-validate-24.9.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."supports-color-5.5.0" + ]; + }) sources."jest-worker-26.6.2" sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" @@ -94996,6 +95313,7 @@ in (sources."lambda-local-1.7.4" // { dependencies = [ sources."commander-6.2.1" + sources."dotenv-8.6.0" ]; }) sources."latest-version-5.1.0" @@ -95029,7 +95347,12 @@ in }) (sources."listr-verbose-renderer-0.5.0" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."figures-2.0.0" + sources."supports-color-5.5.0" ]; }) (sources."load-json-file-5.3.0" // { @@ -95047,24 +95370,17 @@ in sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" - sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.deburr-4.1.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" - sources."lodash.flattendeep-4.4.0" - sources."lodash.get-4.4.2" sources."lodash.isempty-4.4.0" - sources."lodash.islength-4.0.1" sources."lodash.isplainobject-4.0.6" - sources."lodash.merge-4.6.2" - sources."lodash.set-4.3.2" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.transform-4.6.0" sources."lodash.union-4.6.0" - sources."lodash.uniq-4.5.0" (sources."log-process-errors-5.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95074,12 +95390,7 @@ in sources."moize-5.4.7" ]; }) - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" - ]; - }) + sources."log-symbols-4.1.0" (sources."log-update-2.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -95113,8 +95424,7 @@ in sources."pump-1.0.3" ]; }) - sources."md5-hex-2.0.0" - sources."md5-o-matic-0.1.1" + sources."md5-hex-3.0.1" sources."media-typer-0.3.0" sources."memoize-one-5.2.1" sources."merge-descriptors-1.0.1" @@ -95143,7 +95453,7 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.1" - sources."moize-6.0.2" + sources."moize-6.0.3" (sources."move-file-1.2.0" // { dependencies = [ (sources."cp-file-6.2.0" // { @@ -95167,16 +95477,16 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.1.20" // { + (sources."netlify-7.0.0" // { dependencies = [ sources."qs-6.10.1" ]; }) - sources."netlify-redirect-parser-3.0.17" + sources."netlify-redirect-parser-3.0.29" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -95209,7 +95519,7 @@ in ]; }) sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -95232,7 +95542,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object-visit-1.0.1" @@ -95243,7 +95553,6 @@ in sources."tslib-2.2.0" ]; }) - sources."octokit-pagination-methods-1.1.0" sources."omit.js-2.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -95257,23 +95566,10 @@ in ]; }) sources."optionator-0.8.3" - (sources."ora-4.1.1" // { + (sources."ora-5.4.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" sources."cli-cursor-3.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - ]; - }) - sources."mute-stream-0.0.8" sources."restore-cursor-3.1.0" - sources."supports-color-5.5.0" ]; }) sources."os-name-3.1.0" @@ -95304,7 +95600,7 @@ in sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { dependencies = [ @@ -95350,19 +95646,31 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-4.2.0" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + ]; + }) sources."posix-character-classes-0.1.1" (sources."postcss-7.0.35" // { dependencies = [ - sources."has-flag-3.0.0" + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -95381,6 +95689,7 @@ in }) sources."pretty-ms-5.1.0" sources."prettyjson-1.2.1" + sources."printj-1.1.2" sources."process-es6-0.11.6" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" @@ -95412,10 +95721,13 @@ in }) (sources."read-pkg-up-7.0.1" // { dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."type-fest-0.8.1" ]; }) sources."readable-stream-3.6.0" + sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" sources."redeyed-2.1.1" sources."regenerate-1.4.2" @@ -95452,7 +95764,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.45.2" + sources."rollup-2.50.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -95558,7 +95870,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -95592,7 +95904,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."statsd-client-0.4.5" + sources."statsd-client-0.4.6" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.2" @@ -95613,7 +95925,11 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."supports-color-7.2.0" + (sources."supports-color-7.2.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -95626,16 +95942,28 @@ in }) sources."symbol-observable-1.2.0" sources."tar-stream-2.2.0" - sources."temp-dir-1.0.0" - (sources."tempy-0.3.0" // { + sources."temp-dir-2.0.0" + (sources."tempy-1.0.1" // { dependencies = [ - sources."crypto-random-string-1.0.0" - sources."type-fest-0.3.1" - sources."unique-string-1.0.0" + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.4" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."type-fest-0.16.0" ]; }) sources."term-size-2.2.1" - (sources."terser-5.6.1" // { + (sources."terser-5.7.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -95677,7 +96005,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.2.4" + sources."typescript-4.3.2" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -95687,7 +96015,7 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" - sources."universal-user-agent-4.0.1" + sources."universal-user-agent-6.0.0" sources."universalify-0.1.2" (sources."unixify-1.0.0" // { dependencies = [ @@ -95705,10 +96033,15 @@ in sources."has-values-0.1.4" ]; }) - (sources."update-notifier-4.1.3" // { + (sources."update-notifier-5.1.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" + sources."boxen-5.0.1" + sources."camelcase-6.2.0" + sources."global-dirs-3.0.0" + sources."ini-2.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + sources."type-fest-0.20.2" ]; }) sources."uri-js-4.4.1" @@ -95729,7 +96062,12 @@ in sources."vary-1.1.2" (sources."wait-port-0.2.9" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."commander-3.0.2" + sources."supports-color-5.5.0" ]; }) sources."wcwidth-1.0.1" @@ -95773,12 +96111,17 @@ in sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" - sources."yargs-15.4.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + ]; + }) sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" - sources."zip-stream-3.0.1" + sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -95815,10 +96158,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.0.0.tgz"; - sha512 = "Jod6NxyWtcwrpAQe0O/aXOpC5QfncotgtG73dg65z6VW/C6g/G4jiajXQUBIJ8pk/VfM6mBYE9BN/HvudTunUQ=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.1.0.tgz"; + sha512 = "o2elh1qt7YUp3lkMwY3/l4KF3j/A3fI/Qt4NH+CQQgPJdqGE9y7qnP84cjIWN27Q0jJkrSAhCVDg+wBVNBYdBg=="; }; dependencies = [ sources."@npmcli/move-file-1.1.2" @@ -95832,7 +96175,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."cacache-15.0.6" + sources."cacache-15.2.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."code-point-at-1.1.0" @@ -95848,14 +96191,14 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -96052,7 +96395,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -96090,7 +96433,7 @@ in sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; @@ -96112,7 +96455,7 @@ in sources."parseurl-1.3.3" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-1.1.0" sources."performance-now-0.2.0" @@ -96161,7 +96504,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -96179,7 +96522,7 @@ in sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" sources."rimraf-2.7.1" ]; }) @@ -96265,10 +96608,10 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -96326,16 +96669,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.3.3.tgz"; - sha512 = "byKE+FxquGqaZ8HOCaZ6iz7CUwhJeBCfNqsuOCpUDxOa/Zqg2vh0OnZBv3W2DburZq/hEy2/LZxpXPg6iYSh4A=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.3.5.tgz"; + sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g=="; }; dependencies = [ - sources."@babel/runtime-7.13.17" - sources."@node-red/editor-api-1.3.3" - sources."@node-red/editor-client-1.3.3" - (sources."@node-red/nodes-1.3.3" // { + sources."@babel/runtime-7.14.0" + sources."@node-red/editor-api-1.3.5" + sources."@node-red/editor-client-1.3.5" + (sources."@node-red/nodes-1.3.5" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -96349,9 +96692,9 @@ in }) ]; }) - sources."@node-red/registry-1.3.3" - sources."@node-red/runtime-1.3.3" - sources."@node-red/util-1.3.3" + sources."@node-red/registry-1.3.5" + sources."@node-red/runtime-1.3.5" + sources."@node-red/util-1.3.5" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -96499,7 +96842,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -96510,7 +96853,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -96543,7 +96886,7 @@ in sources."i18next-15.1.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" @@ -96618,10 +96961,10 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.5" + sources."ws-7.4.6" ]; }) - (sources."mqtt-packet-6.9.1" // { + (sources."mqtt-packet-6.10.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -96870,7 +97213,7 @@ in sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -96881,7 +97224,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -96934,7 +97277,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" @@ -96960,7 +97303,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -97099,7 +97442,7 @@ in sources."ms-2.1.3" sources."nopt-1.0.10" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { @@ -97107,7 +97450,7 @@ in sources."semver-6.3.0" ]; }) - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."prepend-http-2.0.0" sources."pstree.remy-1.1.8" sources."pump-3.0.0" @@ -97175,8 +97518,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -97201,7 +97544,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -97309,7 +97652,7 @@ in sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."github-url-from-git-1.5.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.3" @@ -97334,7 +97677,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" (sources."import-local-3.0.2" // { @@ -97381,7 +97724,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -97504,7 +97847,7 @@ in sources."hosted-git-info-4.0.2" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" (sources."npm-name-6.0.1" // { dependencies = [ sources."p-map-3.0.0" @@ -97528,7 +97871,7 @@ in sources."type-fest-0.20.2" ]; }) - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" (sources."p-event-4.2.0" // { dependencies = [ @@ -97575,9 +97918,9 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" (sources."pkg-dir-5.0.0" // { dependencies = [ sources."find-up-5.0.0" @@ -97642,7 +97985,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-1.0.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -97657,7 +98000,7 @@ in sources."tmp-0.0.33" sources."to-readable-stream-2.1.0" sources."to-regex-range-5.0.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -97704,10 +98047,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.11.1"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.11.1.tgz"; - sha512 = "F9dUPQQBm5me6t74m63CrrBSzUcLART9BmsxiJU3jZK8SBnxiqzxvsU70/uqY0cjYSoYP7AuZ2w8YfGUwhcf6A=="; + url = "https://registry.npmjs.org/npm/-/npm-7.15.0.tgz"; + sha512 = "GIXNqy3obii54oPF0gbcBNq4aYuB/Ovuu/uYp1eS4nij2PEDMnoOh6RoSv2MDvAaB4a+JbpX/tjDxLO7JAADgQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -97722,16 +98065,16 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.5.1"; + version = "11.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.5.1.tgz"; - sha512 = "4b12O2ioGKbS/4a3i/QfHNIMkNEEq7LtngUSFPatJ3FURIjGT13N/glKO/g2tPmuOtuaTXCnTJlyWBLnf+A//g=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.5.13.tgz"; + sha512 = "4R9MOr101RdTWYKZSbIbCFIXYegxt0Z7CYMNSYUzkLuusMcueMoH3E/dgfL3h4S9W/z4XboDNbP6jV9FJP/73A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/git-2.0.8" + sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -97778,7 +98121,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."builtins-1.0.3" - sources."cacache-15.0.6" + sources."cacache-15.2.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -97842,7 +98185,7 @@ in sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" (sources."global-dirs-3.0.0" // { dependencies = [ @@ -97863,9 +98206,9 @@ in sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -97946,14 +98289,14 @@ in sources."ms-2.1.2" sources."node-gyp-7.1.2" sources."nopt-5.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.2" - sources."npm-packlist-2.1.5" + sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.1" + sources."npm-registry-fetch-10.1.2" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -97976,7 +98319,7 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -98147,7 +98490,7 @@ in }) sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -98306,69 +98649,72 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.16" // { + (sources."@babel/generator-7.14.3" // { 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.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { 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.2.0" // { + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + (sources."@babel/helper-define-polyfill-provider-0.2.3" // { 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-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" 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-class-static-block-7.14.3" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" + sources."@babel/plugin-proposal-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.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-class-static-block-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" @@ -98380,14 +98726,15 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" sources."@babel/plugin-syntax-top-level-await-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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -98396,16 +98743,16 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-parameters-7.14.2" sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.13.12" + sources."@babel/plugin-transform-react-jsx-7.14.3" sources."@babel/plugin-transform-regenerator-7.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" @@ -98415,16 +98762,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.15" // { + (sources."@babel/preset-env-7.14.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -98446,7 +98793,7 @@ in sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ansi-to-html-0.6.14" + sources."ansi-to-html-0.6.15" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -98479,13 +98826,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.2.0" // { + (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -98529,7 +98876,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -98546,7 +98893,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -98573,7 +98920,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.11.0" // { + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -98667,7 +99014,6 @@ in (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.2.0" - sources."entities-2.2.0" ]; }) sources."domain-browser-1.2.0" @@ -98685,19 +99031,19 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" ]; }) sources."encodeurl-1.0.2" - sources."entities-1.1.2" + sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.0" // { + (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" ]; }) sources."es-to-primitive-1.2.1" @@ -98748,7 +99094,7 @@ in sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -98793,15 +99139,14 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.6.1" + sources."terser-5.7.0" ]; }) (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."dom-serializer-1.3.1" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domutils-2.6.0" - sources."entities-2.2.0" ]; }) sources."http-errors-1.7.3" @@ -98821,19 +99166,19 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.2" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -98846,13 +99191,13 @@ in sources."is-html-1.1.0" sources."is-negative-zero-2.0.1" sources."is-number-3.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-resolvable-1.1.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" @@ -98948,7 +99293,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -98962,7 +99307,7 @@ in 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."object.values-1.1.4" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -98980,7 +99325,7 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" @@ -99048,7 +99393,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" sources."postcss-svgo-4.0.3" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -99056,6 +99401,7 @@ in (sources."posthtml-parser-0.4.2" // { dependencies = [ sources."domhandler-2.4.2" + sources."entities-1.1.2" sources."htmlparser2-3.10.1" sources."readable-stream-3.6.0" ]; @@ -99415,7 +99761,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -99442,7 +99788,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."kad-git+https://github.com/wikimedia/kad.git#master" // { + (sources."kad-git://github.com/wikimedia/kad#master" // { dependencies = [ sources."ms-0.7.3" ]; @@ -99450,7 +99796,7 @@ in sources."kad-fs-0.0.4" sources."kad-localstorage-0.0.7" sources."kad-memstore-0.0.1" - sources."limitation-0.2.1" + sources."limitation-0.2.2" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.clone-4.5.0" @@ -99458,7 +99804,6 @@ in sources."lru-cache-6.0.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" - sources."merge-1.2.1" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" @@ -99534,7 +99879,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.8.2" // { + (sources."service-runner-2.8.3" // { dependencies = [ sources."semver-7.3.5" sources."yargs-14.2.3" @@ -99557,7 +99902,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -99617,7 +99962,7 @@ in sources."find-yarn-workspace-root-2.0.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."inflight-1.0.6" @@ -99638,7 +99983,7 @@ in sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."rimraf-2.7.1" sources."semver-5.7.1" sources."shebang-command-1.2.0" @@ -99741,7 +100086,7 @@ in sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -99761,7 +100106,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -99794,11 +100139,11 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.3.0" - sources."is-date-object-1.0.2" + sources."is-core-module-2.4.0" + sources."is-date-object-1.0.4" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -99858,7 +100203,7 @@ in }) sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-1.1.0" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ @@ -99917,7 +100262,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -100081,7 +100426,7 @@ in sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.5.1" // { + (sources."engine.io-client-3.5.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -100107,7 +100452,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -100326,8 +100671,8 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.5" - sources."xmlhttprequest-ssl-1.5.5" + sources."ws-7.4.6" + sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."yeast-0.1.2" sources."zip-stream-2.1.3" @@ -100440,7 +100785,7 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -100449,7 +100794,7 @@ in sources."get-uri-3.0.2" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.6" sources."has-1.0.3" @@ -100463,7 +100808,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -100500,8 +100845,8 @@ in sources."pac-resolver-4.2.0" sources."pako-0.2.9" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" - sources."picomatch-2.2.3" + sources."path-parse-1.0.7" + sources."picomatch-2.3.0" sources."pidusage-2.0.21" sources."pm2-axon-4.0.1" sources."pm2-axon-rpc-0.7.1" @@ -100573,10 +100918,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.2.1"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.2.1.tgz"; - sha512 = "aSrlGL3703pXhMaxFpFLAFakvpla0PaGN2/zOh5oG2qbvJ+jKuGkpHPhpLyAnhs/z+Je3wBaYA7vETu1f1xwqQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.1.tgz"; + sha512 = "viktTHmFzFckpvY/Gwtl8esjeOItpCgycIrVgLPh4qbxK4f+JqkEM+3LZF5dudyWzBZCOspZHePNuxeM0zn/Ew=="; }; buildInputs = globalBuildInputs; meta = { @@ -100626,8 +100971,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -100702,7 +101047,7 @@ in sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-2.3.0" sources."postcss-load-config-3.0.1" sources."postcss-reporter-7.0.2" @@ -100739,10 +101084,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"; - sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz"; + sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; buildInputs = globalBuildInputs; meta = { @@ -100768,7 +101113,7 @@ in sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."globule-1.3.2" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -100897,7 +101242,7 @@ in sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."globule-1.3.2" sources."graceful-fs-4.2.6" sources."has-1.0.3" @@ -100920,7 +101265,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -100968,7 +101313,7 @@ in sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-platform-0.11.15" sources."pbkdf2-3.1.2" sources."process-0.11.10" @@ -101125,10 +101470,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.134"; + version = "1.1.144"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.134.tgz"; - sha512 = "wQSdU6X3olAwCZy3tSA0fn8nMQGEwm01rm1dHM+aN2crzXIcUQ9sLOf+wCn5PFlLGsm/CXH7ROYmeMs3jXQ8Rw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz"; + sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg=="; }; buildInputs = globalBuildInputs; meta = { @@ -101200,15 +101545,15 @@ in sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graphql-0.11.7" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -101259,7 +101604,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -101376,9 +101721,8 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."array-filter-1.0.0" sources."async-0.2.10" - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" @@ -101388,7 +101732,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -101397,7 +101741,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" @@ -101406,17 +101750,17 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arguments-1.1.0" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" sources."is-set-2.0.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" @@ -101427,7 +101771,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -101477,66 +101821,69 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.13.16" + sources."@babel/cli-7.14.3" sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.16" // { + sources."@babel/compat-data-7.14.4" + (sources."@babel/core-7.14.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.16" + sources."@babel/generator-7.14.3" 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.16" // { + (sources."@babel/helper-compilation-targets-7.14.4" // { 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.2.0" // { + sources."@babel/helper-create-class-features-plugin-7.14.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.3" + (sources."@babel/helper-define-polyfill-provider-0.2.3" // { 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-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.13.16" 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-module-transforms-7.14.2" 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-replace-supers-7.14.4" 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-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.17" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" + sources."@babel/helpers-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" + sources."@babel/plugin-proposal-async-generator-functions-7.14.2" sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-dynamic-import-7.13.8" + sources."@babel/plugin-proposal-class-static-block-7.14.3" + sources."@babel/plugin-proposal-dynamic-import-7.14.2" sources."@babel/plugin-proposal-export-default-from-7.12.13" - 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-export-namespace-from-7.14.2" + sources."@babel/plugin-proposal-json-strings-7.14.2" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" + sources."@babel/plugin-proposal-numeric-separator-7.14.2" + sources."@babel/plugin-proposal-object-rest-spread-7.14.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" + sources."@babel/plugin-proposal-optional-chaining-7.14.2" sources."@babel/plugin-proposal-private-methods-7.13.0" + sources."@babel/plugin-proposal-private-property-in-object-7.14.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-class-static-block-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-default-from-7.12.13" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" @@ -101548,14 +101895,15 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-private-property-in-object-7.14.0" sources."@babel/plugin-syntax-top-level-await-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.13.16" - sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-block-scoping-7.14.4" + sources."@babel/plugin-transform-classes-7.14.4" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" + sources."@babel/plugin-transform-destructuring-7.14.4" 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" @@ -101563,22 +101911,22 @@ in 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-amd-7.14.2" + sources."@babel/plugin-transform-modules-commonjs-7.14.0" sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" + sources."@babel/plugin-transform-modules-umd-7.14.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-parameters-7.14.2" 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-display-name-7.14.2" + sources."@babel/plugin-transform-react-jsx-7.14.3" 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.13.15" sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.13.15" // { + (sources."@babel/plugin-transform-runtime-7.14.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -101590,7 +101938,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.15" // { + (sources."@babel/preset-env-7.14.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -101599,16 +101947,16 @@ in sources."@babel/preset-react-7.13.13" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.13.16" - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -101697,13 +102045,13 @@ in }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-macros-2.8.0" - (sources."babel-plugin-polyfill-corejs2-0.2.0" // { + (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" + sources."babel-plugin-polyfill-corejs3-0.2.2" + sources."babel-plugin-polyfill-regenerator-0.2.2" 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" // { @@ -101762,7 +102110,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -101796,7 +102144,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -101881,7 +102229,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.11.0" // { + (sources."core-js-compat-3.13.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101989,14 +102337,14 @@ in sources."depd-1.1.2" sources."des.js-1.0.1" sources."destroy-1.0.4" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" ]; }) sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" (sources."dom-serializer-0.2.2" // { @@ -102021,7 +102369,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102036,7 +102384,7 @@ in sources."debug-4.1.1" ]; }) - (sources."engine.io-client-3.5.1" // { + (sources."engine.io-client-3.5.2" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -102052,7 +102400,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -102131,7 +102479,7 @@ in sources."punycode-1.4.1" ]; }) - sources."faye-websocket-0.11.3" + sources."faye-websocket-0.11.4" sources."fd-slicer-1.1.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" @@ -102155,7 +102503,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -102176,7 +102524,7 @@ in sources."get-value-2.0.6" sources."git-clone-0.1.0" sources."git-promise-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globals-11.12.0" (sources."globby-6.1.0" // { @@ -102311,15 +102659,15 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.2" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -102331,7 +102679,7 @@ in sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-obj-2.0.0" sources."is-object-1.0.2" sources."is-path-cwd-2.2.0" @@ -102339,12 +102687,12 @@ in sources."is-path-inside-2.1.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -102460,7 +102808,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -102490,14 +102838,14 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" 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."object.values-1.1.4" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -102505,7 +102853,7 @@ in sources."onetime-2.0.1" sources."opener-1.5.2" sources."opn-5.5.0" - sources."optimize-css-assets-webpack-plugin-5.0.4" + sources."optimize-css-assets-webpack-plugin-5.0.6" sources."original-1.0.2" sources."os-browserify-0.3.0" sources."os-tmpdir-1.0.2" @@ -102535,14 +102883,14 @@ in 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-4.0.0" sources."pbkdf2-3.1.2" sources."peek-stream-1.1.3" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -102679,7 +103027,7 @@ in sources."postcss-value-parser-3.3.1" ]; }) - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -102789,7 +103137,7 @@ in ]; }) sources."select-hose-2.0.0" - sources."selfsigned-1.10.8" + sources."selfsigned-1.10.11" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ @@ -103180,8 +103528,8 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.5" - sources."xmlhttprequest-ssl-1.5.5" + sources."ws-7.4.6" + sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-2.1.2" @@ -103262,45 +103610,39 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.2.4-pre"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.4-pre.tgz"; - sha512 = "KKCB4KGnrbCnA7KAGlArlGccwqP6UXxxbNkXVEoTGM8GHULUa5xkeIp5QMDwagRvmVR0vBIwLewz+QW1WZORAQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.3.0.tgz"; + sha512 = "9hiYYcNshOLt4kLXcuE1nIO5nAFyOcnau3nn+rw/WNQC52Vpa77GqeJZCSBIWAUNsALmtsCby76oOiSJlX5dbQ=="; }; dependencies = [ sources."@mozilla/readability-0.4.1" + sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.2.1" + sources."acorn-8.2.4" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" ]; }) sources."acorn-walk-7.2.0" - sources."ajv-6.12.6" + sources."agent-base-6.0.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."bcrypt-pbkdf-1.0.2" sources."browser-process-hrtime-1.0.0" - sources."caseless-0.12.0" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; }) - sources."dashdash-1.14.1" sources."data-urls-2.0.0" + sources."debug-4.3.2" sources."decimal.js-10.2.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -103309,81 +103651,45 @@ in sources."webidl-conversions-5.0.0" ]; }) - sources."dompurify-2.2.7" - sources."ecc-jsbn-0.1.2" + sources."dompurify-2.2.8" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" sources."esprima-4.0.1" sources."estraverse-5.2.0" sources."esutils-2.0.3" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-3.0.1" sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."html-encoding-sniffer-2.0.1" - sources."http-signature-1.2.0" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jsdom-16.5.3" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsdom-16.6.0" sources."levn-0.3.0" sources."lodash-4.17.21" sources."mime-db-1.47.0" sources."mime-types-2.1.30" + sources."ms-2.1.2" sources."nwsapi-2.2.0" - sources."oauth-sign-0.9.0" sources."optionator-0.8.3" sources."parse5-6.0.1" - sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.5.2" - (sources."request-2.88.2" // { - dependencies = [ - sources."tough-cookie-2.5.0" - ]; - }) - sources."request-promise-core-1.1.4" - (sources."request-promise-native-1.0.9" // { - dependencies = [ - sources."tough-cookie-2.5.0" - ]; - }) sources."require-directory-2.1.1" - sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" - sources."sshpk-1.16.1" - sources."stealthy-require-1.1.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."symbol-tree-3.2.4" sources."tough-cookie-4.0.0" - sources."tr46-2.0.2" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tr46-2.1.0" sources."type-check-0.3.2" sources."universalify-0.1.2" - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."webidl-conversions-6.1.0" @@ -103392,11 +103698,11 @@ in sources."whatwg-url-8.5.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.0.0-candidate.12" + sources."yargs-17.0.1" sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; @@ -103419,36 +103725,37 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.13.16" // { + (sources."@babel/generator-7.14.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.16" - sources."@babel/runtime-7.13.17" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" + sources."@babel/parser-7.14.4" + sources."@babel/runtime-7.14.0" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.44" // { + (sources."@redocly/openapi-core-1.0.0-beta.48" // { dependencies = [ - sources."@types/node-14.14.41" + sources."@types/node-14.17.1" ]; }) sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.50" + sources."@types/json-schema-7.0.7" + sources."@types/node-13.13.52" (sources."ajv-5.5.2" // { dependencies = [ sources."fast-deep-equal-1.1.0" @@ -103515,7 +103822,7 @@ in sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -103538,7 +103845,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.2.7" + sources."dompurify-2.2.8" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103618,8 +103925,8 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.3.0" - sources."mobx-react-7.1.0" + sources."mobx-6.3.2" + sources."mobx-react-7.2.0" sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -103638,7 +103945,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-4.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.0.0-beta.18" + sources."openapi-sampler-1.0.0" sources."os-browserify-0.3.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -103648,8 +103955,8 @@ in sources."path-browserify-0.0.1" sources."path-exists-4.0.0" sources."pbkdf2-3.1.2" - sources."perfect-scrollbar-1.5.0" - sources."picomatch-2.2.3" + sources."perfect-scrollbar-1.5.1" + sources."picomatch-2.3.0" sources."polished-3.7.1" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" @@ -103699,7 +104006,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.5.0" + sources."slugify-1.5.3" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -103708,7 +104015,7 @@ in sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" - sources."styled-components-5.2.3" + sources."styled-components-5.3.0" sources."supports-color-5.5.0" sources."swagger2openapi-6.2.3" sources."timers-browserify-2.0.12" @@ -103718,7 +104025,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.2.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -103819,7 +104126,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -103863,7 +104170,7 @@ in sources."p-try-1.0.0" sources."parse-json-4.0.0" sources."path-exists-3.0.0" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-3.0.0" sources."pify-3.0.0" sources."prop-types-15.7.2" @@ -103883,7 +104190,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -103916,10 +104223,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.0.tgz"; - sha512 = "lYOMhxSWgq5jtgspF7eRL0d2rBnHO/VGZ4/qp46yu+eGoWqJkYHEuepEXzx71M8MI6Rf8HBYWaTnKi5uHWcU1Q=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.1.tgz"; + sha512 = "Ol+/3LF4sZKQQOaG7/Jsa7t5Kix1I+dx9UEYL8mOOn2sWROtLcbI3AGHZbNQPWeuvnQ/y1R3MJ0vN9ZI5nBPUg=="; }; buildInputs = globalBuildInputs; meta = { @@ -103944,7 +104251,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -103965,10 +104272,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.45.2"; + version = "2.50.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.45.2.tgz"; - sha512 = "kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz"; + sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -103990,13 +104297,14 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" sources."ignore-4.0.6" @@ -104021,14 +104329,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.55.0" - sources."@typescript-eslint/eslint-plugin-4.22.0" - sources."@typescript-eslint/experimental-utils-4.22.0" - sources."@typescript-eslint/parser-4.22.0" - sources."@typescript-eslint/scope-manager-4.22.0" - sources."@typescript-eslint/types-4.22.0" - sources."@typescript-eslint/typescript-estree-4.22.0" - sources."@typescript-eslint/visitor-keys-4.22.0" + sources."@types/vscode-1.56.0" + sources."@typescript-eslint/eslint-plugin-4.25.0" + sources."@typescript-eslint/experimental-utils-4.25.0" + sources."@typescript-eslint/parser-4.25.0" + sources."@typescript-eslint/scope-manager-4.25.0" + sources."@typescript-eslint/types-4.25.0" + sources."@typescript-eslint/typescript-estree-4.25.0" + sources."@typescript-eslint/visitor-keys-4.25.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104042,7 +104350,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."asynckit-0.4.0" - sources."azure-devops-node-api-7.2.0" + sources."azure-devops-node-api-10.2.2" sources."balanced-match-1.0.2" sources."big-integer-1.6.48" sources."binary-0.3.0" @@ -104056,6 +104364,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."builtin-modules-3.2.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."chainsaw-0.1.0" @@ -104068,7 +104377,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.6" + sources."cheerio-1.0.0-rc.9" sources."cheerio-select-1.4.0" sources."chokidar-3.5.1" sources."cliui-7.0.4" @@ -104082,7 +104391,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."css-select-4.1.2" - sources."css-what-5.0.0" + sources."css-what-5.0.1" sources."debug-4.3.2" sources."decamelize-4.0.0" sources."deep-is-0.1.3" @@ -104092,7 +104401,7 @@ in sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" - sources."dom-serializer-1.3.1" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.6.0" @@ -104108,8 +104417,8 @@ in sources."enquirer-2.3.6" sources."entities-2.2.0" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - (sources."eslint-7.25.0" // { + sources."escape-string-regexp-4.0.0" + (sources."eslint-7.27.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -104120,7 +104429,7 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -104163,9 +104472,10 @@ in sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."get-intrinsic-1.1.1" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -104175,6 +104485,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" @@ -104185,7 +104496,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -104206,7 +104517,7 @@ in sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" @@ -104225,7 +104536,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.3.2" // { + (sources."mocha-8.4.0" // { dependencies = [ sources."argparse-2.0.1" (sources."debug-4.3.1" // { @@ -104233,7 +104544,7 @@ in sources."ms-2.1.2" ]; }) - sources."escape-string-regexp-4.0.0" + sources."glob-7.1.6" sources."has-flag-4.0.0" sources."js-yaml-4.0.0" sources."ms-2.1.3" @@ -104247,9 +104558,9 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-2.0.0" + sources."object-inspect-1.10.3" sources."once-1.4.0" sources."optionator-0.9.1" - sources."os-0.1.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -104266,15 +104577,16 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."punycode-2.1.1" + sources."qs-6.10.1" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."read-1.0.7" @@ -104291,7 +104603,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.45.2" + sources."rollup-2.50.3" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104299,6 +104611,7 @@ in sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."sigmund-1.0.1" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -104319,9 +104632,9 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -104335,23 +104648,24 @@ in sources."tslib-1.14.1" ]; }) - sources."tunnel-0.0.4" + sources."tunnel-0.0.6" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typed-rest-client-1.2.0" - sources."typescript-4.2.4" + sources."typed-rest-client-1.8.4" + sources."typescript-4.3.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" - sources."underscore-1.8.3" + sources."underscore-1.13.1" sources."unzipper-0.10.11" sources."uri-js-4.4.1" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.87.1" // { + (sources."vsce-1.88.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" + sources."escape-string-regexp-1.0.5" sources."semver-5.7.1" ]; }) @@ -104530,10 +104844,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.11"; + version = "1.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz"; - sha512 = "O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; + sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -104548,7 +104862,7 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."normalize-path-3.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."readdirp-3.5.0" sources."to-regex-range-5.0.1" ]; @@ -104693,10 +105007,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.38.0"; + version = "2.43.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.38.0.tgz"; - sha512 = "M/PAO3e3XoAdWvAd02iq+K4KkWmdxx8hLMCPg4tne0XZaLF5pTOvBWTdACgkuuikQDdo+Px8dl4idsIciEGezQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.43.1.tgz"; + sha512 = "KasMG0u78+QBMecuT1Cit3PdHA1Wl6xyjrWgFEdtJnI5mBcMA9FZVMvdqRk1VjaQtnvNJfpbzfJa6Aj2rrqXWQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -104724,16 +105038,30 @@ in dependencies = [ sources."@serverless/utils-1.2.0" sources."chalk-2.4.2" + sources."dotenv-8.6.0" sources."uuid-3.4.0" ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.9.0" // { + (sources."@serverless/components-3.10.1" // { dependencies = [ + (sources."@serverless/utils-4.1.0" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) sources."ansi-regex-5.0.0" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."dotenv-8.6.0" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) + sources."jwt-decode-3.1.2" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" + sources."write-file-atomic-3.0.3" ]; }) (sources."@serverless/core-1.1.2" // { @@ -104743,7 +105071,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/enterprise-plugin-4.5.3" + sources."@serverless/dashboard-plugin-5.1.4" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.2.2" // { dependencies = [ @@ -104751,29 +105079,41 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.10" // { + (sources."@serverless/platform-client-china-2.1.13" // { dependencies = [ + sources."dotenv-8.6.0" sources."js-yaml-3.14.1" ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-4.1.0" // { + (sources."@serverless/utils-5.2.0" // { dependencies = [ + sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.15" + sources."@serverless/utils-china-1.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" + sources."@tencent-sdk/cls-0.2.1" + (sources."@tencent-sdk/common-0.1.0" // { + dependencies = [ + sources."type-fest-1.1.3" + ]; + }) + sources."@tencent-sdk/faas-0.1.5" + sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" + sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.168" + sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" + sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -104834,7 +105174,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.892.0" // { + (sources."aws-sdk-2.918.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -104916,7 +105256,7 @@ in sources."child-process-ext-2.1.1" sources."chokidar-3.5.1" sources."chownr-1.1.4" - sources."ci-info-3.1.1" + sources."ci-info-3.2.0" sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ @@ -104962,18 +105302,33 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.10.4" + sources."dayjs-1.10.5" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."decompress-4.2.1" + (sources."decompress-4.2.1" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + ]; + }) sources."decompress-response-3.3.0" - sources."decompress-tar-4.1.1" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" ]; }) - sources."decompress-targz-4.1.1" + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) (sources."decompress-unzip-4.0.1" // { dependencies = [ sources."file-type-3.9.0" @@ -104988,36 +105343,10 @@ in sources."denque-1.5.0" sources."detect-libc-1.0.3" sources."diagnostics-1.1.1" - sources."dijkstrajs-1.0.1" + sources."dijkstrajs-1.0.2" sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" - sources."dotenv-8.2.0" - (sources."download-8.0.0" // { - dependencies = [ - sources."@sindresorhus/is-0.7.0" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."file-type-11.1.0" - (sources."got-8.3.2" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."pify-3.0.0" - ]; - }) - sources."http-cache-semantics-3.8.1" - sources."keyv-3.0.0" - sources."lowercase-keys-1.0.0" - sources."make-dir-2.1.0" - sources."normalize-url-2.0.1" - sources."p-cancelable-0.4.1" - sources."pify-4.0.1" - sources."semver-5.7.1" - sources."sort-keys-2.0.0" - ]; - }) + sources."dotenv-9.0.2" sources."duplexer3-0.1.4" sources."duplexify-4.1.1" sources."duration-0.2.2" @@ -105025,7 +105354,7 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.5.1" // { + (sources."engine.io-client-3.5.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -105065,25 +105394,18 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-5.2.0" + sources."file-type-16.5.0" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" - sources."filenamify-3.0.0" + sources."filenamify-4.3.0" sources."filesize-6.3.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) sources."fs-constants-1.0.0" (sources."fs-extra-9.1.0" // { dependencies = [ @@ -105105,7 +105427,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.3" (sources."got-11.8.2" // { @@ -105120,7 +105442,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-3.1.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."responselike-2.0.0" ]; }) @@ -105135,8 +105457,6 @@ in }) sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" @@ -105165,7 +105485,6 @@ in ]; }) sources."inquirer-autocomplete-prompt-1.3.0" - sources."into-stream-3.1.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" @@ -105174,10 +105493,8 @@ in sources."is-glob-4.0.1" sources."is-natural-number-4.0.1" sources."is-number-7.0.0" - sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" - sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" @@ -105185,7 +105502,6 @@ in sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - sources."isurl-1.0.0" sources."jmespath-0.15.0" (sources."js-yaml-4.1.0" // { dependencies = [ @@ -105249,11 +105565,12 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-1.3.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."pify-3.0.0" + sources."semver-6.3.0" ]; }) + sources."media-typer-0.3.0" (sources."memoizee-0.4.15" // { dependencies = [ sources."next-tick-1.1.0" @@ -105272,18 +105589,17 @@ in sources."minipass-3.1.3" sources."minizlib-2.1.2" sources."mkdirp-0.5.5" - sources."moment-2.29.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.2" sources."nanoid-2.1.11" sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" - sources."ncjsm-4.1.0" + sources."ncjsm-4.2.0" sources."nested-error-stacks-2.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - (sources."node-abi-2.26.0" // { + (sources."node-abi-2.30.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -105292,12 +105608,12 @@ in sources."node-fetch-2.6.1" sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-hash-2.1.1" + sources."object-hash-2.2.0" sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-5.1.2" @@ -105306,10 +105622,9 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" - sources."p-event-2.3.1" + sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-timeout-2.0.1" + sources."p-timeout-3.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."got-9.6.0" @@ -105323,9 +105638,11 @@ in sources."path-key-2.0.1" sources."path-loader-1.0.10" sources."path-type-4.0.0" + sources."path2-0.1.0" + sources."peek-readable-3.1.3" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -105339,9 +105656,8 @@ in sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" - (sources."protobufjs-6.10.2" // { + (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-13.13.50" sources."long-4.0.0" ]; }) @@ -105350,13 +105666,13 @@ in sources."punycode-2.1.1" sources."qrcode-terminal-0.12.0" sources."qs-6.5.2" - sources."query-string-5.1.1" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.1" sources."readdir-glob-1.1.1" sources."readdirp-3.5.0" sources."registry-auth-token-4.2.1" @@ -105392,7 +105708,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.38.0" // { + (sources."simple-git-2.39.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -105422,7 +105738,6 @@ in sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" (sources."string-width-1.0.2" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -105434,6 +105749,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" + sources."strtok3-6.0.8" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -105484,16 +105800,17 @@ in sources."string_decoder-1.1.1" ]; }) + sources."tencent-serverless-http-1.3.2" sources."text-hex-1.0.0" sources."throat-5.0.0" sources."through-2.3.8" - sources."timed-out-4.0.1" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" + sources."token-types-2.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -105503,6 +105820,7 @@ in sources."tweetnacl-0.14.5" sources."type-2.5.0" sources."type-fest-0.21.3" + sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" @@ -105515,7 +105833,6 @@ in ]; }) sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -105552,10 +105869,10 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xmlhttprequest-ssl-1.5.5" + sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."yallist-4.0.0" sources."yaml-ast-parser-0.0.43" @@ -106201,10 +106518,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.563.0"; + version = "1.618.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.563.0.tgz"; - sha512 = "o0Cb8JR70NzR4OLDKJDx04zj9Cq4gKhFLvQxU1MxZv0Hko7K6FmMDxdgyljd3nU5wl1QyVNdnug1H4XaHfhhvA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.618.0.tgz"; + sha512 = "N4pTbZQgoZYsammFO65c8SPdmH0bxd3iP0cV6xWsbNeueLqjAJ9pKkT3+tYcIi97HmkXo6Zf1RAliH/Kge/akA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106214,11 +106531,11 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@octetstream/promisify-2.0.2" sources."@open-policy-agent/opa-wasm-1.2.0" - sources."@sindresorhus/is-2.1.1" + sources."@sindresorhus/is-4.0.1" sources."@snyk/cli-interface-2.11.0" sources."@snyk/cloud-config-parser-1.9.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-3.4.1" // { + (sources."@snyk/code-client-3.7.0" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -106229,14 +106546,19 @@ in sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-1.13.9" + sources."@snyk/docker-registry-v2-client-2.1.3" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.554.0" // { + (sources."@snyk/fix-1.601.0" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" ]; }) + (sources."@snyk/fix-pipenv-pipfile-0.3.5" // { + dependencies = [ + sources."debug-4.3.1" + ]; + }) sources."@snyk/gemfile-1.2.0" sources."@snyk/glob-parent-5.1.2-patch.1" sources."@snyk/graphlib-2.1.9-patch.3" @@ -106247,7 +106569,7 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/java-call-graph-builder-1.20.0" // { + (sources."@snyk/java-call-graph-builder-1.23.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -106264,7 +106586,7 @@ in sources."tslib-2.2.0" ]; }) - (sources."@snyk/snyk-docker-pull-3.2.3" // { + (sources."@snyk/snyk-docker-pull-3.2.5" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -106275,7 +106597,6 @@ in ]; }) sources."@szmarczak/http-timer-4.0.5" - sources."@types/braces-3.0.0" sources."@types/cacheable-request-6.0.1" sources."@types/debug-4.1.5" sources."@types/emscripten-1.39.4" @@ -106284,23 +106605,22 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.168" + sources."@types/lodash-4.14.170" sources."@types/lodash.chunk-4.2.6" sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" - sources."@types/micromatch-4.0.1" - sources."@types/node-14.14.41" + sources."@types/minimatch-3.0.4" + sources."@types/multimatch-4.0.0" + sources."@types/node-13.13.52" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.3" - sources."@types/semver-7.3.4" + sources."@types/semver-7.3.6" sources."@types/treeify-1.0.0" sources."@types/uuid-8.3.0" (sources."@yarnpkg/core-2.4.0" // { dependencies = [ - sources."@sindresorhus/is-4.0.1" sources."chalk-3.0.0" sources."cross-spawn-7.0.3" - sources."got-11.8.2" sources."mkdirp-0.5.5" sources."path-key-3.1.1" sources."semver-7.3.5" @@ -106314,11 +106634,7 @@ in sources."@yarnpkg/libzip-2.2.1" sources."@yarnpkg/lockfile-1.1.0" sources."@yarnpkg/parsers-2.3.0" - (sources."@yarnpkg/pnp-2.3.2" // { - dependencies = [ - sources."@types/node-13.13.50" - ]; - }) + sources."@yarnpkg/pnp-2.3.2" (sources."@yarnpkg/shell-2.4.1" // { dependencies = [ sources."cross-spawn-7.0.3" @@ -106348,7 +106664,9 @@ in sources."sprintf-js-1.0.3" ]; }) + sources."array-differ-3.0.0" sources."array-union-2.1.0" + sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" sources."async-3.2.0" @@ -106358,11 +106676,15 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binjumper-0.1.4" sources."bl-4.1.0" - sources."boolean-3.0.3" - (sources."boxen-4.2.0" // { + sources."boolean-3.0.4" + sources."bottleneck-2.19.5" + (sources."boxen-5.0.1" // { dependencies = [ - sources."chalk-3.0.0" - sources."type-fest-0.8.1" + sources."camelcase-6.2.0" + sources."chalk-4.1.1" + sources."strip-ansi-6.0.0" + sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -106389,6 +106711,7 @@ in }) sources."chardet-0.7.0" sources."child-process-1.0.2" + sources."child_process-1.0.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -106404,7 +106727,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -106422,11 +106745,11 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."docker-modem-2.1.3" - sources."dockerfile-ast-0.2.0" + sources."dockerfile-ast-0.2.1" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" @@ -106457,24 +106780,24 @@ in sources."fastq-1.11.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."fs-constants-1.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" (sources."global-agent-2.2.0" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.0" sources."globalthis-1.0.2" sources."globby-11.0.3" - sources."got-11.4.0" + sources."got-11.8.2" sources."graceful-fs-4.2.6" sources."grapheme-splitter-1.0.4" sources."gunzip-maybe-1.4.2" @@ -106482,11 +106805,6 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."has-yarn-2.1.0" - (sources."hcl-to-json-0.1.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -106499,7 +106817,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."is-3.3.0" sources."is-callable-1.2.3" sources."is-ci-2.0.0" @@ -106509,9 +106827,9 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-gzip-1.0.0" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" - sources."is-npm-4.0.0" + sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" @@ -106546,7 +106864,6 @@ in sources."lodash.clonedeep-4.5.0" sources."lodash.constant-3.0.0" sources."lodash.defaults-4.2.0" - sources."lodash.endswith-4.2.1" sources."lodash.filter-4.6.0" sources."lodash.find-4.6.0" sources."lodash.findindex-4.6.0" @@ -106609,6 +106926,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" + sources."multimatch-5.0.0" sources."mute-stream-0.0.8" (sources."needle-2.6.0" // { dependencies = [ @@ -106617,15 +106935,15 @@ in }) sources."nice-try-1.0.5" sources."node.extend-2.0.2" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" - sources."object-hash-2.1.1" + sources."object-hash-2.2.0" 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" - (sources."ora-5.3.0" // { + (sources."ora-5.4.0" // { dependencies = [ sources."chalk-4.1.1" sources."strip-ansi-6.0.0" @@ -106633,7 +106951,7 @@ in }) sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-map-4.0.0" @@ -106664,7 +106982,7 @@ in sources."path-key-2.0.1" sources."path-type-4.0.0" sources."peek-stream-1.1.3" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" sources."pretty-bytes-5.6.0" @@ -106687,7 +107005,11 @@ in sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -106723,12 +107045,12 @@ in sources."tslib-2.2.0" ]; }) - (sources."snyk-docker-plugin-4.19.3" // { + (sources."snyk-docker-plugin-4.20.8" // { dependencies = [ sources."p-map-2.1.0" sources."rimraf-3.0.2" sources."semver-7.3.5" - sources."snyk-nodejs-lockfile-parser-1.30.2" + sources."snyk-nodejs-lockfile-parser-1.34.0" sources."tmp-0.2.1" sources."uuid-8.3.2" ]; @@ -106740,7 +107062,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.14.2" // { + (sources."snyk-gradle-plugin-3.16.0" // { dependencies = [ sources."chalk-3.0.0" sources."rimraf-3.0.2" @@ -106749,9 +107071,9 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.25.3" // { + (sources."snyk-mvn-plugin-2.26.0" // { dependencies = [ - (sources."@snyk/java-call-graph-builder-1.19.1" // { + (sources."@snyk/java-call-graph-builder-1.21.0" // { dependencies = [ sources."tmp-0.2.1" ]; @@ -106765,8 +107087,10 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-nodejs-lockfile-parser-1.32.0" // { + (sources."snyk-nodejs-lockfile-parser-1.35.0" // { dependencies = [ + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" sources."p-map-2.1.0" sources."uuid-8.3.2" ]; @@ -106798,7 +107122,7 @@ in sources."yallist-3.1.1" ]; }) - sources."snyk-python-plugin-1.19.8" + sources."snyk-python-plugin-1.19.9" sources."snyk-resolve-1.1.0" (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ @@ -106858,7 +107182,6 @@ in sources."temp-dir-1.0.0" ]; }) - sources."term-size-2.2.1" sources."then-fs-2.0.0" sources."through-2.3.8" (sources."through2-2.0.5" // { @@ -106881,9 +107204,10 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."upath-2.0.1" - (sources."update-notifier-4.1.3" // { + (sources."update-notifier-5.1.0" // { dependencies = [ - sources."chalk-3.0.0" + sources."chalk-4.1.1" + sources."semver-7.3.5" ]; }) sources."url-parse-lax-3.0.0" @@ -106929,16 +107253,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.0.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.0.1.tgz"; - sha512 = "g8eZB9lV0f4X4gndG0k7YZAywOg1VxYgCUspS4V+sDqsgI/duqd0AW84pKkbGj/wQwxrqrEq+VZrspRfTbHTAQ=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; + sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -106946,17 +107270,17 @@ in sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.3.2" - sources."engine.io-5.0.0" + sources."engine.io-5.1.1" sources."engine.io-parser-4.0.2" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.2.0" + sources."socket.io-adapter-2.3.1" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.5" + sources."ws-7.4.6" ]; buildInputs = globalBuildInputs; meta = { @@ -107035,7 +107359,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -107080,7 +107404,7 @@ in sources."path-exists-3.0.0" 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-type-3.0.0" sources."pify-3.0.0" sources."prepend-http-1.0.4" @@ -107105,7 +107429,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -107170,7 +107494,6 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-differ-3.0.0" - sources."array-filter-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" @@ -107178,7 +107501,7 @@ in sources."assign-symbols-1.0.0" (sources."async-append-only-log-3.0.8" // { dependencies = [ - sources."push-stream-11.0.0" + sources."push-stream-11.0.1" ]; }) sources."async-each-1.0.3" @@ -107186,9 +107509,9 @@ in sources."async-write-2.1.0" sources."atob-2.1.2" sources."atomic-file-1.1.5" - sources."atomic-file-rw-0.2.1" + sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" - sources."available-typed-arrays-1.0.2" + sources."available-typed-arrays-1.0.4" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -107278,6 +107601,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cpu-percentage-1.0.3" + sources."crc-3.6.0" sources."cross-spawn-6.0.5" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -107311,9 +107635,9 @@ in sources."end-of-stream-1.4.4" sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.0" // { + (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" ]; }) (sources."es-get-iterator-1.1.2" // { @@ -107425,7 +107749,6 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-wasm-4.6.0" sources."hashlru-2.3.0" sources."he-0.5.0" sources."heap-0.2.6" @@ -107450,9 +107773,9 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.0" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.2" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-canonical-base64-1.1.1" @@ -107461,7 +107784,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-decimal-1.0.4" (sources."is-descriptor-1.0.2" // { dependencies = [ @@ -107478,7 +107801,7 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-options-1.0.1" (sources."is-plain-object-2.0.4" // { dependencies = [ @@ -107487,11 +107810,11 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-set-2.0.2" sources."is-stream-2.0.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.19" @@ -107501,11 +107824,10 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.3" // { + (sources."jitdb-3.1.4" // { dependencies = [ sources."mkdirp-1.0.4" - sources."push-stream-11.0.0" - sources."typedarray-to-buffer-4.0.0" + sources."push-stream-11.0.1" ]; }) sources."jsesc-3.0.2" @@ -107521,7 +107843,11 @@ in sources."readable-stream-3.6.0" ]; }) - sources."level-js-4.0.2" + (sources."level-js-4.0.2" // { + dependencies = [ + sources."typedarray-to-buffer-3.1.5" + ]; + }) sources."level-packager-5.1.1" sources."level-post-1.0.7" sources."level-supports-1.0.1" @@ -107576,11 +107902,11 @@ in sources."arrify-2.0.1" ]; }) - sources."multiserver-3.7.1" + sources."multiserver-3.7.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."mutexify-1.3.1" - sources."muxrpc-6.5.2" + sources."muxrpc-6.5.3" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -107650,7 +107976,6 @@ in sources."once-1.4.0" sources."onetime-1.1.0" sources."opencollective-postinstall-2.0.3" - sources."options-0.0.6" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -107666,7 +107991,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -107674,7 +107999,7 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.2.1" + sources."prettier-2.3.0" (sources."pretty-quick-3.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -107743,6 +108068,7 @@ in }) sources."pull-traverse-1.0.3" sources."pull-utf8-decoder-1.0.2" + sources."pull-websocket-3.4.2" (sources."pull-window-2.1.4" // { dependencies = [ sources."looper-2.0.0" @@ -107750,11 +108076,14 @@ in }) sources."pull-write-1.1.4" sources."pull-write-file-0.2.4" - sources."pull-ws-3.3.2" sources."pump-3.0.0" sources."punycode-1.4.1" sources."push-stream-10.1.2" - sources."push-stream-to-pull-stream-1.0.3" + (sources."push-stream-to-pull-stream-1.0.4" // { + dependencies = [ + sources."push-stream-11.0.1" + ]; + }) sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -107858,7 +108187,7 @@ in sources."right-pad-1.0.1" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" ]; }) sources."rng-0.2.2" @@ -107881,7 +108210,7 @@ in sources."shellsubstitute-1.2.0" (sources."side-channel-1.0.4" // { dependencies = [ - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" ]; }) sources."signal-exit-3.0.3" @@ -107933,7 +108262,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.1.1" // { + (sources."ssb-db2-2.1.2" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -107941,18 +108270,17 @@ in sources."level-codec-6.2.0" ]; }) - sources."glob-7.1.6" + sources."glob-7.1.7" sources."level-6.0.1" sources."level-js-5.0.2" sources."mkdirp-1.0.4" - sources."push-stream-11.0.0" + sources."push-stream-11.0.1" sources."rimraf-3.0.2" (sources."ssb-keys-8.1.0" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."typedarray-to-buffer-4.0.0" ]; }) sources."ssb-ebt-5.6.7" @@ -107987,7 +108315,7 @@ in sources."ssb-plugins-1.0.0" sources."ssb-query-2.4.5" sources."ssb-ref-2.14.3" - sources."ssb-replicate-1.3.2" + sources."ssb-replicate-1.3.3" sources."ssb-sort-1.1.3" sources."ssb-unix-socket-1.0.0" (sources."ssb-validate-4.1.4" // { @@ -108032,7 +108360,7 @@ in sources."supports-color-2.0.0" (sources."tape-4.13.3" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" sources."is-regex-1.0.5" ]; }) @@ -108058,11 +108386,10 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" + sources."typedarray-to-buffer-4.0.0" sources."typedfastbitset-0.2.1" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" - sources."ultron-1.0.2" sources."unbox-primitive-1.0.1" sources."unherit-1.1.3" sources."unified-2.1.4" @@ -108101,7 +108428,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-1.1.5" + sources."ws-7.4.6" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -108201,7 +108528,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.892.0" // { + (sources."aws-sdk-2.918.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -108340,14 +108667,14 @@ in dependencies = [ sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.5" + sources."ws-7.4.6" ]; }) - (sources."engine.io-client-3.5.1" // { + (sources."engine.io-client-3.5.2" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."ws-7.4.5" + sources."ws-7.4.6" ]; }) sources."engine.io-parser-2.2.1" @@ -108385,7 +108712,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -108453,7 +108780,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -108464,7 +108791,7 @@ in sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -108586,7 +108913,7 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-hash-0.3.0" - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -108617,7 +108944,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-loader-1.0.10" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-1.1.0" sources."pause-0.0.1" @@ -108756,7 +109083,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -108821,7 +109148,7 @@ in sources."switchback-2.0.5" (sources."temp-0.8.4" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" sources."rimraf-2.6.3" ]; }) @@ -108921,7 +109248,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" - sources."xmlhttprequest-ssl-1.5.5" + sources."xmlhttprequest-ssl-1.6.3" sources."xpath-0.0.5" sources."xpath.js-1.1.0" sources."xtend-4.0.2" @@ -108971,38 +109298,38 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.13.0"; + version = "13.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.0.tgz"; - sha512 = "jvkM1iuH88vAvjdKPwPm6abiMP2/D/1chbfb+4GVONddOOskHuCXc0loyrLdxO1AwwH6jdnjYskkTKHQD7cXwQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz"; + sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.16" - sources."@babel/generator-7.13.16" - sources."@babel/helper-compilation-targets-7.13.16" - sources."@babel/helper-function-name-7.12.13" + sources."@babel/compat-data-7.14.4" + sources."@babel/core-7.14.3" + sources."@babel/generator-7.14.3" + sources."@babel/helper-compilation-targets-7.14.4" + sources."@babel/helper-function-name-7.14.2" sources."@babel/helper-get-function-arity-7.12.13" 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-module-transforms-7.14.2" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.13.12" + sources."@babel/helper-replace-supers-7.14.4" sources."@babel/helper-simple-access-7.13.12" sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" + sources."@babel/helper-validator-identifier-7.14.0" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.17" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helpers-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.16" + sources."@babel/parser-7.14.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.17" - sources."@babel/types-7.13.17" + sources."@babel/traverse-7.14.2" + sources."@babel/types-7.14.4" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -109013,7 +109340,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -109028,11 +109355,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109070,7 +109397,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.720" + sources."electron-to-chromium-1.3.741" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109091,7 +109418,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -109121,7 +109448,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -109144,7 +109471,6 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" @@ -109167,7 +109493,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -109185,9 +109511,9 @@ in sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" (sources."postcss-7.0.35" // { dependencies = [ (sources."chalk-2.4.2" // { @@ -109206,7 +109532,7 @@ in sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" @@ -109252,7 +109578,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."specificity-0.4.1" sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { @@ -109266,10 +109592,10 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.5.1" + sources."table-6.7.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" @@ -109304,16 +109630,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.13.2.tgz"; - sha512 = "mOcSqZUM9zJORyl1FbODC4TSvlYgOgQmlEKzDj77D1JyuXfYD+XSnqxJufwa0DqI05y8uKMBKj0AWWeTu1OZjw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.0.tgz"; + sha512 = "P9QsonwMBUvwQxJbnNKggvJf1K24xaUhRrzoqkJabHtUT37JyYrt9anMIZ7WmjuKUEI/Ejf+Gu/8A0VvyUBaUQ=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -109324,13 +109650,13 @@ in sources."chokidar-3.5.1" sources."concat-map-0.0.1" sources."dedent-js-1.0.1" - sources."detect-indent-6.0.0" + sources."detect-indent-6.1.0" sources."emmet-2.3.4" sources."estree-walker-2.0.2" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -109348,24 +109674,28 @@ in sources."once-1.4.0" sources."pascal-case-3.1.2" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.3" - sources."prettier-2.2.1" - sources."prettier-plugin-svelte-2.2.0" + sources."picomatch-2.3.0" + sources."prettier-2.3.0" + sources."prettier-plugin-svelte-2.3.0" sources."readdirp-3.5.0" sources."source-map-0.7.3" sources."strip-indent-3.0.0" - sources."svelte-3.35.0" - sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.188" + sources."svelte-3.38.2" + sources."svelte-preprocess-4.7.3" + sources."svelte2tsx-0.2.0" sources."to-regex-range-5.0.1" sources."tslib-2.2.0" - sources."typescript-4.2.4" + sources."typescript-4.3.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-jsonrpc-6.1.0-next.2" + sources."vscode-languageserver-7.1.0-next.4" + (sources."vscode-languageserver-protocol-3.17.0-next.5" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.0-next.1" + ]; + }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" @@ -109402,7 +109732,7 @@ in sources."css-tree-1.1.3" sources."css-what-4.0.0" sources."csso-4.2.0" - sources."dom-serializer-1.3.1" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.6.0" @@ -109624,7 +109954,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -109807,7 +110137,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -110003,7 +110333,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -110227,7 +110557,7 @@ in sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-2.26.0" + sources."node-abi-2.30.0" sources."node-addon-api-3.0.2" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -110257,7 +110587,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."usb-1.7.0" + sources."usb-1.7.1" sources."util-deprecate-1.0.2" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -110292,7 +110622,7 @@ in sources."enhanced-resolve-2.3.0" sources."errno-0.1.8" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -110325,29 +110655,31 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.9.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.9.0.tgz"; - sha512 = "a9ZCfCOcOTNxEQsRbYBDFNu8m5cjJC+znnXCBommGSdP0W+9QmwZnkralwpxrVhRgWvLz+QyuDXtLBZcqfDmHg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.0.0.tgz"; + sha512 = "hpXezTFR/BxNzc0iJqwspAuHYrCWF/nF7mBS9OGzgBJx5FfS1xfsAIityV65Ffcr+nxCExzTQqRHR6qSWOZmbg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/ast-tester-2.3.4" - sources."@textlint/ast-traverse-2.3.4" - sources."@textlint/feature-flag-3.3.4" - sources."@textlint/fixer-formatter-3.3.4" - sources."@textlint/kernel-3.4.4" - sources."@textlint/linter-formatter-3.3.4" - sources."@textlint/markdown-to-ast-6.3.4" - sources."@textlint/module-interop-1.2.4" - sources."@textlint/source-code-fixer-3.4.4" - sources."@textlint/text-to-ast-3.3.4" - sources."@textlint/textlint-plugin-markdown-5.3.4" - sources."@textlint/textlint-plugin-text-4.3.4" - sources."@textlint/types-1.5.4" - sources."@textlint/utils-1.2.4" + sources."@textlint/ast-node-types-12.0.0" + sources."@textlint/ast-tester-12.0.0" + sources."@textlint/ast-traverse-12.0.0" + sources."@textlint/feature-flag-12.0.0" + sources."@textlint/fixer-formatter-12.0.0" + sources."@textlint/kernel-12.0.0" + sources."@textlint/linter-formatter-12.0.0" + sources."@textlint/markdown-to-ast-12.0.0" + sources."@textlint/module-interop-12.0.0" + sources."@textlint/source-code-fixer-12.0.0" + sources."@textlint/text-to-ast-12.0.0" + sources."@textlint/textlint-plugin-markdown-12.0.0" + sources."@textlint/textlint-plugin-text-12.0.0" + sources."@textlint/types-12.0.0" + sources."@textlint/utils-12.0.0" + sources."@types/mdast-3.0.3" + sources."@types/unist-2.0.3" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -110357,8 +110689,8 @@ in sources."balanced-match-1.0.2" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" sources."call-bind-1.0.2" + sources."ccount-1.1.0" (sources."chalk-1.1.3" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -110370,10 +110702,7 @@ in sources."charenc-0.0.2" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" sources."crypt-0.0.2" sources."debug-4.3.2" sources."deep-equal-1.1.1" @@ -110395,7 +110724,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -110407,19 +110736,16 @@ in sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-core-module-2.3.0" - sources."is-date-object-1.0.2" + sources."is-buffer-2.0.5" + sources."is-core-module-2.4.0" + sources."is-date-object-1.0.4" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" - sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.2" + sources."is-plain-obj-2.1.0" + sources."is-regex-1.1.3" sources."is-utf8-0.2.1" - sources."is-whitespace-character-1.0.4" - sources."is-word-character-1.0.4" - sources."isarray-1.0.0" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" @@ -110430,9 +110756,38 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."log-symbols-1.0.2" + sources."longest-streak-2.0.4" sources."map-like-2.0.0" - sources."markdown-escapes-1.0.4" - sources."md5-2.3.0" + 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" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) + 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.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -110446,11 +110801,11 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."parse-entities-1.2.2" + sources."parse-entities-2.0.0" sources."parse-json-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + 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" @@ -110458,7 +110813,6 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."process-nextick-args-2.0.1" sources."rc-config-loader-3.0.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { @@ -110471,30 +110825,27 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.7" sources."regexp.prototype.flags-1.3.1" - sources."remark-frontmatter-1.3.3" - sources."remark-parse-5.0.0" + 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."replace-ext-1.0.0" sources."require-from-string-2.0.2" sources."resolve-1.20.0" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."slice-ansi-0.0.4" 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.7" + sources."spdx-license-ids-3.0.9" sources."sprintf-js-1.0.3" - sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) - sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -110513,31 +110864,22 @@ in }) sources."text-table-0.2.0" sources."traverse-0.6.6" - sources."trim-0.0.1" - sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.4.0" - sources."typedarray-0.0.6" - sources."unherit-1.1.3" - sources."unified-6.2.0" + sources."unified-9.2.1" sources."unique-concat-0.2.2" - sources."unist-util-is-3.0.0" - sources."unist-util-remove-position-1.1.4" - sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.1" - sources."unist-util-visit-parents-2.1.2" - sources."util-deprecate-1.0.2" + sources."unist-util-is-4.1.0" + sources."unist-util-stringify-position-2.0.3" + sources."unist-util-visit-parents-3.1.1" sources."validate-npm-package-license-3.0.4" - sources."vfile-2.3.0" - sources."vfile-location-2.0.6" - sources."vfile-message-1.1.1" + sources."vfile-4.2.1" + sources."vfile-message-2.0.4" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" - sources."x-is-string-0.1.0" sources."xml-escape-1.1.0" - sources."xtend-4.0.2" + sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -110558,7 +110900,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/ast-node-types-4.4.3" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -110610,18 +110952,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/types-1.5.4" + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/types-1.5.5" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.2.1" + sources."acorn-8.2.4" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -110721,7 +111063,7 @@ in }) sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."global-dirs-2.1.0" // { dependencies = [ sources."ini-1.3.7" @@ -110758,7 +111100,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -110831,7 +111173,7 @@ in sources."nlcst-search-2.0.0" sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."object-keys-1.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -110850,7 +111192,7 @@ in sources."parse5-6.0.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pause-stream-0.0.11" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" @@ -110914,7 +111256,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -110943,7 +111285,7 @@ in sources."structured-source-3.0.2" sources."supports-color-5.5.0" sources."term-size-2.2.1" - (sources."textlint-rule-helper-2.1.1" // { + (sources."textlint-rule-helper-2.2.0" // { dependencies = [ sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" @@ -110960,7 +111302,7 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-6.1.0" sources."trim-0.0.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."type-fest-0.13.1" @@ -111125,7 +111467,7 @@ in sha512 = "t4twAgEZWWMhIYH3xURZr/A1EcAUKiC10/N0EU6RG+ZBa9+FB5HDhMdQMS5wHqEI1FopWHTYYv/sC2PGEtvyLg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/ast-node-types-4.4.3" sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.3" sources."bail-1.0.5" @@ -111147,7 +111489,7 @@ in sources."readable-stream-3.6.0" sources."rehype-parse-6.0.2" sources."safe-buffer-5.2.1" - sources."sentence-splitter-3.2.1" + sources."sentence-splitter-3.2.2" sources."space-separated-tokens-1.1.5" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" @@ -111183,8 +111525,8 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/types-1.5.4" + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/types-1.5.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" @@ -111193,10 +111535,10 @@ in sources."object_values-0.1.2" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" - sources."sentence-splitter-3.2.1" + sources."sentence-splitter-3.2.2" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.1.1" + sources."textlint-rule-helper-2.2.0" sources."typedarray-0.0.6" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" @@ -111228,23 +111570,23 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."object-inspect-1.10.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -111271,13 +111613,13 @@ in sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/types-1.5.4" + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/types-1.5.5" sources."boundary-1.0.1" sources."lodash-4.17.21" sources."split-lines-2.1.0" sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.1.1" + sources."textlint-rule-helper-2.2.0" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" @@ -111301,13 +111643,13 @@ in sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/types-1.5.4" + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/types-1.5.5" sources."boundary-1.0.1" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.1.1" + sources."textlint-rule-helper-2.2.0" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" @@ -111334,24 +111676,24 @@ in sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.3" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" + sources."is-bigint-1.0.2" + sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-capitalized-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."object-inspect-1.10.2" + sources."is-number-object-1.0.5" + sources."is-regex-1.1.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -111378,8 +111720,8 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.2" - sources."@textlint/types-1.5.4" + sources."@textlint/ast-node-types-4.4.3" + sources."@textlint/types-1.5.5" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."call-bind-1.0.2" @@ -111394,7 +111736,7 @@ in sources."object.assign-4.1.2" sources."passive-voice-0.1.0" sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.1.1" + sources."textlint-rule-helper-2.2.0" sources."too-wordy-0.1.6" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" @@ -111428,7 +111770,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -111504,7 +111846,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -111579,7 +111921,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."got-11.5.2" sources."graceful-fs-4.2.6" sources."grapheme-splitter-1.0.4" @@ -111607,7 +111949,7 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -111615,7 +111957,7 @@ in sources."ipaddr.js-1.9.1" (sources."irc-framework-4.9.0" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."is-fullwidth-code-point-1.0.0" @@ -111681,7 +112023,7 @@ in ]; }) sources."nopt-4.0.3" - sources."normalize-url-4.5.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" @@ -111696,7 +112038,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -111843,7 +112185,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -111862,10 +112204,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.128.0"; + version = "0.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.128.0.tgz"; - sha512 = "i0ap/E+OaSfzw7bD1TtYnPo3VEplkl70WX5fZqZnfZsE3k3aSFudqrrC9ldFZfYFkn1zwDmBcdGfiIm/hnbyZA=="; + url = "https://registry.npmjs.org/three/-/three-0.129.0.tgz"; + sha512 = "wiWio1yVRg2Oj6WEWsTHQo5eSzYpEwSBtPSi3OofNpvFbf26HFfb9kw4FZJNjII4qxzp0b1xLB11+tKkBGB1ZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -111898,16 +112240,16 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.3.0.tgz"; - sha512 = "j+Bk1jWH4Ki/7hfizhG6MvaZMEeHNdaJnzjC50CUJThfDkxr8nN1rn7smaX9Wg5W1iiBeBQyJreTExZloTRCJw=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.3.2.tgz"; + sha512 = "fVpcAtANFCRTadfJ87uMKb41FpWeCikJkoFkFdRzCOQ/cA/9OgSbi2P08otCCyY2oAjLmRO5eOHZAeud+eKwzA=="; }; dependencies = [ sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-3.2.0" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -111941,7 +112283,7 @@ in sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -111962,16 +112304,13 @@ in }) sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."minimatch-3.0.4" - (sources."node-appc-1.1.2" // { - dependencies = [ - sources."async-3.2.0" - ]; - }) + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."node-appc-1.1.2" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -111992,7 +112331,7 @@ in sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" - sources."temp-0.9.1" + sources."temp-0.9.4" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -112024,10 +112363,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.14.0"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.14.0.tgz"; - sha512 = "2oIu0p1QjDYdNp3fI0gTxJvwOmzcP76hMwCn4KlqfFxDihBghwDmvWhGU3PPn4zNf3yBDJ1xlsxY14WHqgcV7g=="; + url = "https://registry.npmjs.org/triton/-/triton-7.15.0.tgz"; + sha512 = "P0toU5OT3VdKKkJSrjLrFZFgo+0UlPliZ2TDLzF/brfOaPwfousrwJrVfmxtMPO3gk0Dpokz/gfJc7CO9ENeTg=="; }; dependencies = [ sources."asn1-0.2.4" @@ -112240,7 +112579,7 @@ in sources."diff-2.2.3" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -112294,10 +112633,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.2.4"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; - sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz"; + sha512 = "zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -112349,10 +112688,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.4"; + version = "3.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.4.tgz"; - sha512 = "kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; + sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; }; buildInputs = globalBuildInputs; meta = { @@ -112385,20 +112724,20 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.16"; + version = "1.5.18"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.16.tgz"; - sha512 = "Hv5QiC0qMJChmDf6s3qwwclL38XQUKVInJaJZiNuIHh6vvO9hjkeoUb7djmGb2F2xxVuU7aOtpbdizfwunzU4A=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.18.tgz"; + sha512 = "E8fuVzs7KhfqWyk+MQ+LqP2A0IXFW643Xu2BJCw4iLpmFBoKHl+7AUZ5q4o2qefe1DFoAMijmbFsxbIcmDuvWg=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-12.1.0" + sources."@primer/octicons-14.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.41" + sources."@types/node-14.17.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -112451,7 +112790,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.3" + sources."diff2html-3.4.4" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -112459,7 +112798,7 @@ in sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-5.0.0" // { + (sources."engine.io-5.1.1" // { dependencies = [ sources."cookie-0.4.1" sources."debug-4.3.2" @@ -112472,10 +112811,11 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."express-4.17.1" - (sources."express-session-1.17.1" // { + (sources."express-session-1.17.2" // { dependencies = [ + sources."cookie-0.4.1" sources."depd-2.0.0" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" ]; }) sources."fast-safe-stringify-2.0.7" @@ -112488,7 +112828,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getmac-5.17.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."got-9.6.0" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { @@ -112548,14 +112888,14 @@ in sources."negotiator-0.6.2" sources."node-cache-5.1.2" sources."nopt-1.0.10" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."nprogress-0.2.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-8.0.6" + sources."open-8.1.0" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -112604,13 +112944,13 @@ in sources."signals-1.0.0" sources."simple-swizzle-0.2.2" sources."snapsvg-0.5.1" - (sources."socket.io-4.0.1" // { + (sources."socket.io-4.1.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.2.0" + sources."socket.io-adapter-2.3.1" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -112653,10 +112993,10 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."y18n-5.0.8" sources."yallist-2.1.2" - sources."yargs-16.2.0" + sources."yargs-17.0.1" sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; @@ -112678,15 +113018,17 @@ in sha512 = "dp7CncooBn6zSacyoSRdlm+fS1mQ6PsCT2pFILUgsDzn3e/e56iQA2mjmob8DOqM1n/0xbVziVelH31M8fcYXw=="; }; dependencies = [ + sources."@mapbox/node-pre-gyp-1.0.5" sources."abbrev-1.1.1" + sources."agent-base-6.0.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."canvas-2.7.0" - sources."chownr-1.1.4" + sources."canvas-2.8.0" + sources."chownr-2.0.0" (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -112720,66 +113062,59 @@ in sources."d3-time-2.1.1" sources."d3-time-format-3.0.0" sources."d3-timer-2.0.0" - sources."debug-3.2.7" + sources."debug-4.3.2" sources."decompress-response-4.2.1" - sources."deep-extend-0.6.0" sources."delaunator-4.0.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-1.0.3" sources."has-unicode-2.0.1" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" sources."internmap-1.0.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."mimic-response-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" - sources."ms-2.1.3" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" sources."nan-2.14.2" - sources."needle-2.6.0" sources."node-fetch-2.6.1" - sources."node-pre-gyp-0.15.0" - sources."nopt-4.0.3" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" + sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."process-nextick-args-2.0.1" - sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" sources."resolve-1.20.0" - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" sources."rw-1.3.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" @@ -112787,8 +113122,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" + sources."tar-6.1.0" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -112832,7 +113166,7 @@ in }) sources."wrappy-1.0.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" + sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -112863,7 +113197,7 @@ in }; dependencies = [ sources."@types/clone-2.1.0" - sources."@types/fast-json-stable-stringify-2.0.0" + sources."@types/fast-json-stable-stringify-2.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-flat-polyfill-1.0.1" @@ -112903,10 +113237,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.2.tgz"; - sha512 = "kM1XAb7NE+jwZ4ClyHMUWvd/0eDBSW8fBGaVinuRDgqMvavTrlo7SUlsgHzZhlTjTk+ZaDMfyVQBZUVNytprkg=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.3.tgz"; + sha512 = "dUaWfvqNM0IVwinwYHv6prKYEw4o/ayZtvceFBKdMCf91uYzKt64MLqD8ZA597JLheul/oEV1XKgpzLLPcfVVw=="; }; buildInputs = globalBuildInputs; meta = { @@ -112928,13 +113262,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."globals-12.4.0" ]; @@ -112971,8 +113306,8 @@ in sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" - sources."escape-string-regexp-1.0.5" - sources."eslint-7.25.0" + sources."escape-string-regexp-4.0.0" + sources."eslint-7.27.0" sources."eslint-plugin-vue-7.9.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -112980,7 +113315,7 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.0.0" + sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -113008,9 +113343,9 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -113022,7 +113357,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -113034,7 +113369,7 @@ in sources."levn-0.4.1" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" @@ -113047,9 +113382,9 @@ in sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.2.1" + sources."prettier-2.3.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -113072,9 +113407,9 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -113083,13 +113418,14 @@ in (sources."tslint-6.1.3" // { dependencies = [ sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" sources."semver-5.7.1" ]; }) sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.2.4" + sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.6.0" // { @@ -113201,7 +113537,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.0" // { + (sources."vscode-json-languageservice-4.1.4" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -113283,7 +113619,7 @@ in sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.55.0" + sources."@types/vscode-1.56.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -113333,7 +113669,7 @@ in sources."assign-symbols-1.0.0" sources."async-each-1.0.3" sources."atob-2.1.2" - sources."azure-devops-node-api-7.2.0" + sources."azure-devops-node-api-10.2.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -113374,7 +113710,7 @@ in sources."builtin-status-codes-3.0.0" (sources."cacache-12.0.4" // { dependencies = [ - sources."glob-7.1.6" + sources."glob-7.1.7" ]; }) sources."cache-base-1.0.1" @@ -113385,7 +113721,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."cheerio-1.0.0-rc.6" + sources."cheerio-1.0.0-rc.9" sources."cheerio-select-1.4.0" sources."chokidar-3.3.0" sources."chownr-1.1.4" @@ -113445,7 +113781,7 @@ in sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."css-select-4.1.2" - sources."css-what-5.0.0" + sources."css-what-5.0.1" sources."cyclist-1.0.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -113461,7 +113797,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."dom-serializer-1.3.1" + sources."dom-serializer-1.3.2" sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" @@ -113491,7 +113827,7 @@ in }) sources."entities-2.2.0" sources."errno-0.1.8" - (sources."es-abstract-1.18.0" // { + (sources."es-abstract-1.18.3" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -113623,13 +113959,13 @@ in sources."ini-1.3.8" sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.2" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.1" sources."is-buffer-2.0.5" sources."is-callable-1.2.3" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -113637,11 +113973,11 @@ in sources."is-glob-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.5" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" + sources."is-regex-1.1.3" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-0.0.1" @@ -113755,14 +114091,13 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.10.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."os-0.1.1" sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -113791,7 +114126,7 @@ in sources."path-key-2.0.1" sources."pbkdf2-3.1.2" sources."pend-1.2.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pkg-dir-3.0.0" sources."posix-character-classes-0.1.1" @@ -113811,6 +114146,7 @@ in ]; }) sources."punycode-2.1.1" + sources."qs-6.10.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" @@ -113852,6 +114188,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."side-channel-1.0.4" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -113966,14 +114303,15 @@ in sources."semver-6.3.0" ]; }) + sources."tslib-2.2.0" sources."tty-browserify-0.0.0" - sources."tunnel-0.0.4" - sources."typed-rest-client-1.2.0" + sources."tunnel-0.0.6" + sources."typed-rest-client-1.8.4" sources."typedarray-0.0.6" sources."typescript-3.9.9" sources."uc.micro-1.0.6" sources."unbox-primitive-1.0.1" - sources."underscore-1.8.3" + sources."underscore-1.13.1" sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -114006,7 +114344,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" sources."vm-browserify-1.1.2" - sources."vsce-1.87.1" + sources."vsce-1.88.0" sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" (sources."watchpack-1.7.5" // { @@ -114188,7 +114526,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."got-6.7.1" sources."graceful-fs-4.2.6" sources."gray-matter-2.1.1" @@ -114335,7 +114673,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.4" + sources."uglify-js-3.13.8" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -114377,8 +114715,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" + sources."@babel/helper-validator-identifier-7.14.0" + sources."@babel/highlight-7.14.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -114394,7 +114732,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-14.14.41" + sources."@types/node-15.6.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -114675,7 +115013,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -114745,7 +115083,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -114854,7 +115192,7 @@ in sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -114909,9 +115247,9 @@ in 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-type-3.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -115068,7 +115406,7 @@ in 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.7" + sources."spdx-license-ids-3.0.9" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -115200,7 +115538,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-2.0.3" + sources."unist-util-stringify-position-3.0.0" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -115226,8 +115564,13 @@ in sources."user-home-2.0.0" 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."vfile-4.2.1" // { + dependencies = [ + sources."unist-util-stringify-position-2.0.3" + sources."vfile-message-2.0.4" + ]; + }) + sources."vfile-message-3.0.1" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -115236,6 +115579,7 @@ in sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-6.1.0" + sources."unist-util-stringify-position-2.0.3" ]; }) sources."vfile-sort-2.2.2" @@ -115312,8 +115656,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.13.10" // { + sources."@babel/helper-validator-identifier-7.14.0" + (sources."@babel/highlight-7.14.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -115327,7 +115671,7 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-0.4.0" // { + (sources."@eslint/eslintrc-0.4.1" // { dependencies = [ sources."debug-4.3.2" sources."globals-12.4.0" @@ -115338,7 +115682,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -115432,7 +115776,7 @@ in sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-4.1.2" - sources."css-what-5.0.0" + sources."css-what-5.0.1" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" @@ -115453,7 +115797,7 @@ in ]; }) sources."doctrine-3.0.0" - sources."dom-serializer-1.3.1" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.6.0" @@ -115518,7 +115862,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.0.0" + sources."fast-redact-3.0.1" sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" @@ -115557,7 +115901,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - (sources."globals-13.8.0" // { + (sources."globals-13.9.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -115594,7 +115938,7 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -115604,7 +115948,7 @@ in sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-relative-0.1.3" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" @@ -115650,7 +115994,6 @@ in sources."lines-and-columns-1.1.6" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -115667,7 +116010,7 @@ in ]; }) sources."map-age-cleaner-0.1.3" - sources."marky-1.2.1" + sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" sources."mime-db-1.47.0" @@ -115689,7 +116032,7 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" - sources."nanoid-3.1.22" + sources."nanoid-3.1.23" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -115699,7 +116042,7 @@ in sources."uuid-8.3.2" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" sources."oauth-sign-0.9.0" @@ -115821,9 +116164,9 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" - (sources."table-6.5.1" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.1.0" + sources."ajv-8.5.0" sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.0" @@ -115897,17 +116240,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.35.1"; + version = "5.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.35.1.tgz"; - sha512 = "uWKYStqJ23+N6/EnMEwUjPSSKUG1tFmcuKhALEh/QXoUxwN8eb3ATNIZB38A+fO6QZ0xfc7Cu7KNV9LXNhDCsw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.38.1.tgz"; + sha512 = "OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g=="; }; dependencies = [ - sources."@types/eslint-7.2.10" + sources."@types/eslint-7.2.12" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.47" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -115925,17 +116268,17 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.2.1" + sources."acorn-8.2.4" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.5" + sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001214" + sources."caniuse-lite-1.0.30001230" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.720" - sources."enhanced-resolve-5.8.0" + sources."electron-to-chromium-1.3.741" + sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -115959,7 +116302,7 @@ in sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."neo-async-2.6.2" - sources."node-releases-1.1.71" + sources."node-releases-1.1.72" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -115971,15 +116314,15 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.2.0" - (sources."terser-5.6.1" // { + (sources."terser-5.7.0" // { dependencies = [ sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.1.1" + sources."terser-webpack-plugin-5.1.2" sources."uri-js-4.4.1" - sources."watchpack-2.1.1" - sources."webpack-sources-2.2.0" + sources."watchpack-2.2.0" + sources."webpack-sources-2.3.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -115995,22 +116338,20 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz"; - sha512 = "9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz"; + sha512 = "7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.2" - sources."@webpack-cli/configtest-1.0.2" - sources."@webpack-cli/info-1.2.3" - sources."@webpack-cli/serve-1.3.1" - sources."ansi-colors-4.1.1" + sources."@discoveryjs/json-ext-0.5.3" + sources."@webpack-cli/configtest-1.0.3" + sources."@webpack-cli/info-1.2.4" + sources."@webpack-cli/serve-1.4.0" sources."clone-deep-4.0.1" sources."colorette-1.2.2" sources."commander-7.2.0" sources."cross-spawn-7.0.3" - sources."enquirer-2.3.6" sources."envinfo-7.8.1" sources."execa-5.0.0" sources."fastest-levenshtein-1.0.12" @@ -116021,7 +116362,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" @@ -116037,7 +116378,7 @@ in sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."pkg-dir-4.2.0" sources."rechoir-0.7.0" sources."resolve-1.20.0" @@ -116056,6 +116397,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI for webpack & friends"; + homepage = "https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli"; license = "MIT"; }; production = true; @@ -116073,7 +116415,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" + sources."@types/node-15.6.1" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -116193,9 +116535,9 @@ in sources."del-4.1.1" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" @@ -116244,7 +116586,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."faye-websocket-0.11.3" + sources."faye-websocket-0.11.4" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -116258,7 +116600,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.1" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -116270,7 +116612,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -116317,7 +116659,7 @@ in sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -116332,7 +116674,7 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.3" sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -116459,7 +116801,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."select-hose-2.0.0" - sources."selfsigned-1.10.8" + sources."selfsigned-1.10.11" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -116646,10 +116988,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.1.tgz"; - sha512 = "rYM2uzRxrLRpcyPqGceRBDpxxUV8vcDqIKxAUKfcnFpcrPxT5+XvhTxv7XLjo5AvEJFPdAE3zCogG2JVahqgSQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.0.tgz"; + sha512 = "k8UB2jLIb1Jip2nZbCz83T/XfhfjX6mB1yLJNYKrpYi7FQimfOoFv/0//iT6HV1K8FwUB5yUbCcnpLebJXJTug=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -116662,11 +117004,15 @@ in sources."braces-3.0.2" sources."dir-glob-3.0.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + (sources."fast-glob-3.2.5" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" + sources."glob-parent-6.0.0" sources."globby-11.0.3" sources."ignore-5.1.8" sources."is-extglob-2.1.1" @@ -116678,7 +117024,7 @@ in sources."normalize-path-3.0.0" sources."p-limit-3.1.0" sources."path-type-4.0.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" @@ -116722,7 +117068,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.50" + sources."@types/node-15.6.1" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -116809,7 +117155,7 @@ in sources."mime-1.6.0" ]; }) - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."ecstatic-4.1.4" sources."ee-first-1.1.1" @@ -116828,12 +117174,12 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" sources."get-stdin-7.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" sources."http-parser-js-0.4.13" sources."ieee754-1.2.1" - sources."immediate-chunk-store-2.1.1" + sources."immediate-chunk-store-2.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ip-1.1.5" @@ -116869,7 +117215,7 @@ in sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" - sources."memory-chunk-store-1.3.2" + sources."memory-chunk-store-1.3.5" sources."mime-2.5.2" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -116913,7 +117259,7 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-6.10.2" + sources."protobufjs-6.11.2" sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.2.3" @@ -116924,7 +117270,7 @@ in sources."range-parser-1.2.1" sources."range-slice-stream-2.0.0" sources."readable-stream-3.6.0" - sources."record-cache-1.1.0" + sources."record-cache-1.1.1" (sources."render-media-4.1.0" // { dependencies = [ sources."debug-4.3.2" @@ -116991,18 +117337,18 @@ in sources."ms-2.1.2" ]; }) - sources."ut_pex-2.0.1" - sources."utf-8-validate-5.0.4" + sources."ut_pex-3.0.0" + sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" - sources."utp-native-2.4.0" + sources."utp-native-2.5.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.118.0" // { + (sources."webtorrent-1.0.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" sources."get-stdin-8.0.0" - sources."magnet-uri-6.1.1" + sources."magnet-uri-6.2.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" sources."parse-torrent-9.1.3" @@ -117011,7 +117357,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.5" + sources."ws-7.4.6" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -117053,119 +117399,13 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.13.17" - sources."@babel/runtime-corejs3-7.13.17" - sources."@types/json5-0.0.29" - sources."adverb-where-0.2.2" - sources."aria-query-4.2.2" - sources."array-includes-3.1.3" - sources."array.prototype.flat-1.2.4" - sources."array.prototype.flatmap-1.2.4" - sources."ast-types-flow-0.0.7" - sources."axe-core-4.1.4" - sources."axobject-query-2.2.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" + sources."adverb-where-0.2.5" sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."contains-path-0.1.0" - sources."core-js-pure-3.11.0" - sources."damerau-levenshtein-1.0.6" - sources."debug-2.6.9" - sources."define-properties-1.1.3" - sources."doctrine-1.5.0" sources."e-prime-0.10.4" - sources."emoji-regex-9.2.2" - sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" - sources."es-to-primitive-1.2.1" - sources."eslint-import-resolver-node-0.3.4" - sources."eslint-module-utils-2.6.0" - sources."eslint-plugin-import-2.22.1" - sources."eslint-plugin-jsx-a11y-6.4.1" - (sources."eslint-plugin-react-7.23.2" // { - dependencies = [ - sources."doctrine-2.1.0" - sources."resolve-2.0.0-next.3" - ]; - }) - sources."eslint-plugin-react-hooks-4.2.0" - sources."esutils-2.0.3" - sources."find-up-2.1.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" - sources."graceful-fs-4.2.6" - sources."has-1.0.3" - sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" - sources."hosted-git-info-2.8.9" - sources."internal-slot-1.0.3" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" - sources."is-callable-1.2.3" - sources."is-core-module-2.3.0" - sources."is-date-object-1.0.2" - sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.4" - sources."is-regex-1.1.2" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" - sources."isarray-1.0.0" - sources."js-tokens-4.0.0" - sources."json5-1.0.1" - sources."jsx-ast-utils-3.2.0" - sources."language-subtag-registry-0.3.21" - sources."language-tags-1.0.5" - sources."load-json-file-2.0.0" - sources."locate-path-2.0.0" - sources."loose-envify-1.4.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."ms-2.0.0" - sources."no-cliches-0.3.2" - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.10.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."object.entries-1.1.3" - sources."object.fromentries-2.0.4" - sources."object.values-1.1.3" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-json-2.2.0" + sources."no-cliches-0.3.4" sources."passive-voice-0.1.0" - sources."path-exists-3.0.0" - sources."path-parse-1.0.6" - sources."path-type-2.0.0" - sources."pify-2.3.0" - sources."pkg-dir-2.0.0" - sources."prop-types-15.7.2" - sources."react-is-16.13.1" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."regenerator-runtime-0.13.8" - sources."regexp.prototype.flags-1.3.1" - sources."resolve-1.20.0" - sources."semver-5.7.1" - sources."side-channel-1.0.4" - 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.7" - sources."string.prototype.matchall-4.0.4" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" - sources."strip-bom-3.0.0" - sources."too-wordy-0.3.1" - sources."tsconfig-paths-3.9.0" - sources."unbox-primitive-1.0.1" - sources."validate-npm-package-license-3.0.4" + sources."too-wordy-0.3.4" sources."weasel-words-0.1.1" - sources."which-boxed-primitive-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -117180,30 +117420,28 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.18.0"; + version = "0.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.18.0.tgz"; - sha512 = "Cm3UKlaEzvd+my1L4lf5NKfCqDCkdxLmuvq8jRWOPjtrGEdY41EtuY1V+lRdRREVXyurgy4NPVFWzarcl5CltQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.19.2.tgz"; + sha512 = "E4yMj1oK+OCObD15LvEaHOw8y3ux7G4KrREQDsDkjqFhUm/3qCCPMh3NPXTRQyse3r6Xpsv+lAW17Qo/NKm+0g=="; }; dependencies = [ sources."agent-base-4.3.0" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" - sources."esprima-4.0.1" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."js-yaml-3.14.1" + sources."js-yaml-4.1.0" sources."jsonc-parser-2.3.1" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" - sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-4.1.0" // { + (sources."vscode-json-languageservice-4.1.4" // { dependencies = [ sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" @@ -117249,22 +117487,22 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "4.0.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-4.0.0.tgz"; - sha512 = "u4nr6946GQ1HXrX0K9YAHK8wJmvVNIAYIsC/NSTIXOSK61N400UCY1HLQr5oo7TJcpZAe7aO3k3jFJXIvRb6Qw=="; + url = "https://registry.npmjs.org/yo/-/yo-4.2.0.tgz"; + sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.13.17" + sources."@babel/runtime-7.14.0" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - (sources."@npmcli/arborist-2.4.0" // { + (sources."@npmcli/arborist-2.6.1" // { dependencies = [ sources."semver-7.3.5" ]; }) - (sources."@npmcli/git-2.0.8" // { + (sources."@npmcli/git-2.0.9" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -117289,7 +117527,10 @@ in sources."@npmcli/run-script-1.8.5" sources."@sindresorhus/is-0.7.0" sources."@tootallnate/once-1.1.2" + sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" + sources."@types/node-15.6.1" + sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { dependencies = [ @@ -117321,7 +117562,7 @@ in sources."array-find-index-1.0.2" sources."array-union-2.1.0" sources."array-uniq-1.0.3" - sources."arrify-1.0.1" + sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -117331,6 +117572,7 @@ in 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."bin-links-2.2.1" // { dependencies = [ @@ -117345,7 +117587,12 @@ in }) sources."bin-version-check-3.0.0" sources."binaryextensions-4.15.0" - sources."boolean-3.0.3" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."boolean-3.0.4" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -117353,9 +117600,10 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - (sources."cacache-15.0.6" // { + (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -117378,9 +117626,10 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" + sources."cli-spinners-2.6.0" sources."cli-table-0.3.6" sources."cli-width-2.2.1" - sources."clone-2.1.2" + sources."clone-1.0.4" sources."clone-buffer-1.0.0" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" @@ -117401,7 +117650,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.11.0" + sources."core-js-3.13.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -117413,7 +117662,6 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."cyclist-1.0.1" sources."dashdash-1.14.1" sources."dateformat-4.5.1" sources."debug-2.6.9" @@ -117423,41 +117671,36 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."default-uid-1.0.0" + sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" sources."dezalgo-1.0.3" sources."diff-5.0.0" - (sources."dir-glob-3.0.1" // { - dependencies = [ - sources."path-type-4.0.0" - ]; - }) + sources."dir-glob-3.0.1" sources."dot-prop-4.2.1" sources."downgrade-root-1.2.2" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."editions-6.1.0" sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) sources."end-of-stream-1.4.4" sources."env-paths-1.0.0" sources."err-code-2.0.3" - sources."errlop-4.1.0" sources."error-10.4.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" - sources."es6-promise-4.2.8" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."eventemitter3-4.0.7" sources."execa-1.0.0" sources."execall-1.0.0" sources."exit-hook-1.1.1" @@ -117488,7 +117731,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" (sources."global-agent-2.2.0" // { dependencies = [ @@ -117538,8 +117781,9 @@ in sources."humanize-ms-1.2.1" sources."humanize-string-1.0.2" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-walk-3.0.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -117558,13 +117802,14 @@ in sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.3.0" + sources."is-core-module-2.4.0" sources."is-docker-1.1.0" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" + sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-npm-1.0.0" sources."is-number-7.0.0" @@ -117584,10 +117829,9 @@ in sources."is-utf8-0.2.1" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.6" + sources."isbinaryfile-4.0.8" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."istextorbinary-5.12.0" sources."isurl-1.0.0" (sources."jake-10.8.2" // { dependencies = [ @@ -117601,7 +117845,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" - sources."json-stringify-nice-1.1.3" + sources."json-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" @@ -117629,7 +117873,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.14" + sources."locutus-2.0.15" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" @@ -117654,12 +117898,8 @@ in ]; }) sources."mem-5.1.1" - (sources."mem-fs-1.2.0" // { - dependencies = [ - sources."through2-3.0.2" - ]; - }) - sources."mem-fs-editor-8.1.2" + sources."mem-fs-2.2.1" + sources."mem-fs-editor-9.0.1" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -117691,11 +117931,7 @@ in ]; }) sources."ms-2.0.0" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."arrify-2.0.1" - ]; - }) + sources."multimatch-5.0.0" sources."mute-stream-0.0.7" sources."nice-try-1.0.5" (sources."node-gyp-7.1.2" // { @@ -117739,13 +117975,13 @@ in sources."semver-7.3.5" ]; }) - sources."npm-packlist-2.1.5" + sources."npm-packlist-2.2.2" (sources."npm-pick-manifest-6.1.1" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."npm-registry-fetch-10.1.1" + sources."npm-registry-fetch-10.1.2" sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -117759,18 +117995,39 @@ in ]; }) sources."open-6.4.0" + (sources."ora-5.4.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."log-symbols-4.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-any-2.1.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-map-4.0.0" + (sources."p-queue-6.6.2" // { + dependencies = [ + sources."p-timeout-3.2.0" + ]; + }) sources."p-some-4.1.0" sources."p-timeout-2.0.1" sources."p-try-1.0.0" @@ -117789,22 +118046,13 @@ in 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-type-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."path-parse-1.0.7" + sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pipeline-pipe-0.1.5" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" @@ -117841,14 +118089,14 @@ in sources."query-string-5.1.1" sources."queue-microtask-1.2.3" sources."rc-1.2.8" - (sources."read-chunk-3.2.0" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) sources."read-cmd-shim-2.0.0" sources."read-package-json-fast-2.0.2" - sources."read-pkg-1.1.0" + (sources."read-pkg-1.1.0" // { + dependencies = [ + sources."path-type-1.1.0" + sources."pify-2.3.0" + ]; + }) (sources."read-pkg-up-4.0.0" // { dependencies = [ sources."find-up-3.0.0" @@ -117924,12 +118172,16 @@ in ]; }) sources."sort-keys-2.0.0" - sources."sort-on-3.0.0" + (sources."sort-on-3.0.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.9" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" sources."ssri-8.0.1" @@ -118009,11 +118261,6 @@ in sources."text-table-0.2.0" sources."textextensions-5.12.0" sources."through-2.3.8" - (sources."through2-4.0.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" @@ -118044,9 +118291,11 @@ in sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."version-compare-1.1.0" - sources."version-range-1.1.0" - sources."vinyl-2.2.1" + (sources."vinyl-2.2.1" // { + dependencies = [ + sources."clone-2.1.2" + ]; + }) (sources."vinyl-file-3.0.0" // { dependencies = [ sources."pify-2.3.0" @@ -118054,6 +118303,7 @@ in }) sources."walk-2.3.14" sources."walk-up-path-1.0.0" + sources."wcwidth-1.0.1" sources."which-1.3.1" (sources."which-pm-2.0.0" // { dependencies = [ @@ -118063,12 +118313,6 @@ in sources."wide-align-1.1.3" sources."widest-line-2.0.1" sources."windows-release-3.3.3" - (sources."with-open-file-0.1.7" // { - dependencies = [ - sources."p-try-2.2.0" - sources."pify-4.0.1" - ]; - }) (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -118088,12 +118332,11 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-3.2.0" // { + (sources."yeoman-environment-3.4.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" - sources."arrify-2.0.1" sources."chalk-4.1.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -118118,7 +118361,7 @@ in }) sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.0.0" + sources."inquirer-8.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" sources."locate-path-6.0.0" From 28ab65b5869c6673e359093662a1dfe3aba9b829 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Sat, 29 May 2021 01:02:47 +0300 Subject: [PATCH 344/664] tmuxinator: 2.0.2 -> 2.0.3 --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 5ed63d799793..c3ceae7a0bd3 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.2"; - source.sha256 = "0wwrgx1syi3zrwn52pblh7qivyxp3cvq0rywp6n0s2bkk0xz903z"; + version = "2.0.3"; + source.sha256 = "0js43hl07is9nx1b17g8x2blh1q7ls8y4dshcb50r5dn7drpardh"; erubis = buildRubyGem rec { inherit ruby; From 00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 28 May 2021 18:11:08 -0400 Subject: [PATCH 345/664] =?UTF-8?q?yabridge,=20yabridgectl:=203.1.0=20?= =?UTF-8?q?=E2=86=92=203.2.0=20(#121715)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/audio/yabridge/default.nix | 17 ++++------------- pkgs/tools/audio/yabridgectl/default.nix | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 375ce985819c..048cac40972d 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , meson , ninja @@ -58,14 +57,14 @@ let }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.1.0"; + version = "3.2.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI="; + hash = "sha256-UT6st0Rc6HOaObE3N+qlPZZ8U1gl/MFLU0mjFuScdes="; }; # Unpack subproject sources @@ -80,16 +79,6 @@ in stdenv.mkDerivation rec { )''; patches = [ - # Fix printing wine version when using absolute path (remove patches in next release): - (fetchpatch { - url = "https://github.com/robbert-vdh/yabridge/commit/2aadf5256b3eafeb86efa8626247972dd33baa13.patch"; - sha256 = "sha256-Nq9TQJxa22vJLmf+USyPBkF8cKyEzb1Lp2Rx86pDxnY="; - }) - (fetchpatch { - url = "https://github.com/robbert-vdh/yabridge/commit/93df3fa1da6ffcc69a5b384ba04e3da7c5ef23ef.patch"; - sha256 = "sha256-//8Dxolqe6n+aFo4yVnnMR9kSq/iEFE0qZPvcIBehvI="; - }) - # Hard code wine path so wine version is correct in logs (substituteAll { src = ./hardcode-wine.patch; @@ -130,11 +119,13 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p "$out/bin" "$out/lib" cp yabridge-group.exe{,.so} "$out/bin" cp yabridge-host.exe{,.so} "$out/bin" cp libyabridge-vst2.so "$out/lib" cp libyabridge-vst3.so "$out/lib" + runHook postInstall ''; # Hard code wine path in wrapper scripts generated by winegcc diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 4f88e58f0af9..4f738310d85c 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY="; + cargoHash = "sha256-cB4Xp8pNLQRcPQ6HtVkDkLbfNSmM9yl+oRcEzcqrmkY="; patches = [ # By default, yabridgectl locates libyabridge.so by using From f159db1d686d7ab9e76e3646c7f9b231464ac85e Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Sat, 29 May 2021 01:31:49 +0300 Subject: [PATCH 346/664] nushell: 0.30.0 -> 0.31.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a03e3eb3df56..06ff6011d263 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "104zrj15kmc0a698dc8dxbzhg1rjqn38v3wqcwg2xiickglpgd5f"; + sha256 = "1dpbc6m0pxizkh4r02nw1i1fx9v43llylqnd28naqkklwc15pb2w"; }; - cargoSha256 = "1c6yhkj1hyr82y82nff6gy9kq9z0mbq3ivlq8rir10pnqy4j5791"; + cargoSha256 = "1znqac3s48ah9a7zpqdgw0lvvhklryj2j7mym65myzjbn1g264rm"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 976ee287c863520e0fae4518b51d1e254a732bc2 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 26 May 2021 22:39:23 +0900 Subject: [PATCH 347/664] bmake: fix build on darwin --- .../tools/build-managers/bmake/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index e79e06a71f4e..d2b0e5a45dba 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -18,6 +18,31 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch ]; + # The generated makefile is a small wrapper for calling ./boot-strap + # with a given op. On a case-insensitive filesystem this generated + # makefile clobbers a distinct, shipped, Makefile and causes + # infinite recursion during tests which eventually fail with + # "fork: Resource temporarily unavailable" + configureFlags = [ + "--without-makefile" + ]; + + buildPhase = '' + runHook preBuild + + ./boot-strap --prefix=$out -o . op=build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ./boot-strap --prefix=$out -o . op=install + + runHook postInstall + ''; + setupHook = ./setup-hook.sh; meta = with lib; { From 776f1d3592717521fce13287ca5e8fbbcdedefb6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 May 2021 00:00:00 +0000 Subject: [PATCH 348/664] ugrep: 3.2.2 -> 3.3 https://github.com/Genivia/ugrep/releases/tag/v3.3 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 587c15cc33fa..17503829e7ae 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.2.2"; + version = "3.3"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0Vc+ORHnSG9W4OaKWGs4tI5+e5TJNMbBNQ+3NZRz6Ug="; + sha256 = "0qk8rzsll69pf220m6n41giyk3faqvwagml7i2xwgp7pcax607nl"; }; buildInputs = [ From 8ed2973cb1a664d272de9fea25fc31906545cfa7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 14:08:33 +0000 Subject: [PATCH 349/664] erlangR24: 24.0 -> 24.0.1 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 6808d0a849d3..84575e92cded 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0"; - sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w"; + version = "24.0.1"; + sha256 = "z01gaKNkKsIPKdPKhX6IUUY9uBSuyA33E4aVM0MdXsg="; } From 1f6b48be7477c7cc6d2de8ab8b5bf15c754eafc6 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 25 May 2021 23:16:44 +0200 Subject: [PATCH 350/664] discourse: 2.6.5 -> 2.7.0 --- nixos/modules/services/web-apps/discourse.nix | 19 +- .../discourse/action_mailer_ca_cert.patch | 2 +- pkgs/servers/web-apps/discourse/default.nix | 50 +- .../web-apps/discourse/disable_jhead.patch | 10 +- .../web-apps/discourse/rubyEnv/Gemfile | 20 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 362 ++++++----- .../web-apps/discourse/rubyEnv/gemset.nix | 579 ++++++++++-------- .../unicorn_logging_and_timeout.patch | 4 +- 8 files changed, 608 insertions(+), 438 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 0e2e182ffe93..ba5989800eaf 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -398,6 +398,14 @@ in How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; + + forceTLS = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Force implicit TLS as per RFC 8314 3.3. + ''; + }; }; incoming = { @@ -530,6 +538,7 @@ in smtp_authentication = cfg.mail.outgoing.authentication; smtp_enable_start_tls = cfg.mail.outgoing.enableStartTLSAuto; smtp_openssl_verify_mode = cfg.mail.outgoing.opensslVerifyMode; + smtp_force_tls = cfg.mail.outgoing.forceTLS; load_mini_profiler = true; mini_profiler_snapshots_period = 0; @@ -542,8 +551,8 @@ in redis_host = cfg.redis.host; redis_port = 6379; - redis_slave_host = null; - redis_slave_port = 6379; + redis_replica_host = null; + redis_replica_port = 6379; redis_db = cfg.redis.dbNumber; redis_password = cfg.redis.passwordFile; redis_skip_client_commands = false; @@ -552,8 +561,8 @@ in message_bus_redis_enabled = false; message_bus_redis_host = "localhost"; message_bus_redis_port = 6379; - message_bus_redis_slave_host = null; - message_bus_redis_slave_port = 6379; + message_bus_redis_replica_host = null; + message_bus_redis_replica_port = 6379; message_bus_redis_db = 0; message_bus_redis_password = null; message_bus_redis_skip_client_commands = false; @@ -606,6 +615,7 @@ in allowed_theme_repos = null; enable_email_sync_demon = false; max_digests_enqueued_per_30_mins_per_site = 10000; + cluster_name = null; }; services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost"); @@ -667,6 +677,7 @@ in environment = cfg.package.runtimeEnv // { UNICORN_TIMEOUT = builtins.toString cfg.unicornTimeout; UNICORN_SIDEKIQS = builtins.toString cfg.sidekiqProcesses; + MALLOC_ARENA_MAX = "2"; }; preStart = diff --git a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch index 83c44a466fac..3872eb751406 100644 --- a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch +++ b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch @@ -1,5 +1,5 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index 75c3a69512..7fc374cd9d 100644 +index a523888a8d..422c2c1ee8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -32,6 +32,7 @@ Discourse::Application.configure do diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 4bcbee1d4283..02ebb40d3843 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -1,18 +1,18 @@ -{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests -, fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git +{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript +, fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git, cacert , util-linux, gawk, imagemagick, optipng, pngquant, libjpeg, jpegoptim , gifsicle, libpsl, redis, postgresql, which, brotli, procps , nodePackages, v8 }: let - version = "2.6.5"; + version = "2.7.0"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw="; + sha256 = "sha256-w26pwGDL2j7qbporUzZATgw7E//E6xwahCbXv35QNnc="; }; runtimeDeps = [ @@ -65,24 +65,38 @@ let gems = import ./rubyEnv/gemset.nix; in gems // { - mini_racer = gems.mini_racer // { - buildInputs = [ v8 ]; - dontBuild = false; - # The Ruby extension makefile generator assumes the source - # is C, when it's actually C++ ¯\_(ツ)_/¯ - postPatch = '' - substituteInPlace ext/mini_racer_extension/extconf.rb \ - --replace '" -std=c++0x"' \ - '" -x c++ -std=c++0x"' - ''; - }; + libv8-node = + let + noopScript = writeShellScript "noop" "exit 0"; + linkFiles = writeShellScript "link-files" '' + cd ../.. + + mkdir -p vendor/v8/out.gn/libv8/obj/ + ln -s "${v8}/lib/libv8.a" vendor/v8/out.gn/libv8/obj/libv8_monolith.a + + ln -s ${v8}/include vendor/v8/include + + mkdir -p ext/libv8-node + echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml + ''; + in gems.libv8-node // { + dontBuild = false; + postPatch = '' + cp ${noopScript} libexec/build-libv8 + cp ${noopScript} libexec/build-monolith + cp ${noopScript} libexec/download-node + cp ${noopScript} libexec/extract-node + cp ${linkFiles} libexec/inject-libv8 + ''; + }; mini_suffix = gems.mini_suffix // { propagatedBuildInputs = [ libpsl ]; dontBuild = false; # Use our libpsl instead of the vendored one, which isn't - # available for aarch64 + # available for aarch64. It has to be called + # libpsl.x86_64.so or it isn't found. postPatch = '' - cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.so + cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so ''; }; }; @@ -111,6 +125,8 @@ let # run. This means that Redis and PostgreSQL has to be running and # database migrations performed. preBuild = '' + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + redis-server >/dev/null & initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null diff --git a/pkgs/servers/web-apps/discourse/disable_jhead.patch b/pkgs/servers/web-apps/discourse/disable_jhead.patch index 709a1959d637..a7ee56ff1855 100644 --- a/pkgs/servers/web-apps/discourse/disable_jhead.patch +++ b/pkgs/servers/web-apps/discourse/disable_jhead.patch @@ -1,12 +1,12 @@ diff --git a/lib/file_helper.rb b/lib/file_helper.rb -index 162de9a40b..9ac8807e9d 100644 +index d87da5a85e..f5323292d7 100644 --- a/lib/file_helper.rb +++ b/lib/file_helper.rb -@@ -124,6 +124,7 @@ class FileHelper - jpegoptim: { strip: strip_image_metadata ? "all" : "none" }, - jpegtran: false, +@@ -127,6 +127,7 @@ class FileHelper jpegrecompress: false, + # Skip looking for gifsicle, svgo binaries + gifsicle: false, + jhead: false, + svgo: false ) end - end diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index cb86d7e4bacf..71ee3f910c0e 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,13 +18,13 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - gem 'actionmailer', '6.0.3.3' - gem 'actionpack', '6.0.3.3' - gem 'actionview', '6.0.3.3' - gem 'activemodel', '6.0.3.3' - gem 'activerecord', '6.0.3.3' - gem 'activesupport', '6.0.3.3' - gem 'railties', '6.0.3.3' + gem 'actionmailer', '6.1.3.2' + gem 'actionpack', '6.1.3.2' + gem 'actionview', '6.1.3.2' + gem 'activemodel', '6.1.3.2' + gem 'activerecord', '6.1.3.2' + gem 'activesupport', '6.1.3.2' + gem 'railties', '6.1.3.2' gem 'sprockets-rails' end @@ -40,7 +40,7 @@ gem 'actionview_precompiler', require: false gem 'seed-fu' -gem 'mail', require: false +gem 'mail', git: 'https://github.com/discourse/mail.git', require: false gem 'mini_mime' gem 'mini_suffix' @@ -96,6 +96,7 @@ gem 'discourse_image_optim', require: 'image_optim' gem 'multi_json' gem 'mustache' gem 'nokogiri' +gem 'loofah' gem 'css_parser', require: false gem 'omniauth' @@ -132,6 +133,7 @@ gem 'rack-protection' # security gem 'cbor', require: false gem 'cose', require: false gem 'addressable' +gem 'json_schemer' # Gems used only for assets and not required in production environments by default. # Allow everywhere for now cause we are allowing asset debugging in production @@ -176,6 +178,7 @@ group :development do gem 'binding_of_caller' gem 'yaml-lint' gem 'annotate' + gem 'discourse_dev' end # this is an optional gem, it provides a high performance replacement @@ -192,7 +195,6 @@ gem 'htmlentities', require: false # If you want to amend mini profiler to do the monkey patches in the railties # we are open to it. by deferring require to the initializer we can configure discourse installs without it -gem 'flamegraph', require: false gem 'rack-mini-profiler', require: ['enable_rails_patches'] gem 'unicorn', require: false, platform: :ruby diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 4f0674932277..d3f999d34f47 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -1,21 +1,29 @@ +GIT + remote: https://github.com/discourse/mail.git + revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b + specs: + mail (2.8.0.edge) + mini_mime (>= 0.1.1) + GEM remote: https://rubygems.org/ specs: - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.1.3.2) + actionpack (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.3.2) + actionview (= 6.1.3.2) + activesupport (= 6.1.3.2) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.1.3.2) + activesupport (= 6.1.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -24,44 +32,44 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.1.3.2) + activesupport (= 6.1.3.2) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) - activesupport (6.0.3.3) + activemodel (6.1.3.2) + activesupport (= 6.1.3.2) + activerecord (6.1.3.2) + activemodel (= 6.1.3.2) + activesupport (= 6.1.3.2) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) - ast (2.4.1) - aws-eventstream (1.1.0) - aws-partitions (1.390.0) - aws-sdk-core (3.109.2) + ast (2.4.2) + aws-eventstream (1.1.1) + aws-partitions (1.432.0) + aws-sdk-core (3.112.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.2) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.90.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.35.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-sns (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) barber (0.12.2) ember-source (>= 1.0, < 3.1) @@ -70,31 +78,32 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.5.1) + bootsnap (1.7.5) msgpack (~> 1.0) builder (3.2.4) - bullet (6.1.0) + bullet (6.1.4) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) cbor (0.5.9.6) certified (1.0.0) - chunky_png (1.3.14) + chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.7) - connection_pool (2.2.3) + concurrent-ruby (1.1.8) + connection_pool (2.2.5) cose (1.2.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.3.3) - crack (0.4.4) + crack (0.4.5) + rexml crass (1.0.6) - css_parser (1.7.1) + css_parser (1.9.0) addressable - debug_inspector (0.0.3) + debug_inspector (1.1.0) diff-lcs (1.4.4) diffy (3.4.0) discourse-ember-rails (0.18.6) @@ -104,15 +113,19 @@ GEM ember-source (>= 1.1.0) jquery-rails (>= 1.0.17) railties (>= 3.1) - discourse-ember-source (3.12.2.2) - discourse-fonts (0.0.5) + discourse-ember-source (3.12.2.3) + discourse-fonts (0.0.8) + discourse_dev (0.2.1) + faker (~> 2.16) discourse_image_optim (0.26.2) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - docile (1.3.2) + docile (1.4.0) + ecma-re-validator (0.3.0) + regexp_parser (~> 2.0) email_reply_trimmer (0.1.13) ember-data-source (3.0.2) ember-source (>= 2, < 3.0) @@ -121,31 +134,39 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.10.0) - excon (0.78.0) - execjs (2.7.0) + excon (0.81.0) + execjs (2.8.1) exifr (1.3.9) - fabrication (2.21.1) + fabrication (2.22.0) + faker (2.17.0) + i18n (>= 1.6, < 2) fakeweb (1.3.0) - faraday (1.1.0) + faraday (1.4.1) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) fast_blank (1.0.0) fast_xs (0.8.0) - fastimage (2.2.0) - ffi (1.13.1) - flamegraph (0.9.5) + fastimage (2.2.3) + ffi (1.15.0) fspath (3.1.2) gc_tracer (1.5.1) globalid (0.4.2) activesupport (>= 4.2.0) guess_html_encoding (0.0.11) + hana (1.3.7) hashdiff (1.0.1) hashie (4.1.0) highline (2.0.3) hkdf (0.3.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) image_size (1.5.0) in_threads (1.5.4) @@ -154,13 +175,23 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) + json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - jwt (2.2.2) + json_schemer (0.2.18) + ecma-re-validator (~> 0.3) + hana (~> 1.3) + regexp_parser (~> 2.0) + uri_template (~> 0.7) + jwt (2.2.3) kgio (2.11.3) - libv8 (8.4.255.0) - listen (3.3.1) + libv8-node (15.14.0.1) + libv8-node (15.14.0.1-arm64-darwin-20) + libv8-node (15.14.0.1-x86_64-darwin-18) + libv8-node (15.14.0.1-x86_64-darwin-19) + libv8-node (15.14.0.1-x86_64-darwin-20) + libv8-node (15.14.0.1-x86_64-linux) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lograge (0.11.2) @@ -171,49 +202,49 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.9.4) - loofah (2.8.0) + logster (2.9.6) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lz4-ruby (0.3.3) - mail (2.7.1) - mini_mime (>= 0.1.1) maxminddb (0.1.22) - memory_profiler (0.9.14) - message_bus (3.3.4) + memory_profiler (1.0.0) + message_bus (3.3.5) rack (>= 1.1.3) method_source (1.0.0) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - mini_racer (0.3.1) - libv8 (~> 8.4.255) - mini_scheduler (0.12.3) - sidekiq - mini_sql (0.3) - mini_suffix (0.3.0) + mini_mime (1.1.0) + mini_portile2 (2.5.1) + mini_racer (0.4.0) + libv8-node (~> 15.14.0.0) + mini_scheduler (0.13.0) + sidekiq (>= 4.2.3) + mini_sql (1.1.3) + mini_suffix (0.3.2) ffi (~> 1.9) - minitest (5.14.2) - mocha (1.11.2) - mock_redis (0.26.0) - msgpack (1.3.3) + minitest (5.14.4) + mocha (1.12.0) + mock_redis (0.28.0) + ruby2_keywords + msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mustache (1.1.1) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nio4r (2.5.7) + nokogiri (1.11.3) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) - oauth (0.5.4) - oauth2 (1.4.4) + oauth (0.5.6) + oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.10.16) + oj (3.11.5) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -222,35 +253,38 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.0) + omniauth-google-oauth2 (0.8.2) jwt (>= 2.0) - omniauth (>= 1.1.1) + oauth2 (~> 1.1) + omniauth (~> 1.1) omniauth-oauth2 (>= 1.6) - omniauth-oauth (1.1.0) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.7.0) + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) - omniauth (~> 1.9) + omniauth (>= 1.9, < 3) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (2.2.1) + onebox (2.2.15) addressable (~> 2.7.0) htmlentities (~> 4.3) multi_json (~> 1.11) mustache nokogiri (~> 1.7) sanitize - openssl-signature_algorithm (1.0.0) + openssl (2.2.0) + openssl-signature_algorithm (1.1.1) + openssl (~> 2.0) optimist (3.0.1) parallel (1.20.1) - parallel_tests (3.4.0) + parallel_tests (3.7.0) parallel - parser (2.7.2.0) + parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) - progress (3.5.2) + progress (3.6.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -260,11 +294,12 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.0.4) + puma (5.3.1) nio4r (~> 2.0) r2 (0.2.7) + racc (1.5.2) rack (2.2.3) - rack-mini-profiler (2.2.0) + rack-mini-profiler (2.3.2) rack (>= 1.2.0) rack-protection (2.1.0) rack @@ -275,23 +310,23 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails_failover (0.6.2) + rails_failover (0.7.3) activerecord (~> 6.0) concurrent-ruby railties (~> 6.0) - rails_multisite (2.5.0) + rails_multisite (3.0.0) activerecord (> 5.0, < 7) railties (> 5.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + thor (~> 1.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.3) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) rbtrace (0.4.14) @@ -300,72 +335,72 @@ GEM optimist (>= 3.0.0) rchardet (1.8.0) redis (4.2.5) - redis-namespace (1.8.0) + redis-namespace (1.8.1) redis (>= 3.0.4) - regexp_parser (2.0.0) + regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) - rexml (3.2.4) + rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rqrcode (1.1.2) + rqrcode (2.0.0) chunky_png (~> 1.0) - rqrcode_core (~> 0.1) - rqrcode_core (0.1.2) + rqrcode_core (~> 1.0) + rqrcode_core (1.0.0) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) + rspec-core (3.10.1) rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (4.0.1) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.10.0) - rswag-specs (2.3.1) + rspec-rails (5.0.1) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.2) + rswag-specs (2.4.0) activesupport (>= 3.1, < 7.0) json-schema (~> 2.2) railties (>= 3.1, < 7.0) rtlit (0.0.5) - rubocop (1.4.2) + rubocop (1.14.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.1.1) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.2.0) - parser (>= 2.7.1.5) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.5.0) + parser (>= 3.0.1.1) rubocop-discourse (2.4.1) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.0.0) + rubocop-rspec (2.3.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) - ruby-prof (1.4.2) - ruby-progressbar (1.10.1) + ruby-prof (1.4.3) + ruby-progressbar (1.11.0) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rubyzip (2.3.0) - sanitize (5.2.1) + sanitize (5.2.3) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) @@ -381,18 +416,18 @@ GEM seed-fu (2.3.9) activerecord (>= 3.1) activesupport (>= 3.1) - shoulda-matchers (4.4.1) + shoulda-matchers (4.5.1) activesupport (>= 4.2.0) - sidekiq (6.1.2) + sidekiq (6.2.1) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) - simplecov (0.20.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -401,24 +436,24 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.16) - test-prof (0.12.2) - thor (1.0.1) - thread_safe (0.3.6) + stackprof (0.2.17) + test-prof (1.0.5) + thor (1.1.0) tilt (2.0.10) - tzinfo (1.2.8) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - unicorn (5.7.0) + unicode-display_width (2.0.0) + unicorn (6.0.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.13.0) - webmock (3.10.0) + uniform_notifier (1.14.2) + uri_template (0.7.0) + webmock (3.12.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -427,20 +462,25 @@ GEM jwt (~> 2.0) xorcist (1.1.2) yaml-lint (0.0.10) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS + arm64-darwin-20 ruby + x86_64-darwin-18 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-linux DEPENDENCIES - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) + actionmailer (= 6.1.3.2) + actionpack (= 6.1.3.2) + actionview (= 6.1.3.2) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activesupport (= 6.0.3.3) + activemodel (= 6.1.3.2) + activerecord (= 6.1.3.2) + activesupport (= 6.1.3.2) addressable annotate aws-sdk-s3 @@ -461,6 +501,7 @@ DEPENDENCIES discourse-ember-rails (= 0.18.6) discourse-ember-source (~> 3.12.2) discourse-fonts + discourse_dev discourse_image_optim email_reply_trimmer ember-handlebars-template (= 0.8.0) @@ -471,20 +512,21 @@ DEPENDENCIES fast_blank fast_xs fastimage - flamegraph gc_tracer highline htmlentities http_accept_language json + json_schemer listen lograge logstash-event logstash-logger logster + loofah lru_redux lz4-ruby - mail + mail! maxminddb memory_profiler message_bus @@ -518,7 +560,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 6.0.3.3) + railties (= 6.1.3.2) rake rb-fsevent rbtrace @@ -558,4 +600,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.1.4 + 2.2.16 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index b2cf191a4444..4b3ce8ce2192 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1,14 +1,14 @@ { actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75"; + sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp"; + sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56"; + sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7"; + sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -125,30 +125,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17xranmng1mg6238zdmnfvaig82r2ymp2apra9yh5d8rhvn8hkwm"; + sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg"; type = "gem"; }; - version = "1.390.0"; + version = "1.432.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -156,10 +156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05dq7jfv5qf1y00ib96nqsipf08hflw8n8fwkyjw4qav84wjqaq4"; + sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9"; type = "gem"; }; - version = "3.109.2"; + version = "3.112.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.39.0"; + version = "1.42.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -178,10 +178,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mld0yh6q6i2nbb143g5xc6gm70sqpvpwxfknlihrd8jmw3xc0bs"; + sha256 = "0sm1x1pm2wb8gj3p4yv45r7n8m4k3qawk3lrnd2lvk2vg5nyfh61"; type = "gem"; }; - version = "1.83.2"; + version = "1.90.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dw80ldqhb1mny5irgi2jh36hykcmyd07xalv21xncxqzmf8aiag"; + sha256 = "0cqri14igfmcxlapbagg0nmy79zzg29awzybv51gl76m3mljbafb"; type = "gem"; }; - version = "1.35.0"; + version = "1.38.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; barber = { dependencies = ["ember-source" "execjs"]; @@ -237,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; type = "gem"; }; - version = "0.8.0"; + version = "1.0.0"; }; bootsnap = { dependencies = ["msgpack"]; @@ -252,10 +252,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qx1f729bgh391agsqb4ngzn22wdn4cc6mkp0cipf0d5hsg9cpaq"; + sha256 = "12n09iwpssnsfw9s140ynfxr9psd0xcfx42yqdsk0hq60zhq2nlx"; type = "gem"; }; - version = "1.5.1"; + version = "1.7.5"; }; builder = { groups = ["default" "development" "test"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9"; + sha256 = "0r8d3vh1xjfx46qlv75228rkshzgqxpmf491vxzpicpqi1xad5ni"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.4"; }; byebug = { groups = ["development" "test"]; @@ -317,10 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v52ndgx9r4jybq8yzr8anzfbnjk4y2hvz97nm9924wi4bad3xkf"; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; type = "gem"; }; - version = "1.3.14"; + version = "1.4.0"; }; coderay = { groups = ["default" "development"]; @@ -351,20 +351,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; connection_pool = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qikl4av1z8kqnk5ba18136dpqzw8wjawc2w9b4zb5psdd5z8nwf"; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.5"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -388,14 +388,15 @@ version = "0.3.3"; }; crack = { + dependencies = ["rexml"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1awi8jy4jn0f7vxpdvz3xvn1zzjbjh33n28lfkijh77dla5zb7lc"; + sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; crass = { groups = ["default" "development" "test"]; @@ -413,20 +414,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; }; debug_inspector = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; type = "gem"; }; - version = "0.0.3"; + version = "1.1.0"; }; diff-lcs = { groups = ["default" "development" "test"]; @@ -464,20 +465,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqkwiqb5n64lc5jdjnmpgb9apq08ywkz9yk8mj1sx2lqcsw11pc"; + sha256 = "0q4wypjiqvjlwaif5z3pnv0z02rsiysx58d7iljrw8xx9sxwxn6x"; type = "gem"; }; - version = "3.12.2.2"; + version = "3.12.2.3"; }; discourse-fonts = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhwgqclh3jncjr55m0hyq3w3iw8jw2r7ickzq1zn1282pc3n2i7"; + sha256 = "1gr1d80wmb1jvip82jlbsz5bcpwsz9lryxxfnwiw537vx8pqkk3p"; type = "gem"; }; - version = "0.0.5"; + version = "0.0.8"; + }; + discourse_dev = { + dependencies = ["faker"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sn2lcgjhsbqnaca97a37bfk249c55b3cn1q8abnf1am9jq5hdiw"; + type = "gem"; + }; + version = "0.2.1"; }; discourse_image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -495,10 +507,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; + }; + ecma-re-validator = { + dependencies = ["regexp_parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6"; + type = "gem"; + }; + version = "0.3.0"; }; email_reply_trimmer = { groups = ["default"]; @@ -561,20 +584,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; + sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7"; type = "gem"; }; - version = "0.78.0"; + version = "0.81.0"; }; execjs = { groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; exifr = { groups = ["default"]; @@ -591,10 +614,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdrl55xf76pbc5kjzp7diawxxvgbk2cm38532in6df823431n6z"; + sha256 = "1a1zv94hcss44n1b04w0rg0swg8npigrj3nva9h0y2f1iflj124k"; type = "gem"; }; - version = "2.21.1"; + version = "2.22.0"; + }; + faker = { + dependencies = ["i18n"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6"; + type = "gem"; + }; + version = "2.17.0"; }; fakeweb = { groups = ["test"]; @@ -607,12 +641,42 @@ version = "1.3.0"; }; faraday = { - dependencies = ["multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi"; + type = "gem"; + }; + version = "1.4.1"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + 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 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; type = "gem"; }; version = "1.1.0"; @@ -654,10 +718,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ny2pj0j6pljszrf1w3iqdv2pcl2iwwghjbgcjlizy424zbh0hb"; + sha256 = "0lgr0vs9kg5622qaf2l3f37b238dncs037fisiygvkbq8sg11i68"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.3"; }; ffi = { groups = ["default" "development" "test"]; @@ -668,20 +732,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; - }; - flamegraph = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p785nmhdzbwj0qpxn5fzrmr4kgimcds83v4f95f387z6w3050x6"; - type = "gem"; - }; - version = "0.9.5"; + version = "1.15.0"; }; fspath = { groups = ["default"]; @@ -728,6 +782,16 @@ }; version = "0.0.11"; }; + hana = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03cvrv2wl25j9n4n509hjvqnmwa60k92j741b64a1zjisr1dn9al"; + type = "gem"; + }; + version = "1.3.7"; + }; hashdiff = { groups = ["default" "test"]; platforms = []; @@ -794,10 +858,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.10"; }; image_size = { groups = ["default"]; @@ -845,10 +909,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; json-schema = { dependencies = ["addressable"]; @@ -861,15 +925,26 @@ }; version = "2.8.1"; }; + json_schemer = { + dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik"; + type = "gem"; + }; + version = "0.2.18"; + }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; kgio = { groups = ["default"]; @@ -887,15 +962,15 @@ }; version = "2.11.3"; }; - libv8 = { + libv8-node = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + sha256 = "1xx217hrkpcm41p41inmy05kb7g8p9w5fwabgjgmpvz0d60j2862"; type = "gem"; }; - version = "8.4.255.0"; + version = "15.14.0.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -903,10 +978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0028p1fss6pvw4mlpjqdmxfzsm8ww79irsadbibrr7f23qfn8ykr"; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; type = "gem"; }; - version = "3.3.1"; + version = "3.5.1"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -945,10 +1020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ldikj3p0bakxg57didaw05pldjn0i5r20zawhqa34knlsqm66r6"; + sha256 = "1a65kp9d3n34nnd0vr49s3gxxjzi4l197s3qyq4njjf81smd2764"; type = "gem"; }; - version = "2.9.4"; + version = "2.9.6"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -956,10 +1031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; + sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.1"; }; lru_redux = { groups = ["default"]; @@ -992,11 +1067,13 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; - type = "gem"; + fetchSubmodules = false; + rev = "5b700fc95ee66378e0cf2559abc73c8bc3062a4b"; + sha256 = "0j084s1gsdwiqvm4jdayi0x4rsdrazqv8z8wkz28v7zmaymw18lz"; + type = "git"; + url = "https://github.com/discourse/mail.git"; }; - version = "2.7.1"; + version = "2.8.0.edge"; }; maxminddb = { groups = ["default"]; @@ -1017,10 +1094,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v"; type = "gem"; }; - version = "0.9.14"; + version = "1.0.0"; }; message_bus = { dependencies = ["rack"]; @@ -1028,10 +1105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hckijk9aa628nx66vr7axfsk7zfdkskaxj1mdzikk019q3h54fr"; + sha256 = "0gg8axd71vjanzis8w4h4if2qi4fx0glmc258dwa5b3z6zvzsbz8"; type = "gem"; }; - version = "3.3.4"; + version = "3.3.5"; }; method_source = { groups = ["default" "development" "test"]; @@ -1048,31 +1125,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; mini_portile2 = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; mini_racer = { - dependencies = ["libv8"]; + dependencies = ["libv8-node"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r7j241mvhyyc017bqgp0pvf3jyrwbcqvz2pzm0r8zn2r85ks1jl"; + sha256 = "0334q46gi3il9izw7k4z32fj06nm8pznqdkr9r51033lnwwy9zy3"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.0"; }; mini_scheduler = { dependencies = ["sidekiq"]; @@ -1080,20 +1157,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vigv7f1q5bkcb55ab2lyhq15yqfkg5mq61p7m7mw9b3jac7qjz1"; + sha256 = "1cy9c2wv19m4h2sv9fs66hh1an7hq3y9513678dzx43vm3kjvhz5"; type = "gem"; }; - version = "0.12.3"; + version = "0.13.0"; }; mini_sql = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qi4bj5jkh3673ybsxvsf7y485znyxb72vxg84gk9x65mf0y0m6h"; + sha256 = "1yvln5wx2jfpd9q2pvjdid96vdz1ynnfk8ip913wpx28wp8ww7jn"; type = "gem"; }; - version = "0.3"; + version = "1.1.3"; }; mini_suffix = { dependencies = ["ffi"]; @@ -1101,40 +1178,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bxd1fgzb20gvfvhbkrxym9fr7skm5x6fzvqfg4a0jijb34ww50h"; + sha256 = "1r6pwyv1vpyza0rn1pyxls4qdw5jd3vg4k5dp1iaqa57n6fiqrvi"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.2"; }; minitest = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; mocha = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"; + sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.0"; }; mock_redis = { + dependencies = ["ruby2_keywords"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06yj6j9x4zjckah4ixiwhy3hb6xzjp7yk7lmmcvcb8hpd0z0x95q"; + sha256 = "0x6ng2p1884pjpwj169p6xyas5bvshi4q1wfcfmxvk82jwm0cz3c"; type = "gem"; }; - version = "0.26.0"; + version = "0.28.0"; }; msgpack = { groups = ["default"]; @@ -1145,10 +1223,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.2"; }; multi_json = { groups = ["default"]; @@ -1195,21 +1273,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.7"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.3"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -1217,20 +1295,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; + sha256 = "0ngsnr0l6r4yccdwvky18n9a81plhpviaw6g7ym45mr1q0y0aj2w"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.5"; }; oauth = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; + sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.6"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1238,20 +1316,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhakjh30vi8scqwnhd1c9qkac9r8hh2lr0dbs5ynwmrc5djxknm"; + sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.7"; }; oj = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqmzqldi9a0wpilwx87yh61xd7647gg8ffammg4ava0bsx375g2"; + sha256 = "1cnadm83qwnmbpyild9whb9bgf9r7gs046ydxypclb2l756gcnva"; type = "gem"; }; - version = "3.10.16"; + version = "3.11.5"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1287,15 +1365,15 @@ version = "1.4.0"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pgqasl048irs2c6w6g57zvk0ygb5ml1krwir4qi4b6y53zyr55"; + sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.2"; }; omniauth-oauth = { dependencies = ["oauth" "omniauth"]; @@ -1303,10 +1381,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"]; @@ -1314,10 +1392,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v6rw7sd223k7qw0l13wikgfcqbvbk81r53a9i2z0k7jl5vd97w5"; + sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1336,20 +1414,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2aih0d5cva9bris36gh1mk3ym61wgxlpwvzjd6qphdrjfzqx8v"; + sha256 = "0a76xmwikcg2lv8k2cawzhmi2hx7j145v12mbpriby6zff797z4g"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.15"; }; - openssl-signature_algorithm = { + openssl = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h1pfx49j8d9vbdbi8jyj0mr63l7rhflgvgc0nhfygm1v77d7nkn"; + sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; type = "gem"; }; - version = "1.0.0"; + version = "2.2.0"; + }; + openssl-signature_algorithm = { + dependencies = ["openssl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "173p9agv45hj62fdgl9bzqr9f6xg7hi2sf5iyd3ahiwbv220x332"; + type = "gem"; + }; + version = "1.1.1"; }; optimist = { groups = ["default"]; @@ -1381,10 +1470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mvdk8vgzqjv2pvadxwc8w2vf8dmiw145rjf47c36nn6l5hh02j6"; + sha256 = "1vrd24lg1pqxvp63664hrndywpdyn8i38j4gfvqk8zjl1mxy9840"; type = "gem"; }; - version = "3.4.0"; + version = "3.7.0"; }; parser = { dependencies = ["ast"]; @@ -1392,10 +1481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1pxsi1i5z506xfzhiyavlasf8777h55ab40phvp7pfv9npmd5pnj"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.1.1"; }; pg = { groups = ["default"]; @@ -1412,10 +1501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pm3bv5n8c8j0vfm7wghd7xf6yq4m068cksxjldmna11qi0h0s8s"; + sha256 = "0wymdk40cwrqn32gwg1kw94s5p1n0z3n7ma7x1s62gd4vw3d63in"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -1466,10 +1555,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkmfbf4qyiknwi9bb5432cpbbz06r855gknxb8grn24gmgs4d9i"; + sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i"; type = "gem"; }; - version = "5.0.4"; + version = "5.3.1"; }; r2 = { groups = ["default"]; @@ -1481,6 +1570,16 @@ }; version = "0.2.7"; }; + racc = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default" "development" "test"]; platforms = [{ @@ -1501,10 +1600,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05s7y56ayn56bn7y5ah3krm5d53vsj7apmcxlwc2qp7ik0xlypvq"; + sha256 = "02rkbmi66pqcx8l4yxnhpiywdqhbza4m2i2b457q8imjvw950jhs"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.2"; }; rack-protection = { dependencies = ["rack"]; @@ -1556,10 +1655,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ibxn7lk6rqk7q76cd9ir3xnh19p2pqr9mzam46n3h37f12yyax5"; + sha256 = "0g3snqmsbdl2jyf2h7q4ds333hizp0j89chca75xv10gv2lq6sa8"; type = "gem"; }; - version = "0.6.2"; + version = "0.7.3"; }; rails_multisite = { dependencies = ["activerecord" "railties"]; @@ -1567,10 +1666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7g9gkcmw030zfqlw3k933i40j31wf3jh4bj1niihzk7slha97y"; + sha256 = "09lwi5pd0bisy45pv85l8w7wm5f7l5bxpva0y7bcvqdrk49ykm1g"; type = "gem"; }; - version = "2.5.0"; + version = "3.0.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -1578,10 +1677,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j"; + sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.1.3.2"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1614,20 +1713,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-fsevent = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; + sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.0"; }; rb-inotify = { dependencies = ["ffi"]; @@ -1681,20 +1780,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1racz3w9s4w0ls32bvjypfifk4a7qxngm2cv1rh16jyz0c1wjd70"; + sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; request_store = { dependencies = ["rack"]; @@ -1712,10 +1811,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rinku = { groups = ["default"]; @@ -1743,20 +1842,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lw8b6wfshxd61xw98xyp1a0zsz6av4nls2c9fwb7q59wb05sci"; + sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02"; type = "gem"; }; - version = "1.1.2"; + version = "2.0.0"; }; rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071jqmhk3hf0grsvi0jx5sl449pf82p40ls5b3likbq4q516zc0j"; + sha256 = "1djrfpzdy19c336nlzxdsm9qkrgqnm1himdawflsjsmxpq4j826c"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -1775,10 +1874,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2"; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1786,10 +1885,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc"; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.1"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -1808,10 +1907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.2"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1819,20 +1918,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; + sha256 = "1pj2a9vrkp2xzlq0810q90sdc2zcqc7k92n57hxzhri2vcspy7n6"; type = "gem"; }; - version = "4.0.1"; + version = "5.0.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.2"; }; rswag-specs = { dependencies = ["activesupport" "json-schema" "railties"]; @@ -1840,10 +1939,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lyp2m76p960bvgy4xcz0dilp4w5lq2cwh8md5z7cwxdg8qsbr83"; + sha256 = "1dma3j5vfjhyclg8y0gsp44vs4wn9chf4jgfhc9r6ws018xrbxzd"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; rtlit = { groups = ["assets"]; @@ -1861,10 +1960,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kvzhzhzcdd5bqwjilb0fpp51sqjniww2b0g713n0cvhnlgchn2y"; + sha256 = "0chjr6i0g7frbp7dhi4d83ppf7akkdaw7mcgcwbxd6a9mairafpp"; type = "gem"; }; - version = "1.4.2"; + version = "1.14.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -1872,10 +1971,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0kdi89ad7dd1xmzrdf5ikk32bllzr68hf4x8fd7azcv5jnch2l"; + sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf"; type = "gem"; }; - version = "1.2.0"; + version = "1.5.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -1894,10 +1993,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gl7hdd9lq0si4gb510g33dbysmk3iydas2b0sbl5pwfkhv0k4g1"; + sha256 = "0r69qcwm74vsbp1s2gaqaf91kkrsn2mv4gk6rvfb2pxzmgyi0r9g"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.0"; }; ruby-prof = { groups = ["development"]; @@ -1908,20 +2007,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm3wdxc6gjldkb5pdwwipapf84lgrvxck4h5kg8jdfd8arrpyis"; + sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; ruby-readability = { dependencies = ["guess_html_encoding" "nokogiri"]; @@ -1935,14 +2034,14 @@ version = "0.7.0"; }; ruby2_keywords = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; rubyzip = { groups = ["default"]; @@ -1960,10 +2059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18m3zcf207gcrmghx288w3n2kpphc22lbmbc1wdx1nzcn8g2yddh"; + sha256 = "0xi2c9vbfjs0gk4i9y4mrlb3xx6g5lj22hlg5cx6hyc88ri7j4bc"; type = "gem"; }; - version = "5.2.1"; + version = "5.2.3"; }; sassc = { dependencies = ["ffi" "rake"]; @@ -2004,10 +2103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd1bblxr4dfmrnh3j83kvfds6a7nak4ifq37ab0pg1kdi6iiw7l"; + sha256 = "1qi7gzli00mqlaq9an28m6xd323k7grgq19r6dqa2amjnnxy41ld"; type = "gem"; }; - version = "4.4.1"; + version = "4.5.1"; }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; @@ -2015,10 +2114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mjxrxppv08a1hwqi8gpg6n168cxqhp7c2r2jwc4rbz9j5k41vcw"; + sha256 = "1ac57q6lnqg9h9lsj49wlwhgsfqfr83lgka1c1srk6g8vghhz662"; type = "gem"; }; - version = "6.1.2"; + version = "6.2.1"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2026,10 +2125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mm20dvd64w46l5k11il9z5sjgdpp0bknml76glcngvl2w03k3cb"; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.2"; }; simplecov-html = { groups = ["default" "test"]; @@ -2046,10 +2145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl3j7p3b5q7sxsx1va63c8imc5x6g99xablz08qrmqhpi0d6g6j"; + sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -2092,40 +2191,30 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "147rb66p3n062vc433afqhkd99iazvkrqnghxgh871r62yhha93f"; + sha256 = "06lz70k8c0r7fyxk1nc3idh14x7nvsr21ydm1bsmbj00jyhmfzsn"; type = "gem"; }; - version = "0.2.16"; + version = "0.2.17"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jfq8ylxpxanc3f0i6qb3nchawx9hj6qcqj6ccfyixrnvzswwjvi"; + sha256 = "15jbm45jf1i8s1g5kj6pcfp6ddq9qfyy31lx3pff8g2w2hkhpik4"; type = "gem"; }; - version = "0.12.2"; + version = "1.0.5"; }; thor = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; - }; - thread_safe = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; + version = "1.1.0"; }; tilt = { groups = ["default"]; @@ -2138,15 +2227,15 @@ version = "2.0.10"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.8"; + version = "2.0.4"; }; uglifier = { dependencies = ["execjs"]; @@ -2185,10 +2274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; type = "gem"; }; - version = "1.7.0"; + version = "2.0.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2202,20 +2291,30 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzdhbmab2w034wpdj5ippnyyvgqm8gpx9wbchb4zgs4i1mswzhv"; + sha256 = "1jcm85d7j7njfgims712svlgml32zjim6qwabm99645aj5laayln"; type = "gem"; }; - version = "5.7.0"; + version = "6.0.0"; }; uniform_notifier = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c"; + sha256 = "1614dqnky0f9f1znj0lih8i184vfps86md93dw0kxrg3af9gnqb4"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.2"; + }; + uri_template = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i"; + type = "gem"; + }; + version = "0.7.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; @@ -2223,10 +2322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wbdjagk2qpr76k3zw2gmkfp5aqlrc1a4qrpjv7sq1q39qbn8xax"; + sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0"; type = "gem"; }; - version = "3.10.0"; + version = "3.12.2"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -2264,9 +2363,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; } diff --git a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch index 1dbfed679192..d78b511f6ad9 100644 --- a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch +++ b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch @@ -1,10 +1,10 @@ diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb -index 373e235b3f..57d4d7a55b 100644 +index ffcafcb618..31ba691983 100644 --- a/config/unicorn.conf.rb +++ b/config/unicorn.conf.rb @@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid") - if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"] + if ENV["RAILS_ENV"] != "production" logger Logger.new($stdout) - # we want a longer timeout in dev cause first request can be really slow - timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60) From 2dec0de3c039406950aaa79cbdeb9bfbcae4f87d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 26 May 2021 21:05:00 -0700 Subject: [PATCH 351/664] nixos/discourse: Add rsync dependency It is used for backup importing. --- pkgs/servers/web-apps/discourse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 02ebb40d3843..12ae858ea3a4 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript , fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git, cacert , util-linux, gawk, imagemagick, optipng, pngquant, libjpeg, jpegoptim -, gifsicle, libpsl, redis, postgresql, which, brotli, procps +, gifsicle, libpsl, redis, postgresql, which, brotli, procps, rsync , nodePackages, v8 }: @@ -18,6 +18,7 @@ let runtimeDeps = [ # For backups, themes and assets rubyEnv.wrappedRuby + rsync gzip gnutar git From cb80b67993d6ba195c3329606aab5fb981d8323c Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 27 May 2021 11:41:35 +0200 Subject: [PATCH 352/664] nixos/discourse: Assert deployed PostgreSQL version Assert that the PostgreSQL version being deployed is the one used upstream. Allow the user to override this assertion, since it's not always possible or preferable to use the recommended one. --- nixos/modules/services/web-apps/discourse.nix | 22 +++++++++++++++++++ nixos/tests/discourse.nix | 2 ++ 2 files changed, 24 insertions(+) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index ba5989800eaf..49958fc6190c 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -5,11 +5,16 @@ let cfg = config.services.discourse; + # Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5 + upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; + postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql; + postgresqlVersion = lib.getVersion postgresqlPackage; + # We only want to create a database if we're actually going to connect to it. databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == null; @@ -263,6 +268,17 @@ in Discourse database user. ''; }; + + ignorePostgresqlVersion = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to allow other versions of PostgreSQL than the + recommended one. Only effective when + + is enabled. + ''; + }; }; redis = { @@ -505,6 +521,12 @@ in assertion = cfg.hostname != ""; message = "Could not automatically determine hostname, set service.discourse.hostname manually."; } + { + assertion = cfg.database.ignorePostgresqlVersion || (databaseActuallyCreateLocally -> upstreamPostgresqlVersion == postgresqlVersion); + message = "The PostgreSQL version recommended for use with Discourse is ${upstreamPostgresqlVersion}, you're using ${postgresqlVersion}. " + + "Either update your PostgreSQL package to the correct version or set services.discourse.database.ignorePostgresqlVersion. " + + "See https://nixos.org/manual/nixos/stable/index.html#module-postgresql for details on how to upgrade PostgreSQL."; + } ]; diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 3c965550fe0a..2ed6fb957c20 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -51,6 +51,8 @@ import ./make-test-python.nix ( environment.systemPackages = [ pkgs.jq ]; + services.postgresql.package = pkgs.postgresql_13; + services.discourse = { enable = true; inherit admin; From 80e86f8871e3d4e328f5185e98cefa44269fc474 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 24 May 2021 22:07:52 -0700 Subject: [PATCH 353/664] xpra: Add NVENC support --- pkgs/tools/X11/xpra/default.nix | 22 +++++++++++++++++----- pkgs/tools/X11/xpra/nvenc.pc | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/X11/xpra/nvenc.pc diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 8fd0cf016bf4..c3cea1ed0612 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,12 +1,13 @@ { lib , fetchurl , fetchpatch -, substituteAll, python3, pkg-config, writeText +, substituteAll, python3, pkg-config, runCommand, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265, librsvg , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection +, withNvenc ? false, cudatoolkit, nv-codec-headers-10, nvidia_x11 ? null , pam }: with lib; @@ -34,6 +35,13 @@ let EndSection ''; + nvencHeaders = runCommand "nvenc-headers" { + inherit nvidia_x11; + } '' + mkdir -p $out/include $out/lib/pkgconfig + cp ${nv-codec-headers-10}/include/ffnvcodec/nvEncodeAPI.h $out/include + substituteAll ${./nvenc.pc} $out/lib/pkgconfig/nvenc.pc + ''; in buildPythonApplication rec { pname = "xpra"; version = "4.2"; @@ -60,7 +68,8 @@ in buildPythonApplication rec { substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ] + ++ lib.optional withNvenc cudatoolkit; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage @@ -81,13 +90,13 @@ in buildPythonApplication rec { pam gobject-introspection - ]; + ] ++ lib.optional withNvenc nvencHeaders; propagatedBuildInputs = with python3.pkgs; [ pillow rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy pygobject3 pycairo gst-python pam pyopengl paramiko opencv4 python-uinput pyxdg ipaddress idna pyinotify - ]; + ] ++ lib.optionals withNvenc (with python3.pkgs; [pynvml pycuda]); # error: 'import_cairo' defined but not used NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; @@ -100,7 +109,7 @@ in buildPythonApplication rec { # Override these, setup.py checks for headers in /usr/* paths "--with-pam" "--with-vsock" - ]; + ] ++ lib.optional withNvenc "--with-nvenc"; dontWrapGApps = true; preFixup = '' @@ -111,6 +120,9 @@ in buildPythonApplication rec { --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} + '' + lib.optionalString withNvenc '' + --prefix LD_LIBRARY_PATH : ${nvidia_x11}/lib + '' + '' ) ''; diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/tools/X11/xpra/nvenc.pc new file mode 100644 index 000000000000..6d8d916a0251 --- /dev/null +++ b/pkgs/tools/X11/xpra/nvenc.pc @@ -0,0 +1,11 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=@nvidia_x11@/lib + +Name: nvenc +Description: NVENC +Version: 10 +Requires: +Conflicts: +Libs: -L${libdir} -lnvidia-encode +Cflags: -I${includedir} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e49421cbf38f..554e6c417110 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27614,6 +27614,10 @@ in libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { }; + xpraWithNvenc = callPackage ../tools/X11/xpra { + withNvenc = true; + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; + }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; From d344dccf3dc592242f11ef993acb9ecee8d84796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 16 May 2021 17:47:01 +0200 Subject: [PATCH 354/664] nixos/wireguard: Remove .path systemd unit for privkey. Fixes #123203 As per `man systemd.path`: > When a service unit triggered by a path unit terminates > (regardless whether it exited successfully or failed), > monitored paths are checked immediately again, > **and the service accordingly restarted instantly**. Thus the existence of the path unit made it impossible to stop the wireguard service using e.g. systemctl stop wireguard-wg0.service Systemd path units are not intended for program inputs such as private key files. This commit simply removes this usage; the private key is still generated by the `generateKeyServiceUnit`. --- nixos/modules/services/networking/wireguard.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 471f4bf8b33f..2b51770a5aa1 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -244,17 +244,6 @@ let }; - generatePathUnit = name: values: - assert (values.privateKey == null); - assert (values.privateKeyFile != null); - nameValuePair "wireguard-${name}" - { - description = "WireGuard Tunnel - ${name} - Private Key"; - requiredBy = [ "wireguard-${name}.service" ]; - before = [ "wireguard-${name}.service" ]; - pathConfig.PathExists = values.privateKeyFile; - }; - generateKeyServiceUnit = name: values: assert values.generatePrivateKeyFile; nameValuePair "wireguard-${name}-key" @@ -509,9 +498,6 @@ in // (mapAttrs' generateKeyServiceUnit (filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces)); - systemd.paths = mapAttrs' generatePathUnit - (filterAttrs (name: value: value.privateKeyFile != null) cfg.interfaces); - }); } From b011e1f8104f646f712aa14d2ba5de1bc1366ebe Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 28 May 2021 21:46:48 -0300 Subject: [PATCH 355/664] virt-manager: fix missing cdrtools (#124408) Co-authored-by: Sandro --- pkgs/applications/virtualization/virt-manager/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4d74b5d66102..1d5044cd213d 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -32,10 +32,9 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; - [ - pygobject3 ipaddress libvirt libxml2 requests - ]; + propagatedBuildInputs = with python3Packages; [ + pygobject3 ipaddress libvirt libxml2 requests cdrtools + ]; patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py From 4d3b47a6146cecc415bdbd9e10959dac3731dd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 10 May 2021 12:02:54 +0200 Subject: [PATCH 356/664] linuxPackages_latest: update to 5.12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b59c3e8924..9f2c07167572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20739,7 +20739,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_11; + linuxPackages_latest = linuxPackages_5_12; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. From b7630d5591d51048155cac4536ff8bedcfaae3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 15 May 2021 14:44:07 +0200 Subject: [PATCH 357/664] rl-2105: mention linux_latest and potential zfs issues --- nixos/doc/manual/release-notes/rl-2105.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index fa100290460e..12a9ae2f44ea 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -25,6 +25,7 @@ The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. + The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. From 48b6b8b8c663a20fbe7969bed1d6381341106762 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Sat, 29 May 2021 11:23:10 +1000 Subject: [PATCH 358/664] cargo-raze: fix darwin (#124343) * cargo-raze: fix darwin Disable tests on darwin as they've started failing after the latest update: https://github.com/NixOS/nixpkgs/pull/119531 Example failure: https://hydra.nixos.org/build/143411545 * Update pkgs/development/tools/rust/cargo-raze/default.nix Co-authored-by: Sandro --- pkgs/development/tools/rust/cargo-raze/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 2e75c08b42bb..0299fe516d94 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl libgit2 openssl ] ++ lib.optional stdenv.isDarwin Security; - doCheck = true; + # thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"' + # __darwinAllowLocalNetworking does not fix the panic + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; From 71cf65cec5786c5ad756e5f3df915846a3f85bf5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 26 May 2021 23:56:18 -0400 Subject: [PATCH 359/664] pcl: fix convex hull support PCL requires a patch to be compatible with QHull 2020.2. The patch has been accepted upstream, but this commit uses a version of the patch from Conda, which has been backported to 1.11. --- pkgs/development/libraries/pcl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b8cdff1f48c8..2b2763b5a05d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , cmake , qhull @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; + patches = [ + # Support newer QHull versions (2020.2) + # Backport of https://github.com/PointCloudLibrary/pcl/pull/4540 + (fetchpatch { + url = "https://raw.githubusercontent.com/conda-forge/pcl-feedstock/0b1eff402994a3fb891b44659c261e7e85c8d915/recipe/4540.patch"; + sha256 = "0hhvw6ajigzrarn95aicni73zd3sdgnb8rc3wgjrrg19xs84z138"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ qhull From e8c8b3a760ff95ac09a7d5b1f4db872f5d4de20e Mon Sep 17 00:00:00 2001 From: astsmtl Date: Sat, 29 May 2021 04:50:19 +0300 Subject: [PATCH 360/664] rymcast: init at 1.0.6 (#123830) Co-authored-by: Sandro --- pkgs/applications/audio/rymcast/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/rymcast/default.nix diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix new file mode 100644 index 000000000000..9f63dbe7bc27 --- /dev/null +++ b/pkgs/applications/audio/rymcast/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper +, alsaLib, curl, gtk3, webkitgtk, zenity }: + +stdenv.mkDerivation rec { + pname = "rymcast"; + version = "1.0.6"; + + src = fetchzip { + url = "https://www.inphonik.com/files/rymcast/rymcast-${version}-linux-x64.tar.gz"; + hash = "sha256:0vjjhfrwdibjjgz3awbg30qxkjrzc4cya1f4pigwjh3r0vvrq0ga"; + stripRoot = false; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ alsaLib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; + + installPhase = '' + mkdir -p "$out/bin" + cp RYMCast "$out/bin/" + wrapProgram "$out/bin/RYMCast" \ + --set PATH "${lib.makeBinPath [ zenity ]}" + ''; + + meta = with lib; { + description = "Player for Mega Drive/Genesis VGM files"; + homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ astsmtl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b99aa8983411..25530977afde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26279,6 +26279,10 @@ in runc = callPackage ../applications/virtualization/runc {}; + rymcast = callPackage ../applications/audio/rymcast { + inherit (gnome) zenity; + }; + uade123 = callPackage ../applications/audio/uade123 {}; udevil = callPackage ../applications/misc/udevil {}; From 25bca77c48ddb0bacdb46e7398d948a348d06119 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 03:50:36 +0200 Subject: [PATCH 361/664] chaos: init at 0.1.9 (#124306) Co-authored-by: Sandro --- pkgs/tools/networking/chaos/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/chaos/default.nix diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/tools/networking/chaos/default.nix new file mode 100644 index 000000000000..dc46032dcde6 --- /dev/null +++ b/pkgs/tools/networking/chaos/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "chaos"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "chaos-client"; + rev = "v${version}"; + sha256 = "13lblrckf65y7kd3lw4s12bi05rv4iv25sr5xbp63l9ly5sbzaz6"; + }; + + vendorSha256 = "1mc60jkf7xmf3zsb2fihsgg3jkb2mfvsw84aby2kqcf14hdsk2gl"; + + subPackages = [ + "cmd/chaos/" + ]; + + meta = with lib; { + description = "Tool to communicate with Chaos DNS API"; + homepage = "https://github.com/projectdiscovery/chaos-client"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25530977afde..c9f41901f7a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1213,6 +1213,8 @@ in chamber = callPackage ../tools/admin/chamber { }; + chaos = callPackage ../tools/networking/chaos { }; + charm = callPackage ../applications/misc/charm { }; chars = callPackage ../tools/text/chars { From dd54ac56484f446d063c2088d856c812531f72fc Mon Sep 17 00:00:00 2001 From: Matt Christ Date: Fri, 28 May 2021 20:52:14 -0500 Subject: [PATCH 362/664] brscan5: simplify mkEnableOption --- .../services/hardware/sane_extra_backends/brscan5.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix index fc3cb3e00163..89b5ff0e0282 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix @@ -68,12 +68,7 @@ in options = { hardware.sane.brscan5.enable = - mkEnableOption "Brother's brscan5 scan backend" // { - description = '' - When enabled, will automatically register the "brscan5" sane - backend and bring configuration files to their expected location. - ''; - }; + mkEnableOption "the Brother brscan5 sane backend"; hardware.sane.brscan5.netDevices = mkOption { default = {}; From 724ed08df02546fea2ab38613d615dd47461528c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 May 2021 00:18:32 +0200 Subject: [PATCH 363/664] nixos/wordpress: regenerate secret keys if misspelled key name is found A secret key generated by the nixos module was misspelled, which could possibly impact the security of session cookies. To recover from this situation we will wipe all security keys that were previously generated by the NixOS module, when the misspelled one is found. This will result in all session cookies being invalidated. This is confirmed by the wordpress documentation: > You can change these at any point in time to invalidate all existing > cookies. This does mean that all users will have to login again. https://wordpress.org/support/article/editing-wp-config-php/#security-keys Meanwhile this issue shouldn't be too grave, since the salting function of wordpress will rely on the concatenation of both the user-provided and automatically generated values, that are stored in the database. > Secret keys are located in two places: in the database and in the > wp-config.php file. The secret key in the database is randomly > generated and will be appended to the secret keys in wp-config.php. https://developer.wordpress.org/reference/functions/wp_salt/ Fixes: 2adb03fdaea6186299c6ff578bb6814d8f3bb30b ("nixos/wordpress: generate secrets locally") Reported-by: Moritz Hedtke --- nixos/modules/services/web-apps/wordpress.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index f251cfe32db6..775ecb3acaf0 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -61,8 +61,10 @@ let ?> ''; - secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ]; + secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ]; secretsScript = hostStateDir: '' + # The match in this line is not a typo, see https://github.com/NixOS/nixpkgs/pull/124839 + grep -q "LOOGGED_IN_KEY" "${hostStateDir}/secret-keys.php" && rm "${hostStateDir}/secret-keys.php" if ! test -e "${hostStateDir}/secret-keys.php"; then umask 0177 echo "> "${hostStateDir}/secret-keys.php" From f861cd33e6e28b4a107441e1fbafcad1fcbf7ce9 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 29 May 2021 10:41:39 +0800 Subject: [PATCH 364/664] linux_xanmod: 5.12.7 -> 5.12.8 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index bb70221c791b..aa8988fae8e1 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.7"; + version = "5.12.8"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-zwaCQ0qMp6LCyWZikyyDyTktBlYEvJqJX46uiRCOUz4="; + sha256 = "sha256-i3exBrEKyTHM2Iq8AJEIHwaw6KJarfcahlm/pPxAhmo="; extraPostFetch = '' rm $out/.config ''; From d491dd73134f1adf7916665217093cf4a30ac314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 02:41:42 +0000 Subject: [PATCH 365/664] coredns: 1.8.3 -> 1.8.4 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 188c3f77cb63..e0bfc3a6225f 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-aE+kw854/wjFJqiRC/1gLzRpaVa6EPJPJaKqXtFM+Sw="; + sha256 = "sha256-mPZvREBwSyy7dhVl2mJt58T09a0CYaMfJn7GEvfuupI="; }; - vendorSha256 = "sha256-1+WgBsknyPcZhvQLffhlWBH1o0pYTFoOG5BviUJYxyA="; + vendorSha256 = "sha256-DTw7SVZGl7QdlSpqWx11bjeNUwfb4VlwsGxqPVz6vhI="; doCheck = false; From 91b22b4917b23e729651a2f59eab07c48d14b90e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 04:18:30 +0000 Subject: [PATCH 366/664] fly: 7.3.0 -> 7.3.1 --- pkgs/development/tools/continuous-integration/fly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index b34e1514750d..a4769b10b352 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "7.3.0"; + version = "7.3.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Hj6MqDTXGFuKNuG+bV154WnTR3BRnh9JcBuMecMKPY8="; + sha256 = "sha256-JtzJDbln+n05oJjA/ydZWaH4dIPLL/ZsNg+Gr+YBcng="; }; vendorSha256 = "sha256-30rrRkPIH0sr8koKRLs1Twe6Z55+lr9gkgUDrY+WOTw="; From 5d52eb8014ca02ce5d91b71bdc1c97b68b68c656 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 04:55:52 +0000 Subject: [PATCH 367/664] go-mockery: 2.7.5 -> 2.8.0 --- pkgs/development/tools/go-mockery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 6f86900edf52..347bfeb116a4 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.7.5"; + version = "2.8.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-RdXViEEJR8yud2coSmAUfIe1mTCHiZHALrcGRslNfEg="; + sha256 = "sha256-sOZig47KKKGJmV9QNCa+TwYCxemeVl6xssfExSaaFjY="; }; vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; From 014cc9ce0abeb4a78e16e482bef64cd39f7897fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 May 2021 21:40:32 +0200 Subject: [PATCH 368/664] samba: 4.13.7 -> 4.14.4 fixes https://www.samba.org/samba/security/CVE-2021-20254.html --- ...l-Standardize-use-of-st_-acm-time-ns.patch | 569 ------------------ pkgs/servers/samba/4.x.nix | 6 +- 2 files changed, 2 insertions(+), 573 deletions(-) delete mode 100644 pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch diff --git a/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch b/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch deleted file mode 100644 index 6de704cba285..000000000000 --- a/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch +++ /dev/null @@ -1,569 +0,0 @@ -From 55a5b9c8254126d0acef8702526c92a31200a07c Mon Sep 17 00:00:00 2001 -From: Matthew DeVore -Date: Tue, 4 Aug 2020 17:49:42 -0700 -Subject: [PATCH] lib/util: Standardize use of st_[acm]time ns - -Commit 810397f89a10, and possibly others, broke the build for macOS and -other environments which don't have st_[acm]tim fields on 'struct stat'. - -Multiple places in the codebase used the config.h values to determine -how to access the nanosecond or microsecond values of the stat -timestamps, so rather than add more, centralize them all into -lib/util/time.c. - -Also allow pvfs_fileinfo.c to read nanosecond-granularity timestamps on -platforms where it didn't before, since its #if branches were not -complete. - -Signed-off-by: Matthew DeVore -Reviewed-by: Jeremy Allison -Reviewed-by: Volker Lendecke - -Autobuild-User(master): Volker Lendecke -Autobuild-Date(master): Sat Aug 15 08:51:09 UTC 2020 on sn-devel-184 ---- - lib/replace/wscript | 2 - - lib/util/time.c | 230 ++++++++++++++++++++ - lib/util/time.h | 18 ++ - source3/lib/system.c | 121 +--------- - source3/libsmb/libsmb_stat.c | 24 +- - source4/ntvfs/posix/pvfs_fileinfo.c | 11 +- - source4/torture/libsmbclient/libsmbclient.c | 7 +- - 7 files changed, 277 insertions(+), 136 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 64f305d6df0..85bc11d2f01 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -746,8 +746,6 @@ def configure(conf): - - conf.CHECK_CODE('mkdir("foo",0777)', define='HAVE_MKDIR_MODE', headers='sys/stat.h') - -- conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', define='HAVE_STAT_TV_NSEC', -- headers='sys/stat.h') - # we need the st_rdev test under two names - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_rdev', - define='HAVE_STRUCT_STAT_ST_RDEV', -diff --git a/lib/util/time.c b/lib/util/time.c -index 0fac5e2e397..b5c1d700b23 100644 ---- a/lib/util/time.c -+++ b/lib/util/time.c -@@ -26,6 +26,10 @@ - #include "byteorder.h" - #include "time_basic.h" - #include "lib/util/time.h" /* Avoid /usr/include/time.h */ -+#include -+#ifndef NO_CONFIG_H -+#include "config.h" -+#endif - - /** - * @file -@@ -1232,3 +1236,229 @@ struct timespec time_t_to_full_timespec(time_t t) - } - return (struct timespec){.tv_sec = t}; - } -+ -+#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) -+ -+/* Old system - no ns timestamp. */ -+time_t get_atimensec(const struct stat *st) -+{ -+ return 0; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return 0; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return 0; -+} -+ -+/* Set does nothing with no ns timestamp. */ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ return; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ return; -+} -+ -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ return; -+} -+ -+#elif HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC -+ -+time_t get_atimensec(const struct stat *st) -+{ -+ return st->st_atimespec.tv_nsec; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return st->st_mtimespec.tv_nsec; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return st->st_ctimespec.tv_nsec; -+} -+ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ st->st_atimespec.tv_nsec = ns; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ st->st_mtimespec.tv_nsec = ns; -+} -+ -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ st->st_ctimespec.tv_nsec = ns; -+} -+ -+#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC -+ -+time_t get_atimensec(const struct stat *st) -+{ -+ return st->st_atim.tv_nsec; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return st->st_mtim.tv_nsec; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return st->st_ctim.tv_nsec; -+} -+ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ st->st_atim.tv_nsec = ns; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ st->st_mtim.tv_nsec = ns; -+} -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ st->st_ctim.tv_nsec = ns; -+} -+ -+#elif HAVE_STRUCT_STAT_ST_MTIMENSEC -+ -+time_t get_atimensec(const struct stat *st) -+{ -+ return st->st_atimensec; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return st->st_mtimensec; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return st->st_ctimensec; -+} -+ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ st->st_atimensec = ns; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ st->st_mtimensec = ns; -+} -+ -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ st->st_ctimensec = ns; -+} -+ -+#elif HAVE_STRUCT_STAT_ST_MTIME_N -+ -+time_t get_atimensec(const struct stat *st) -+{ -+ return st->st_atime_n; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return st->st_mtime_n; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return st->st_ctime_n; -+} -+ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ st->st_atime_n = ns; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ st->st_mtime_n = ns; -+} -+ -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ st->st_ctime_n = ns; -+} -+ -+#elif HAVE_STRUCT_STAT_ST_UMTIME -+ -+/* Only usec timestamps available. Convert to/from nsec. */ -+ -+time_t get_atimensec(const struct stat *st) -+{ -+ return st->st_uatime * 1000; -+} -+ -+time_t get_mtimensec(const struct stat *st) -+{ -+ return st->st_umtime * 1000; -+} -+ -+time_t get_ctimensec(const struct stat *st) -+{ -+ return st->st_uctime * 1000; -+} -+ -+void set_atimensec(struct stat *st, time_t ns) -+{ -+ st->st_uatime = ns / 1000; -+} -+ -+void set_mtimensec(struct stat *st, time_t ns) -+{ -+ st->st_umtime = ns / 1000; -+} -+ -+void set_ctimensec(struct stat *st, time_t ns) -+{ -+ st->st_uctime = ns / 1000; -+} -+ -+#else -+#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT -+#endif -+ -+struct timespec get_atimespec(const struct stat *pst) -+{ -+ struct timespec ret; -+ -+ ret.tv_sec = pst->st_atime; -+ ret.tv_nsec = get_atimensec(pst); -+ return ret; -+} -+ -+struct timespec get_mtimespec(const struct stat *pst) -+{ -+ struct timespec ret; -+ -+ ret.tv_sec = pst->st_mtime; -+ ret.tv_nsec = get_mtimensec(pst); -+ return ret; -+} -+ -+struct timespec get_ctimespec(const struct stat *pst) -+{ -+ struct timespec ret; -+ -+ ret.tv_sec = pst->st_mtime; -+ ret.tv_nsec = get_ctimensec(pst); -+ return ret; -+} -diff --git a/lib/util/time.h b/lib/util/time.h -index 4a90b40d5ce..04945b5f25f 100644 ---- a/lib/util/time.h -+++ b/lib/util/time.h -@@ -375,4 +375,22 @@ time_t full_timespec_to_time_t(const struct timespec *ts); - time_t nt_time_to_full_time_t(NTTIME nt); - struct timespec time_t_to_full_timespec(time_t t); - -+/* -+ * Functions to get and set the number of nanoseconds for times in a stat field. -+ * If the stat has timestamp granularity less than nanosecond, then the set_* -+ * operations will be lossy. -+ */ -+struct stat; -+time_t get_atimensec(const struct stat *); -+time_t get_mtimensec(const struct stat *); -+time_t get_ctimensec(const struct stat *); -+void set_atimensec(struct stat *, time_t); -+void set_mtimensec(struct stat *, time_t); -+void set_ctimensec(struct stat *, time_t); -+ -+/* These are convenience wrappers for the above getters. */ -+struct timespec get_atimespec(const struct stat *); -+struct timespec get_mtimespec(const struct stat *); -+struct timespec get_ctimespec(const struct stat *); -+ - #endif /* _SAMBA_TIME_H_ */ -diff --git a/source3/lib/system.c b/source3/lib/system.c -index f1265e0c43f..7c8cd19d11f 100644 ---- a/source3/lib/system.c -+++ b/source3/lib/system.c -@@ -25,7 +25,8 @@ - #include "system/capability.h" - #include "system/passwd.h" - #include "system/filesys.h" --#include "../lib/util/setid.h" -+#include "lib/util/setid.h" -+#include "lib/util/time.h" - - #ifdef HAVE_SYS_SYSCTL_H - #include -@@ -122,124 +123,6 @@ int sys_fcntl_int(int fd, int cmd, int arg) - return ret; - } - --/**************************************************************************** -- Get/Set all the possible time fields from a stat struct as a timespec. --****************************************************************************/ -- --static struct timespec get_atimespec(const struct stat *pst) --{ --#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) -- struct timespec ret; -- -- /* Old system - no ns timestamp. */ -- ret.tv_sec = pst->st_atime; -- ret.tv_nsec = 0; -- return ret; --#else --#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_atim.tv_sec; -- ret.tv_nsec = pst->st_atim.tv_nsec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_atime; -- ret.tv_nsec = pst->st_atimensec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) -- struct timespec ret; -- ret.tv_sec = pst->st_atime; -- ret.tv_nsec = pst->st_atime_n; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) -- struct timespec ret; -- ret.tv_sec = pst->st_atime; -- ret.tv_nsec = pst->st_uatime * 1000; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) -- return pst->st_atimespec; --#else --#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT --#endif --#endif --} -- --static struct timespec get_mtimespec(const struct stat *pst) --{ --#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) -- struct timespec ret; -- -- /* Old system - no ns timestamp. */ -- ret.tv_sec = pst->st_mtime; -- ret.tv_nsec = 0; -- return ret; --#else --#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_mtim.tv_sec; -- ret.tv_nsec = pst->st_mtim.tv_nsec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_mtime; -- ret.tv_nsec = pst->st_mtimensec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) -- struct timespec ret; -- ret.tv_sec = pst->st_mtime; -- ret.tv_nsec = pst->st_mtime_n; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) -- struct timespec ret; -- ret.tv_sec = pst->st_mtime; -- ret.tv_nsec = pst->st_umtime * 1000; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) -- return pst->st_mtimespec; --#else --#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT --#endif --#endif --} -- --static struct timespec get_ctimespec(const struct stat *pst) --{ --#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) -- struct timespec ret; -- -- /* Old system - no ns timestamp. */ -- ret.tv_sec = pst->st_ctime; -- ret.tv_nsec = 0; -- return ret; --#else --#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_ctim.tv_sec; -- ret.tv_nsec = pst->st_ctim.tv_nsec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) -- struct timespec ret; -- ret.tv_sec = pst->st_ctime; -- ret.tv_nsec = pst->st_ctimensec; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) -- struct timespec ret; -- ret.tv_sec = pst->st_ctime; -- ret.tv_nsec = pst->st_ctime_n; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) -- struct timespec ret; -- ret.tv_sec = pst->st_ctime; -- ret.tv_nsec = pst->st_uctime * 1000; -- return ret; --#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) -- return pst->st_ctimespec; --#else --#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT --#endif --#endif --} -- - /**************************************************************************** - Return the best approximation to a 'create time' under UNIX from a stat - structure. -diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c -index 790934bd565..b01aeb51ac1 100644 ---- a/source3/libsmb/libsmb_stat.c -+++ b/source3/libsmb/libsmb_stat.c -@@ -27,6 +27,7 @@ - #include "libsmbclient.h" - #include "libsmb_internal.h" - #include "../libcli/smb/smbXcli_base.h" -+#include "lib/util/time.h" - - /* - * Generate an inode number from file name for those things that need it -@@ -102,18 +103,29 @@ void setup_stat(struct stat *st, - } - - st->st_dev = dev; -- st->st_atim = access_time_ts; -- st->st_ctim = change_time_ts; -- st->st_mtim = write_time_ts; -+ -+ st->st_atime = access_time_ts.tv_sec; -+ set_atimensec(st, access_time_ts.tv_nsec); -+ -+ st->st_ctime = change_time_ts.tv_sec; -+ set_ctimensec(st, change_time_ts.tv_nsec); -+ -+ st->st_mtime = write_time_ts.tv_sec; -+ set_mtimensec(st, write_time_ts.tv_nsec); - } - - void setup_stat_from_stat_ex(const struct stat_ex *stex, - const char *fname, - struct stat *st) - { -- st->st_atim = stex->st_ex_atime; -- st->st_ctim = stex->st_ex_ctime; -- st->st_mtim = stex->st_ex_mtime; -+ st->st_atime = stex->st_ex_atime.tv_sec; -+ set_atimensec(st, stex->st_ex_atime.tv_nsec); -+ -+ st->st_ctime = stex->st_ex_ctime.tv_sec; -+ set_ctimensec(st, stex->st_ex_ctime.tv_nsec); -+ -+ st->st_mtime = stex->st_ex_mtime.tv_sec; -+ set_mtimensec(st, stex->st_ex_mtime.tv_nsec); - - st->st_mode = stex->st_ex_mode; - st->st_size = stex->st_ex_size; -diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c -index d2e2aeea265..977ea4fa3d5 100644 ---- a/source4/ntvfs/posix/pvfs_fileinfo.c -+++ b/source4/ntvfs/posix/pvfs_fileinfo.c -@@ -21,6 +21,7 @@ - - #include "includes.h" - #include "vfs_posix.h" -+#include "lib/util/time.h" - - /**************************************************************************** - Change a unix mode to a dos mode. -@@ -72,12 +73,10 @@ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name, - unix_to_nt_time(&name->dos.access_time, name->st.st_atime); - unix_to_nt_time(&name->dos.write_time, name->st.st_mtime); - unix_to_nt_time(&name->dos.change_time, name->st.st_ctime); --#ifdef HAVE_STAT_TV_NSEC -- name->dos.create_time += name->st.st_ctim.tv_nsec / 100; -- name->dos.access_time += name->st.st_atim.tv_nsec / 100; -- name->dos.write_time += name->st.st_mtim.tv_nsec / 100; -- name->dos.change_time += name->st.st_ctim.tv_nsec / 100; --#endif -+ name->dos.create_time += get_ctimensec(&name->st) / 100; -+ name->dos.access_time += get_atimensec(&name->st) / 100; -+ name->dos.write_time += get_mtimensec(&name->st) / 100; -+ name->dos.change_time += get_ctimensec(&name->st) / 100; - name->dos.attrib = dos_mode_from_stat(pvfs, &name->st); - name->dos.alloc_size = pvfs_round_alloc_size(pvfs, name->st.st_size); - name->dos.nlink = name->st.st_nlink; -diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c -index 3f3992593f9..4fbd759487b 100644 ---- a/source4/torture/libsmbclient/libsmbclient.c -+++ b/source4/torture/libsmbclient/libsmbclient.c -@@ -27,6 +27,7 @@ - #include "lib/param/loadparm.h" - #include "lib/param/param_global.h" - #include "dynconfig.h" -+#include "lib/util/time.h" - - /* test string to compare with when debug_callback is called */ - #define TEST_STRING "smbc_setLogCallback test" -@@ -1231,8 +1232,8 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx) - ret = smbc_fstat(fhandle, &st); - torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed"); - -- tbuf[0] = convert_timespec_to_timeval(st.st_atim); -- tbuf[1] = convert_timespec_to_timeval(st.st_mtim); -+ tbuf[0] = convert_timespec_to_timeval(get_atimespec(&st)); -+ tbuf[1] = convert_timespec_to_timeval(get_mtimespec(&st)); - - tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */ - -@@ -1244,7 +1245,7 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx) - - torture_assert_int_equal( - tctx, -- st.st_mtim.tv_nsec / 1000, -+ get_mtimensec(&st) / 1000, - tbuf[1].tv_usec, - "smbc_utimes did not update msec"); - --- -2.29.2 - diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c540fb20d448..7beaeb20943d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -44,11 +44,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.13.7"; + version = "4.14.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1ajvr5hzl9kmrf77hb9c71zvnm8j0xgy40nqfjz4f407cw470zaf"; + sha256 = "1fc9ix91hb1f35j69sk7rsi9pky2p0vsmw47s973bx801cm0kbw9"; }; outputs = [ "out" "dev" "man" ]; @@ -58,8 +58,6 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch - # Backport, should be removed for version 4.14 - ./0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch ]; nativeBuildInputs = [ From fe8fe5edaa3620215dfac2ef8152f0d46c812c33 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Fri, 28 May 2021 11:22:47 -0500 Subject: [PATCH 369/664] dwm: restored config patch interface --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f41901f7a1..cd6d3879d3f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23150,7 +23150,11 @@ in dwl = callPackage ../applications/window-managers/dwl { }; - dwm = callPackage ../applications/window-managers/dwm { }; + dwm = callPackage ../applications/window-managers/dwm { + # dwm is configured entirely through source modification. Allow users to + # specify patches through nixpkgs.config.dwm.patches + patches = config.dwm.patches or []; + }; dwmblocks = callPackage ../applications/misc/dwmblocks { }; From 4d90a6bcc4ff4b19cd35d45fbda29b5259ec4cc6 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Fri, 28 May 2021 13:06:29 -0500 Subject: [PATCH 370/664] dwm: added neonfuz as maintainer --- pkgs/applications/window-managers/dwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 2c3ed2e47e88..088581b67013 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { tags. ''; license = licenses.mit; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric neonfuz ]; platforms = platforms.all; }; } From cff04883e8c21fe614dad85a96b3da93909eb8c8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 29 May 2021 03:30:51 -0400 Subject: [PATCH 371/664] arrow-cpp: 4.0.0 -> 4.0.1 --- pkgs/development/libraries/arrow-cpp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ac53ae3bbd44..a13ebf281934 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -22,12 +22,12 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa"; + sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -146,11 +146,11 @@ in stdenv.mkDerivation rec { --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' ''; - meta = { + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ tobim veprbl ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim veprbl ]; }; } From a821e14e5e8b2b4a71ce2ea4d8d48c7a1455f944 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 02:27:31 -0700 Subject: [PATCH 372/664] buildkite-agent: 3.29.0 -> 3.30.0 (#124837) --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 0b6c97924410..a8d35a44bb96 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.29.0"; + version = "3.30.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-76yyqZi+ktcwRXo0ZIcdFJ9YCuHm9Te4AI+4meuhMNA="; + sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk="; }; - vendorSha256 = "sha256-6cejbCbr0Rn4jWFJ0fxG4v0L0xUM8k16cbACmcQ6m4o="; + vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From e88d1aedfa43d6b7026048ef1510540aef45ca58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 12:02:54 +0200 Subject: [PATCH 373/664] python3Packages.evohome-async: 0.3.8 -> 0.3.15 --- pkgs/development/python-modules/evohome-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 0f38faf57340..908d68dd27e9 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.3.8"; + version = "0.3.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zxdavb"; repo = pname; rev = version; - sha256 = "04xy72k79cnb8pc19v5jzkc0djazfm6pbm10ysphx06ndwvxr9mn"; + sha256 = "sha256-/dZRlcTcea26FEpw/XDItKh4ncr/eEFQcdfIE2KIMo8="; }; propagatedBuildInputs = [ From 6933d068c5d2fcff398e802f7c4e271bbdab6705 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 03:34:57 +0000 Subject: [PATCH 374/664] elixir: 1.12.0 -> 1.12.1 --- pkgs/development/interpreters/elixir/1.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix index f84f4255ccac..cd5246d989d1 100644 --- a/pkgs/development/interpreters/elixir/1.12.nix +++ b/pkgs/development/interpreters/elixir/1.12.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.12.0"; - sha256 = "sha256-Jnxi0vFYMnwEgTqkPncZbj+cR57hjvH77RCseJdUoFs="; + version = "1.12.1"; + sha256 = "sha256-gRgGXb4btMriQwT/pRIYOJt+NM7rtYBd+A3SKfowC7k="; minimumOTPVersion = "22"; } From 52c24e9fbef11818445bd7bb460e04e8c0120732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 May 2021 12:50:43 +0200 Subject: [PATCH 375/664] pika-backup: 0.3.1 -> 0.3.2 https://gitlab.gnome.org/World/pika-backup/-/tags/v0.3.2 --- pkgs/applications/backup/pika-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 63f197dd9c84..fd6c0f0cf835 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "0cr3axfp15nzwmsqyz6j781qhr2gsn9p69m0jfzy89pl83d6vcz0"; + sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1z0cbrkhxyzwf7vjjsvdppb7zhflpkw4m5cy90a2315nbll3hpbp"; + sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y"; }; patches = [ From 17f9a15b50c43fdc7daded82c2a87aa0013ce0bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 11:27:57 +0000 Subject: [PATCH 376/664] eternal-terminal: 6.1.7 -> 6.1.8 --- pkgs/tools/networking/eternal-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 01dbc32eb8df..21bd75a3ebae 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.1.7"; + version = "6.1.8"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q"; + sha256 = "sha256-VSJ6AoVBvlCdKSirSDqsemixF+kAnvPgBQlyJxjoPcs="; }; cmakeFlags= [ From 7a4e53ed2c67ea1d379b5b9326581d86b6e0e9c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 11:34:39 +0000 Subject: [PATCH 377/664] eksctl: 0.51.0 -> 0.52.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 8c068d072e22..d3ebba0ab432 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-OTgcQLYtUAf7EeaEafzfPG02SGjVvSAVvVGI4A/S0Zs="; + sha256 = "sha256-P8v8XliY8XbfdiqSUTUhI4HYBKzAk/LHVSF0OLS8Vag="; }; - vendorSha256 = "sha256-RkUr4ytoFa6/luaxDLj0FiF3cs9fJav0JHcZCN46Mqs="; + vendorSha256 = "sha256-4aZVQjcrZ6NKXr0ZFMWEcf6jMtp6TlRlinZ6ZZvLDyE="; doCheck = false; From 626280bf74ae35094e3e86702b009f2e57050b1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 14:31:35 +0200 Subject: [PATCH 378/664] python3Packages.garages-amsterdam: init at 2.1.0 --- .../garages-amsterdam/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/garages-amsterdam/default.nix diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix new file mode 100644 index 000000000000..eeb68b9bbbd0 --- /dev/null +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aiohttp +}: + +buildPythonPackage rec { + pname = "garages-amsterdam"; + version = "2.1.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "garages_amsterdam"; + rev = version; + sha256 = "1lg66g0im6v0m294j82229n2b7bhs6kkrp0d9nh87k2rz7zgllil"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # The only test requires network access + doCheck = false; + + pythonImportsCheck = [ "garages_amsterdam" ]; + + meta = with lib; { + description = "Python client for getting garage occupancy in Amsterdam"; + homepage = "https://github.com/klaasnicolaas/garages_amsterdam"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4f..95e140564867 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2624,6 +2624,8 @@ in { gast = callPackage ../development/python-modules/gast { }; + garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; From d37dd6c3014c5b6364088841355581bf7e20b5ac Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 27 May 2021 16:58:06 +0200 Subject: [PATCH 379/664] wine{Unstable,Staging}: 6.7 -> 6.8 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index fa9e88db6481..565de7ec52e0 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.7"; + version = "6.8"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ="; + sha256 = "sha256-W0It3mfYQShxFSzjFYde+0lFB604oPTXEPE5OKdp69g="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M="; + sha256 = "sha256-cuJaODJ1jDxlUG9QTIQjg4IQqK5rOZGjgdpzjd4XAHc="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 4c471a73a05ecad80998a91697be89b7ab1db118 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 13:36:07 +0000 Subject: [PATCH 380/664] fend: 0.1.14 -> 0.1.16 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 683556fec6c9..ceaee9746af9 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.14"; + version = "0.1.16"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg="; + sha256 = "sha256-ITS2wE4vwp0W/nlTyX55cY5E95VIwR46JBzF0pD/xsE="; }; - cargoSha256 = "sha256-rCJn1dDSwKMmwF7m7n+Lf/7+sLd964r8EU7/VdeD9rI="; + cargoSha256 = "sha256-YqOc/B+ZP1i9xJLrOguQ6fwQr6SV0qvQ3fWwguY2S0I="; doInstallCheck = true; From d5a1bb6ade9cc0efb289c2f6dba52a5ab9e37404 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Sat, 29 May 2021 08:36:15 -0500 Subject: [PATCH 381/664] maintainers: add devins2518 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2bc591e16e5..3ee0d9b1ab13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2415,6 +2415,12 @@ githubId = 896182; name = "devhell"; }; + devins2518 = { + email = "drsingh2518@icloud.com"; + github = "devins2518"; + githubId = 17111639; + name = "Devin Singh"; + }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; From f7589d53140cdc2076d9720bf62b8d87dbebefb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 16:29:24 +0200 Subject: [PATCH 382/664] python3Packages.watchdog: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/watchdog/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 9d96977088b5..441630fe6f66 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -5,17 +5,18 @@ , argh , pathtools , pyyaml +, pytest-timeout , pytestCheckHook , CoreServices }: buildPythonPackage rec { pname = "watchdog"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KJREC06pWm70xdFS3u2+JwyuRgkmgnELcCigTWppgPY="; + sha256 = "sha256-AjfbTZAkhZvqJ9DvtZ/nXu8pCDP9mIuOrXqHmwMIwts="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-timeout pytestCheckHook ]; From c73371e04b97493a34ac24ca09abc6a726d07697 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 29 May 2021 16:36:39 +0200 Subject: [PATCH 383/664] neovim: fix neovim.override (#124785) * neovim: temporary revert to unbreak user configs Newly introduced "plugins" parameter is disabled until we get a better testing infrastructure to minimize breaking changes. --- pkgs/applications/editors/neovim/utils.nix | 17 +++-------------- pkgs/test/vim/default.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index a7d8f00c664f..ae814fa9b4eb 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -54,15 +54,7 @@ let configurePatched = configure // { - packages.nix = { - start = lib.filter (f: f != null) - (map (x: if x.optional == false then x.plugin else null) - pluginsNormalized); - opt = lib.filter (f: f != null) - (map (x: if x.optional == true then x.plugin else null) - pluginsNormalized); - }; - customRC = pluginRc + customRC; + customRC = pluginRc + customRC + (configure.customRC or ""); }; # A function to get the configuration string (if any) from an element of 'plugins' @@ -173,11 +165,8 @@ let assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; wrapNeovimUnstable neovim (res // { - wrapperArgs = lib.escapeShellArgs ( - res.wrapperArgs ++ lib.optionals (configure != {}) [ - "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" - ]) + " " + extraMakeWrapperArgs - ; + wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs; + wrapRc = (configure != {}); }); in { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c75836aa9a80..c809940fc4c7 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -36,6 +36,15 @@ in ################## nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_via_override = neovim.override { + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { From e814269bd2334b7519e37468adac2ef0fab5e00b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 27 May 2021 20:04:31 +0200 Subject: [PATCH 384/664] yabridge: Fix compatibility with wine 6.8+ --- pkgs/tools/audio/yabridge/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 048cac40972d..0013fac23a04 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , meson , ninja @@ -79,6 +80,13 @@ in stdenv.mkDerivation rec { )''; patches = [ + # Fix for wine 6.8+ (remove patch in next release): + (fetchpatch { + url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch"; + sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ="; + excludes = [ "CHANGELOG.md" ]; + }) + # Hard code wine path so wine version is correct in logs (substituteAll { src = ./hardcode-wine.patch; From 0cd06e8b091627dfe2921e3d8a1f26d30d135b7b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 27 May 2021 17:05:03 +0200 Subject: [PATCH 385/664] wine{Unstable,Staging}: 6.8 -> 6.9 --- pkgs/misc/emulators/wine/sources.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 565de7ec52e0..6103472a7cc1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.8"; + version = "6.9"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-W0It3mfYQShxFSzjFYde+0lFB604oPTXEPE5OKdp69g="; + sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,13 +65,17 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-cuJaODJ1jDxlUG9QTIQjg4IQqK5rOZGjgdpzjd4XAHc="; + sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; + # FIXME: replace with line above with 6.10 release + # Fix https://bugs.winehq.org/show_bug.cgi?id=51172 + rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7"; - # Just keep list empty, if current release haven't broken patchsets - disabledPatchsets = [ ]; + # Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies + # see FIXME above + disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ]; }; winetricks = fetchFromGitHub rec { From a8fb730e04cd7a256ea1e1c3d1d9f21258bddb89 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 30 May 2021 01:00:14 +0800 Subject: [PATCH 386/664] stevenblack-blocklist: init at 3.7.6 --- .../stevenblack-blocklist/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/stevenblack-blocklist/default.nix diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix new file mode 100644 index 000000000000..f3f375818849 --- /dev/null +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchFromGitHub }: + +let + version = "3.7.6"; +in +fetchFromGitHub { + name = "stevenblack-blocklist-${version}"; + + owner = "StevenBlack"; + repo = "hosts"; + rev = version; + sha256 = "sha256-zjUdHzsjv16PHXfxTuVC6aNKfh+73dH1AABvq1MArXI="; + + meta = with lib; { + description = "Unified hosts file with base extensions"; + homepage = "https://github.com/StevenBlack/hosts"; + license = licenses.mit; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..7703ec5c241b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8827,6 +8827,8 @@ in staticjinja = with python3.pkgs; toPythonApplication staticjinja; + stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; + stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; From ff58fe96fdef6caf8100bd6a081fe79640b715c6 Mon Sep 17 00:00:00 2001 From: Rafael Varago Date: Fri, 28 May 2021 19:15:58 +0200 Subject: [PATCH 387/664] maintainers: add rvarago --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2bc591e16e5..790761c41a1e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8795,6 +8795,12 @@ githubId = 506953; name = "Ruud van Asseldonk"; }; + rvarago = { + email = "rafael.varago@gmail.com"; + github = "rvarago"; + githubId = 7365864; + name = "Rafael Varago"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; From 60f59884e94432fe18e6ac4e2d2dc1a4ca3ec8df Mon Sep 17 00:00:00 2001 From: Rafael Varago Date: Fri, 28 May 2021 19:16:53 +0200 Subject: [PATCH 388/664] cargo-bitbake: init at 0.3.15 This extensions generates BitBake recipes to build Cargo based project for Yocto. Co-authored-by: Fabian Affolter Co-authored-by: Sandro --- .../tools/rust/cargo-bitbake/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-bitbake/default.nix diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/development/tools/rust/cargo-bitbake/default.nix new file mode 100644 index 000000000000..ee29976eb985 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bitbake/default.nix @@ -0,0 +1,26 @@ +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bitbake"; + version = "0.3.15"; + + src = fetchFromGitHub { + owner = "meta-rust"; + repo = pname; + rev = "v${version}"; + sha256 = "1ffjkwaqvmyz374azrv6gna19z2fcg82is2k2n2gm50isbxw2aa5"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoSha256 = "0mm6059wjh5p8923dwz55dpwi55gq2bcmpx7kn40pq5ppkiqjiw9"; + + meta = with lib; { + description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; + homepage = "https://github.com/meta-rust/cargo-bitbake"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ rvarago ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..22b38df0fa64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11690,6 +11690,7 @@ in cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From 678920b13bed59e76efbc4d8fac34451c86b6c7b Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 19 May 2021 02:00:36 +0900 Subject: [PATCH 389/664] release.nix: add aarch64-darwin as a supportedSystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cbaf2ee7a0420727ab79ce1adfcccab35e87b479) Signed-off-by: Domen Kožar --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0b18dd1ecf26..34f74117729c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -11,7 +11,7 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } , officialRelease ? false # The platforms for which we build Nixpkgs. -, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true From af44c17b5db241c547536ce16341c84dc247c035 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 29 May 2021 21:20:19 +0200 Subject: [PATCH 390/664] welle-io: 2.2 -> 2.3 --- pkgs/applications/radio/welle-io/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 97bf84a2bf39..cfd339c2d1ea 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,20 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects -, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: -let - - version = "2.2"; - -in mkDerivation { +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 +} : +mkDerivation rec { pname = "welle-io"; - inherit version; + version = "2.3"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; + sha256 = "1xl1lanw0xgmgks67dbfb2h52jxnrd1i2zik56v0q8dwsr7f0daw"; }; nativeBuildInputs = [ cmake pkg-config ]; From 0853275727138c6bb9ade80aa8d2e0f298044f47 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 29 May 2021 21:31:32 +0200 Subject: [PATCH 391/664] mpich: 3.4.1 -> 3.4.2 --- pkgs/development/libraries/mpich/default.nix | 22 +------ .../libraries/mpich/jsonc-test.patch | 62 ------------------- 2 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 pkgs/development/libraries/mpich/jsonc-test.patch diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index d2cbee14c3a0..9227cd705430 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, perl, gfortran -, openssh, hwloc, autoconf, automake, libtool +, openssh, hwloc # either libfabric or ucx work for ch4backend on linux. On darwin, neither of # these libraries currently build so this argument is ignored on Darwin. , ch4backend @@ -11,29 +11,13 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "09wpfw9lsrc84vcmfw94razd4xv4znx4mmg7rqmljvgg0jc96dl8"; + sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw"; }; - patches = [ - # Reverts an upstream change that causes json-c test to fail - ./jsonc-test.patch - ]; - - # Required for the json-c patch - nativeBuildInputs = [ autoconf automake libtool ]; - - # Update configure after patch - postPatch = '' - cd modules/json-c - ./autogen.sh - cd ../.. - ''; - - configureFlags = [ "--enable-shared" "--enable-sharedlib" diff --git a/pkgs/development/libraries/mpich/jsonc-test.patch b/pkgs/development/libraries/mpich/jsonc-test.patch deleted file mode 100644 index 2f8d87b409b4..000000000000 --- a/pkgs/development/libraries/mpich/jsonc-test.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- b/modules/json-c/configure.ac -+++ a/modules/json-c/configure.ac -@@ -75,7 +75,7 @@ - AC_FUNC_VPRINTF - AC_FUNC_MEMCMP - AC_CHECK_FUNCS([realloc]) -+AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open strncasecmp setlocale) --AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf open strncasecmp setlocale) - AC_CHECK_DECLS([INFINITY], [], [], [[#include ]]) - AC_CHECK_DECLS([nan], [], [], [[#include ]]) - AC_CHECK_DECLS([isnan], [], [], [[#include ]]) ---- b/modules/json-c/json_pointer.c -+++ a/modules/json-c/json_pointer.c -@@ -208,7 +208,7 @@ - } - - va_start(args, path_fmt); -+ rc = vasprintf(&path_copy, path_fmt, args); -- rc = json_vasprintf(&path_copy, path_fmt, args); - va_end(args); - - if (rc < 0) -@@ -287,7 +287,7 @@ - - /* pass a working copy to the recursive call */ - va_start(args, path_fmt); -+ rc = vasprintf(&path_copy, path_fmt, args); -- rc = json_vasprintf(&path_copy, path_fmt, args); - va_end(args); - - if (rc < 0) ---- b/modules/json-c/printbuf.c -+++ a/modules/json-c/printbuf.c -@@ -129,7 +129,7 @@ - would have been written - this code handles both cases. */ - if(size == -1 || size > 127) { - va_start(ap, msg); -+ if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } -- if((size = json_vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } - va_end(ap); - printbuf_memappend(p, t, size); - free(t); ---- b/modules/json-c/vasprintf_compat.h -+++ a/modules/json-c/vasprintf_compat.h -@@ -8,8 +8,9 @@ - - #include "snprintf_compat.h" - -+#if !defined(HAVE_VASPRINTF) - /* CAW: compliant version of vasprintf */ -+static int vasprintf(char **buf, const char *fmt, va_list ap) --static int json_vasprintf(char **buf, const char *fmt, va_list ap) - { - #ifndef WIN32 - static char _T_emptybuffer = '\0'; -@@ -40,5 +41,6 @@ - - return chars; - } -+#endif /* !HAVE_VASPRINTF */ - - #endif /* __vasprintf_compat_h */ From 5a8cd34dba52fc35d25e24f41a17069e2254e609 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 29 May 2021 22:48:50 +0200 Subject: [PATCH 392/664] gotty: 2.0.0-alpha.3 -> 1.2.0 new upstream, versioning scheme changed back to v 1.x --- pkgs/servers/gotty/default.nix | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 7bd09569248f..58335c79fe95 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "gotty"; - version = "2.0.0-alpha.3"; - rev = "v${version}"; - - goPackagePath = "github.com/yudai/gotty"; + version = "1.2.0"; src = fetchFromGitHub { - inherit rev; - owner = "yudai"; + owner = "sorenisanerd"; repo = "gotty"; - sha256 = "1vhhs7d4k1vpkf2k69ai2r3bp3zwnwa8l9q7vza0rck69g4nmz7a"; + rev = "v${version}"; + sha256 = "06ngxnblwkmiln9bxikg9q2wdlh45481pnz87bpsw2r7hc69bv9n"; }; + vendorSha256 = "0mzf5209r3fzqf9q98j3b2cdzvfa3kg62xn0spx5zr6nabmhaa79"; + + # upstream did not update the tests, so they are broken now + # https://github.com/sorenisanerd/gotty/issues/13 + doCheck = false; + meta = with lib; { description = "Share your terminal as a web application"; - homepage = "https://github.com/yudai/gotty"; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/sorenisanerd/gotty"; + maintainers = with maintainers; [ prusnak ]; license = licenses.mit; }; } From 966188ff80f5c4b808f0144c3effd64c5db5b593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 May 2021 23:13:52 +0200 Subject: [PATCH 393/664] openvpn-auth-ldap: 2.0.3+deb6.1 -> 2.0.4 --- .../networking/openvpn/openvpn-auth-ldap.nix | 63 +++++++------------ 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index bb06479be30e..70dacddafc37 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -1,65 +1,50 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, - autoreconfHook, re2c, openldap, openvpn, gnustep, check +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gnustep +, re2c +, openldap +, openssl +, openvpn }: -let - srcName = "openvpn-auth-ldap"; - srcVersion = "2.0.3"; - debianRev = "6.1"; - - fetchPatchFromDebian = - {patch, sha256}: - fetchpatch { - inherit sha256; - url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; - }; -in - stdenv.mkDerivation rec { - name = "${srcName}-${version}"; - version = "${srcVersion}+deb${debianRev}"; + pname = "openvpn-auth-ldap"; + version = "2.0.4"; src = fetchFromGitHub { owner = "threerings"; - repo = srcName; - rev = "auth-ldap-${srcVersion}"; - sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; + repo = "openvpn-auth-ldap"; + rev = "auth-ldap-${version}"; + sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; }; - patches = map fetchPatchFromDebian [ - {patch = "STARTTLS_before_auth.patch"; - sha256 = "02kky73mgx9jf16lpabppl271zyjn4a1160k8b6a0fax5ic8gbwk";} - {patch = "gobjc_4.7_runtime.patch"; - sha256 = "0ljmdn70g5xp4kjcv59wg2wnqaifjdfdv1wlj356d10a7fzvxc76";} - {patch = "openvpn_ldap_simpler_add_handler_4"; - sha256 = "0nha9mazp3dywbs1ywj8xi4ahzsjsasyrcic87v8c0x2nwl9kaa0";} - {patch = "auth-ldap-gnustep.patch"; - sha256 = "053jni1s3pacpi2s43dkmk95j79ifh8rybjly13yy2dqffbasr31";} - ]; - nativeBuildInputs = [ autoreconfHook - ]; - - buildInputs = [ - check gnustep.base gnustep.libobjc gnustep.make - openldap - openvpn re2c ]; + buildInputs = [ + openldap + openssl + openvpn + ]; + configureFlags = [ - "--with-objc-runtime=modern" + "--with-objc-runtime=GNU" "--with-openvpn=${openvpn}/include" "--libdir=$(out)/lib/openvpn" ]; + doCheck = true; + preInstall = '' mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples - cp README $out/share/doc/openvpn/ + cp README.md $out/share/doc/openvpn/ cp auth-ldap.conf $out/share/doc/openvpn/examples/ ''; From f35c86dc1d00187129937bbc28f88cee42aa8991 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:29:10 +0200 Subject: [PATCH 394/664] python3Packages.pyrituals: 0.0.2 -> 0.0.3 --- pkgs/development/python-modules/pyrituals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix index 84bf62ff6d3b..f9f556dba52b 100644 --- a/pkgs/development/python-modules/pyrituals/default.nix +++ b/pkgs/development/python-modules/pyrituals/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyrituals"; - version = "0.0.2"; + version = "0.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = version; - sha256 = "0hrwhk3kpvdg78fgnvhmnnh3wprdv10j8jqjm4ly64chr8cdi6f2"; + sha256 = "sha256-oAxQRGP6GxiidnGshSJZEh2RD3XsZ/7kFGwcqaYaBnM="; }; propagatedBuildInputs = [ aiohttp ]; From 793a73a7684b0931934c70fe3deca720be19ed03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 11:15:24 +0200 Subject: [PATCH 395/664] python3Packages.smhi-pkg: 1.0.14 -> 1.0.15 --- pkgs/development/python-modules/smhi-pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index 3308697cf549..f6693da46be7 100644 --- a/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "smhi-pkg"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { owner = "joysoftware"; repo = "pypi_smhi"; rev = version; - sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3"; + sha256 = "sha256-tBNmfn2hBkS36B9zKDP+TgqeumbgzBVDiJ5L54RaSc8="; }; propagatedBuildInputs = [ From 6ee94fc354cb75fe55b7ee6b7cf0ad6d95568264 Mon Sep 17 00:00:00 2001 From: Karl Meakin Date: Thu, 27 May 2021 01:02:02 +0100 Subject: [PATCH 396/664] runelite: 2.0.0 -> 2.1.5 --- pkgs/games/runelite/default.nix | 41 ++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index e9e77e275dc7..9a2ce6314cd1 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: +{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }: stdenv.mkDerivation rec { pname = "runelite"; - version = "2.0.0"; + version = "2.1.5"; - src = fetchurl { + jar = fetchurl { url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - sha256 = "0q0x8g43ggkvp5fgnymgygx59xfhnyyrhpi6ha333gqg97rr0rvw"; + sha256 = "4BX188QIjIFTxng2ktqlKn7AqQ9tdBcKWmgOj/5yd10="; }; icon = fetchurl { @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1"; }; + # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually + jogl = fetchurl { + url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; + sha256 = "S60qxyWY9RfyhLFygn/OxZFWnc8qVRtTFdWMbdu+2U0="; + }; + gluegen = fetchurl { + url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20200429/gluegen-rt-2.4.0-rc-20200429-natives-linux-amd64.jar"; + sha256 = "eF8S5sQkJFDtW8rcVBKIyeyKm5Ze5rXK5r/yosZcHjU="; + }; + dontUnpack = true; + desktop = makeDesktopItem { name = "RuneLite"; type = "Application"; @@ -24,23 +35,25 @@ stdenv.mkDerivation rec { desktopName = "RuneLite"; genericName = "Oldschool Runescape"; categories = "Game"; - startupNotify = null; }; - nativeBuildInputs = [ makeWrapper ]; - - # colon is bash form of no-op (do nothing) - dontUnpack = true; - + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out/share/runelite mkdir -p $out/share/applications + mkdir -p $out/natives - ln -s ${src} $out/share/runelite/RuneLite.jar - ln -s ${desktop}/share/applications/* $out/share/applications + unzip ${jogl} 'natives/*' -d $out + unzip ${gluegen} 'natives/*' -d $out + ln -s ${jar} $out/share/runelite/RuneLite.jar + ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop + + # RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place makeWrapper ${jre}/bin/java $out/bin/runelite \ - --add-flags "-jar $out/share/runelite/RuneLite.jar" + --run "cd $out" \ + --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ + --add-flags "-jar $out/share/runelite/RuneLite.jar" ''; meta = with lib; { @@ -48,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://runelite.net/"; license = licenses.bsd2; maintainers = with maintainers; [ kmeakin ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" ]; }; } From 99c80ee729b405c575acf4dfdd2033bb8f9b5568 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 20:17:57 +0200 Subject: [PATCH 397/664] python3Packages.flametree: enable tests --- .../python-modules/flametree/default.nix | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix index d4cba69afcb0..b4311eeb7cd6 100644 --- a/pkgs/development/python-modules/flametree/default.nix +++ b/pkgs/development/python-modules/flametree/default.nix @@ -1,25 +1,45 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fontconfig +, matplotlib +, pandas +, pytestCheckHook +, weasyprint }: buildPythonPackage rec { pname = "flametree"; version = "0.1.11"; - src = fetchPypi { - inherit pname version; - sha256 = "c8eb81dea8c7f8261a2aa03d2bac98b1d21ebceec9c67efaac423f7c1b4fe061"; + src = fetchFromGitHub { + owner = "Edinburgh-Genome-Foundry"; + repo = "Flametree"; + rev = "v${version}"; + sha256 = "1ynrk1ivl1vjiga0ayl8k89vs5il7i0pf9jz2ycn771c47szwk4x"; }; - # no tests in tarball - doCheck = false; + checkInputs = [ + matplotlib + pandas + pytestCheckHook + weasyprint + ]; + + preCheck = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + disabledTests = [ + # AssertionError, https://github.com/Edinburgh-Genome-Foundry/Flametree/issues/9 + "test_weasyprint" + ]; pythonImportsCheck = [ "flametree" ]; meta = with lib; { - homepage = "https://github.com/Edinburgh-Genome-Foundry/Flametree"; description = "Python file and zip operations made easy"; + homepage = "https://github.com/Edinburgh-Genome-Foundry/Flametree"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; From 9d75ca7054fa5eb7d372295cc79ad88567908a02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 23:42:58 +0200 Subject: [PATCH 398/664] python3Packages.pyialarm: 1.5 -> 1.7 --- pkgs/development/python-modules/pyialarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index 6a35445fca16..977fbcd323cf 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "1.5"; + version = "1.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "0vpscc2h13mmwscvjpm0bfd80x94mzh4d204v6n421mdz3ddhjqp"; + sha256 = "sha256-Gk5kWOqsPyq/0Vc+jdRRyj+ko3CpmqQ6/McvJYAGjLY="; }; propagatedBuildInputs = [ From b0b823be50efa168fa386e72e1380cf51412ae49 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 29 May 2021 19:36:33 -0400 Subject: [PATCH 399/664] newsflash: fix build --- .../networking/feedreaders/newsflash/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index ee85bd8024ea..f93b8ed50b75 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; }; + # https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5 + # obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo + # build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0 + # https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes + RUSTC_BOOTSTRAP = 1; + patches = [ # Post install tries to generate an icon cache & update the # desktop database. The gtk setup hook drop-icon-theme-cache.sh From 645446afa518ac7ef939bab4393d74d8bf24a7e2 Mon Sep 17 00:00:00 2001 From: xfnw Date: Sat, 29 May 2021 23:45:42 +0000 Subject: [PATCH 400/664] catgirl: 1.7 -> 1.8 --- pkgs/applications/networking/irc/catgirl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index afc308039de1..d2e8e93d8534 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-3shSdeq4l6Y5DEJZEVMHAngp6vjnkPjzpLpcp407X/0="; + sha256 = "0svpd2nqsr55ac98vczyhihs6pvgw7chspf6bdlwl98gch39dxif"; }; nativeBuildInputs = [ ctags pkg-config ]; From 364ae13471c3844500befc9d6dda9a38f98142c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 03:12:27 +0000 Subject: [PATCH 401/664] esbuild: 0.12.0 -> 0.12.1 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 5c32caad5b56..2dfb58013dd7 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-JRGRm6fiJ3VIzcwoQOvqiN15vhSYuxGdZrLAH8FiC7g="; + sha256 = "sha256-X+mWuGm6hpTofoZSpM9U2GmYlETMH7MuYwk4ahFSyVE="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From 166e67b4de27a25e56f8abb791e965bfed512496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 30 May 2021 03:27:29 +0200 Subject: [PATCH 402/664] twine: add top-level entry --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..55f2170a306b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -994,6 +994,8 @@ in tilix = callPackage ../applications/terminal-emulators/tilix { }; + twine = with python3Packages; toPythonApplication twine; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { From 6ab535aade04127f151570c43922f3472da2c2a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 12:37:44 +0000 Subject: [PATCH 403/664] dua: 2.11.3 -> 2.12.0 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index f69d13d04556..d53676f91d6f 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.11.3"; + version = "2.12.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-rwbeWjYhAgZhQDg1/Pux08Kw+7NQG7dJlhZnwlaEjJ4="; + sha256 = "sha256-YCpWi5+p+d9YG8YEKRbppcX5/IizI1FnUfcnaoCGZNM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-ta5mHTfSs72HUz3ezZhVvU61ECvyWY3Sba7/UoJGc8U="; + cargoSha256 = "sha256-WFxDY4K257QE/tH4B2c3qOzVG3t1RUh4lWRMzqyBC14="; doCheck = false; From e1d59ae8d4c839542607b76218bd9a66ce3f4e20 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 26 May 2021 23:53:52 +0800 Subject: [PATCH 404/664] Revert "podman: add systemd to LD_LIBRARY_PATH for journald log driver" This reverts commit b71086499de8644780bbe59dd31d1eb3d04f3c06. --- pkgs/applications/virtualization/podman/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index beaeb890a195..c8b8467def5c 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pkg-config , installShellFiles -, makeWrapper , buildGoModule , gpgme , lvm2 @@ -37,7 +36,7 @@ buildGoModule rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs @@ -70,8 +69,6 @@ buildGoModule rec { installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild '' + lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/podman \ - --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system '' + '' From ada45ac3aee664265759611d09443d549250bd70 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 26 May 2021 23:56:20 +0800 Subject: [PATCH 405/664] podman: add systemd to rpath --- pkgs/applications/virtualization/podman/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index c8b8467def5c..f392fd98c43b 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -75,6 +75,11 @@ buildGoModule rec { runHook postInstall ''; + postFixup = lib.optionalString stdenv.isLinux '' + RPATH=$(patchelf --print-rpath $out/bin/podman) + patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman + ''; + passthru.tests = { inherit (nixosTests) podman; }; meta = with lib; { From fd59022ee9eb8d08b65df563c65e4218a68fca3c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 May 2021 11:14:03 +1000 Subject: [PATCH 406/664] podman: install cni config --- pkgs/applications/virtualization/podman/default.nix | 1 + pkgs/applications/virtualization/podman/wrapper.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f392fd98c43b..c72a3577bf80 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -69,6 +69,7 @@ buildGoModule rec { installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild '' + lib.optionalString stdenv.isLinux '' + install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system '' + '' diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index ae163583e699..9f3e1943b56e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -48,6 +48,7 @@ in runCommand podman.name { ln -s ${podman.man} $man mkdir -p $out/bin + ln -s ${podman-unwrapped}/etc $out/etc ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ From 30ae7e4ba983de461c7b71d02274d184ab55244d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 May 2021 11:15:02 +1000 Subject: [PATCH 407/664] nixos/podman: install cni config from package --- nixos/modules/virtualisation/podman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index d6421d488b8b..d485f993fb31 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, ... }: let cfg = config.virtualisation.podman; toml = pkgs.formats.toml { }; @@ -92,7 +92,7 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist"; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration From 17887e4967739862ff260b04ea42abae6a6bae85 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 30 May 2021 04:04:45 +0200 Subject: [PATCH 408/664] getdata: add security patch from Debian (#124713) Co-authored-by: Sandro --- pkgs/development/libraries/getdata/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index de76924844fe..25321c22434e 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "getdata"; version = "0.10.0"; @@ -7,6 +7,13 @@ stdenv.mkDerivation rec { sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch"; + sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm"; + }) + ]; + buildInputs = [ libtool ]; meta = with lib; { From e00e031ce1d3907568bee3c7cd92e6a0cbf90b21 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 23:16:10 -0300 Subject: [PATCH 409/664] gitRepo: 2.14.5 -> 2.15.3 (#124904) --- .../version-management/git-repo/default.nix | 18 +++++++++++++----- .../git-repo/import-ssl-module.patch | 12 ------------ 2 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 pkgs/applications/version-management/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index cd6d9b0fd51c..7b29e466160b 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script , python3, git, gnupg, less }: stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.14.5"; + version = "2.15.3"; src = fetchFromGitHub { owner = "android"; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; }; - patches = [ ./import-ssl-module.patch ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -25,8 +23,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp repo $out/bin/repo + + runHook postInstall ''; # Important runtime dependencies @@ -35,6 +37,12 @@ stdenv.mkDerivation rec { "${lib.makeBinPath [ git gnupg less ]}" ''; + passthru = { + updateScript = nix-update-script { + attrPath = "gitRepo"; + }; + }; + meta = with lib; { description = "Android's repo management tool"; longDescription = '' @@ -45,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ otavio ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch deleted file mode 100644 index f1ec4e3a7ddb..000000000000 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/repo b/repo -index 8b05def..f394b3e 100755 ---- a/repo -+++ b/repo -@@ -236,6 +236,7 @@ import optparse - import re - import shutil - import stat -+import ssl - - if sys.version_info[0] == 3: - import urllib.request From 8a8500c2adadee055ee1b5200ccd492d7e707933 Mon Sep 17 00:00:00 2001 From: Robert Whitaker <__github__@robwhitaker.com> Date: Sat, 29 May 2021 22:17:22 -0400 Subject: [PATCH 410/664] godot: 3.2.2 -> 3.3.2 (#123126) Co-authored-by: Sandro --- pkgs/development/tools/godot/default.nix | 17 ++++++++------ .../godot/dont_clobber_environment.patch | 17 +++++++------- .../tools/godot/pkg_config_additions.patch | 23 ++++++++++++------- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index d5eb7a9b0e01..3a210ab174f9 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor -, libXinerama, libXrandr, libXrender, libpulseaudio ? null -, libXi ? null, libXext, libXfixes, freetype, openssl -, alsaLib, libGLU, zlib, yasm ? null }: +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 +, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio +, libXi, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm +, withUdev ? true +}: let options = { touch = libXi != null; pulseaudio = false; + udev = withUdev; }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.3"; + version = "3.3.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; + sha256 = "0rfm6sbbwzvsn76a8aqagd7cqdzmk8qxphgl89k7y982l9a5sz50"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - scons libX11 libXcursor libXinerama libXrandr libXrender + scons udev libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio libGLU zlib yasm ]; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch index b7c1d3d62335..74e1241513ba 100644 --- a/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,18 +1,19 @@ diff --git a/SConstruct b/SConstruct -index b3d033dc90..04b8dcc832 100644 +index d138c7b250..c925bf908e 100644 --- a/SConstruct +++ b/SConstruct -@@ -62,10 +62,9 @@ elif platform_arg == "javascript": - custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] - +@@ -65,10 +65,10 @@ elif platform_arg == "javascript": + # want to have to pull in manually. + # Then we prepend PATH to make it take precedence, while preserving SCons' own entries. env_base = Environment(tools=custom_tools) --if "TERM" in os.environ: +-env_base.PrependENVPath("PATH", os.getenv("PATH")) +-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +-if "TERM" in os.environ: # Used for colored output. - env_base["ENV"]["TERM"] = os.environ["TERM"] --env_base.AppendENVPath("PATH", os.getenv("PATH")) --env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] ++ + env_base.disabled_modules = [] env_base.use_ptrcall = False - env_base.module_version_string = "" diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 9e2e5c3536db..f5ab667f1808 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,11 +1,11 @@ diff --git a/platform/x11/detect.py b/platform/x11/detect.py -index 5674e78350..7051d8e73c 100644 +index 91652aad55..d12389f9f2 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -201,6 +201,11 @@ def configure(env): +@@ -218,6 +218,11 @@ def configure(env): env.ParseConfig("pkg-config xrender --cflags --libs") env.ParseConfig("pkg-config xi --cflags --libs") - + + env.ParseConfig("pkg-config xext --cflags --libs") + env.ParseConfig("pkg-config xfixes --cflags --libs") + env.ParseConfig("pkg-config glu --cflags --libs") @@ -13,13 +13,20 @@ index 5674e78350..7051d8e73c 100644 + if env["touch"]: env.Append(CPPDEFINES=["TOUCH_ENABLED"]) - -@@ -299,7 +304,7 @@ def configure(env): + +@@ -323,6 +328,7 @@ def configure(env): print("Enabling ALSA") + env["alsa"] = True env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) - # Don't parse --cflags, we don't need to add /usr/include/alsa to include path -- env.ParseConfig("pkg-config alsa --libs") + env.ParseConfig("pkg-config alsa --cflags --libs") else: print("ALSA libraries not found, disabling driver") - + +@@ -340,6 +346,7 @@ def configure(env): + if os.system("pkg-config --exists libudev") == 0: # 0 means found + print("Enabling udev support") + env.Append(CPPDEFINES=["UDEV_ENABLED"]) ++ env.ParseConfig("pkg-config libudev --cflags --libs") + else: + print("libudev development libraries not found, disabling udev support") + else: From c844ab7eff23ea1ddf53ee5ef5ff198da5a337c1 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Sat, 29 May 2021 09:30:10 -0500 Subject: [PATCH 411/664] bsp-layout: init at unstable-2021-05-10 --- pkgs/tools/misc/bsp-layout/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/bsp-layout/default.nix diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix new file mode 100644 index 000000000000..065c21e3f78e --- /dev/null +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib, bspwm, makeWrapper, git, bc }: + +stdenv.mkDerivation rec { + pname = "bsp-layout"; + version = "unstable-2021-05-10"; + + src = fetchFromGitHub { + owner = "phenax"; + repo = pname; + rev = "726b850b79eabdc6f4d236cff52e434848cb55e3"; + sha256 = "1wqlzbz7l9vz37gin2zckrnxkkabnd7x5mi9pb0x96w4yhld5mx6"; + }; + + nativeBuildInputs = [ makeWrapper git bc ]; + buildInputs = [ bspwm ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + substituteInPlace $out/bin/bsp-layout --replace 'bc ' '${bc}/bin/bc ' + ''; + + meta = with lib; { + description = "Manage layouts in bspwm"; + homepage = "https://github.com/phenax/bsp-layout"; + license = licenses.mit; + maintainers = with maintainers; [ devins2518 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..916429cca0a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2008,6 +2008,8 @@ in bottom-rs = callPackage ../tools/misc/bottom-rs { }; + bsp-layout = callPackage ../tools/misc/bsp-layout {}; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; From 33a488c9afc2a875d9ca60d999b9605b41ec450d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 29 May 2021 23:26:37 -0300 Subject: [PATCH 412/664] babashka: 0.4.1 -> 0.4.3 (#124325) --- pkgs/development/interpreters/clojure/babashka.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 543f443a796f..e52d6c20b970 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.1"; + version = "0.4.3"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs="; + sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ="; }; dontUnpack = true; @@ -110,9 +110,15 @@ stdenv.mkDerivation rec { - Batteries included (tools.cli, cheshire, ...) - Library support via popular tools like the clojure CLI ''; - homepage = "https://github.com/borkdude/babashka"; + homepage = "https://github.com/babashka/babashka"; license = licenses.epl10; platforms = graalvm11-ce.meta.platforms; - maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; + maintainers = with maintainers; [ + bandresen + bhougland + DerGuteMoritz + jlesquembre + thiagokokada + ]; }; } From 917884725dbab2f3855da31b46f9342951cafb57 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 30 May 2021 02:42:06 +0000 Subject: [PATCH 413/664] zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6 https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc6 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6db953ae4eff..e41ae3bece24 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -206,9 +206,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc5"; + version = "2.1.0-rc6"; - sha256 = "sha256-cj0P2bw6sTO+Y74pYn/WEpBuVGMMYCreJQjUdC3DMTE="; + sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; isUnstable = true; }; From df0f92daeed03f6ffe2a6d8d3ff59393eaad0229 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sat, 29 May 2021 23:23:38 +0800 Subject: [PATCH 414/664] s3rs: init at 0.4.8 --- pkgs/tools/networking/s3rs/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/s3rs/default.nix diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix new file mode 100644 index 000000000000..2e707ed99163 --- /dev/null +++ b/pkgs/tools/networking/s3rs/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, python3, perl, openssl, Security, fetchFromGitHub, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "s3rs"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "yanganto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lYIE5yR7UNUjpqfwT6R0C0ninNvVZdatYd/n+yyGsms="; + }; + + cargoSha256 = "sha256-vCTJ7TClvuIP9IoqXwNFH7/u9jXt/Ue/Dhefx5rCgmA="; + + nativeBuildInputs = [ python3 perl pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A s3 cli client with multi configs with diffent provider"; + homepage = "https://github.com/yanganto/s3rs"; + license = licenses.mit; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..4a0bb5c74891 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8347,6 +8347,10 @@ in s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; + s3rs = callPackage ../tools/networking/s3rs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + s4cmd = callPackage ../tools/networking/s4cmd { }; s5cmd = callPackage ../tools/networking/s5cmd { }; From c2ac1112e51a72c256fcca2d7cf0eaad6a310003 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sat, 29 May 2021 22:16:23 -0600 Subject: [PATCH 415/664] heisenbridge: unstable-2021-05-23 -> unstable-2021-05-29 Critically, this includes the changes from hifi/heisenbridge#78 which adds an entrypoint so that the executable works. --- pkgs/servers/heisenbridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index b308e96cbec2..2d98f377b3bd 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "unstable-2021-05-23"; + version = "unstable-2021-05-29"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; - rev = "1f8df49b7e89aaeb2cbb5fee68bd29cf3eda079a"; - sha256 = "sha256-ta6n9hXRdIjfxsLy9jrzZkz6TS50/TYpFOb/BLrRWK4="; + rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7"; + sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI="; }; propagatedBuildInputs = with python3Packages; [ From 5619c4f67427549c133dbd2094ef6fbb282ae12c Mon Sep 17 00:00:00 2001 From: Kho-Dialga <55767703+Kho-Dialga@users.noreply.github.com> Date: Tue, 25 May 2021 12:38:31 -0600 Subject: [PATCH 416/664] proton-caller: fix version --- pkgs/misc/emulators/proton-caller/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/misc/emulators/proton-caller/default.nix index f1770ba89060..f8295c6c5b4d 100644 --- a/pkgs/misc/emulators/proton-caller/default.nix +++ b/pkgs/misc/emulators/proton-caller/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "caverym"; repo = pname; - rev = "version"; + rev = version; sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; }; From a8daff8b1a95d7a00bd177d682454194713deb6b Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sun, 30 May 2021 12:41:00 +0800 Subject: [PATCH 417/664] gitui: 0.15.0 -> 0.16.0 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 09587daf3944..6331ab32acd8 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KJXYkOHR50Zap0Ou+jVi09opHuZBfHN/ToZbasZ3IE4="; + sha256 = "sha256-XPXldkNLlxgUBdDDR+n3JAO75JQQOvKoduwnWvIompY="; }; - cargoSha256 = "sha256-N6Yr+TqxWwl/6SgjizIyZJoVsjn/R9yjxUKCqwt8UJg="; + cargoSha256 = "sha256-jHrjAdghuFADf/Gd3GeUOpPBG5tqsBG/Q4R0pNxHAps="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] From fe9b5b6b4ad12cbf61aa0159954f995a6727736b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 30 May 2021 14:38:31 +0800 Subject: [PATCH 418/664] vieb: use electron_13 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0a7aee3ad9..2dcf97a211de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25723,7 +25723,7 @@ in owamp = callPackage ../applications/networking/owamp { }; vieb = callPackage ../applications/networking/browsers/vieb { - electron = electron_12; + electron = electron_13; }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; From fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 10:22:29 +0200 Subject: [PATCH 419/664] nixos/podman: Change podman socket to new podman group --- nixos/modules/virtualisation/podman.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index d6421d488b8b..e879b5ad8f9f 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -111,8 +111,19 @@ in }; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; + systemd.sockets.podman.socketConfig.SocketGroup = "podman"; - systemd.tmpfiles.packages = [ cfg.package ]; + systemd.tmpfiles.packages = [ + # The /run/podman rule interferes with our podman group, so we remove + # it and let the systemd socket logic take care of it. + (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } '' + mkdir -p $out/lib/tmpfiles.d/ + grep -v 'D! /run/podman 0700 root root' \ + <$package/lib/tmpfiles.d/podman.conf \ + >$out/lib/tmpfiles.d/podman.conf + '') ]; + + users.groups.podman = {}; assertions = [ { From ff4d83a66727ad13da0f51d00db4eda8a8c50590 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 10:26:28 +0200 Subject: [PATCH 420/664] nixos/podman: Add dockerSocket.enable --- nixos/modules/virtualisation/podman.nix | 25 +++++++++++++++++ nixos/tests/podman.nix | 37 +++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index e879b5ad8f9f..edf4bbe079a3 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -46,6 +46,20 @@ in ''; }; + dockerSocket.enable = mkOption { + type = types.bool; + default = false; + description = '' + Make the Podman socket available in place of the Docker socket, so + Docker tools can find the Podman socket. + + Podman implements the Docker API. + + Users must be in the podman group in order to connect. As + with Docker, members of this group can gain root access. + ''; + }; + dockerCompat = mkOption { type = types.bool; default = false; @@ -123,6 +137,11 @@ in >$out/lib/tmpfiles.d/podman.conf '') ]; + systemd.tmpfiles.rules = + lib.optionals cfg.dockerSocket.enable [ + "L! /run/docker.sock - - - - /run/podman/podman.sock" + ]; + users.groups.podman = {}; assertions = [ @@ -130,6 +149,12 @@ in assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; message = "Option dockerCompat conflicts with docker"; } + { + assertion = cfg.dockerSocket.enable -> !config.virtualisation.docker.enable; + message = '' + The options virtualisation.podman.dockerSocket.enable and virtualisation.docker.enable conflict, because only one can serve the socket. + ''; + } ]; } ]); diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 6078a936edea..343ecbe14b2d 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -13,10 +13,23 @@ import ./make-test-python.nix ( { virtualisation.podman.enable = true; + # To test docker socket support + virtualisation.podman.dockerSocket.enable = true; + environment.systemPackages = [ + pkgs.docker-client + ]; + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; + extraGroups = [ "podman" ]; + }; + + users.users.mallory = { + isNormalUser = true; + home = "/home/mallory"; + description = "Mallory Foobar"; }; }; @@ -26,9 +39,9 @@ import ./make-test-python.nix ( import shlex - def su_cmd(cmd): + def su_cmd(cmd, user = "alice"): cmd = shlex.quote(cmd) - return f"su alice -l -c {cmd}" + return f"su {user} -l -c {cmd}" podman.wait_for_unit("sockets.target") @@ -105,6 +118,26 @@ import ./make-test-python.nix ( assert pid == "1" pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() assert pid == "2" + + with subtest("A podman member can use the docker cli"): + podman.succeed(su_cmd("docker version")) + + with subtest("Run container via docker cli"): + podman.succeed("docker network create default") + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("docker ps | grep sleeping") + podman.succeed("podman ps | grep sleeping") + podman.succeed("docker stop sleeping") + podman.succeed("docker rm sleeping") + + with subtest("A podman non-member can not use the docker cli"): + podman.fail(su_cmd("docker version", user="mallory")) + + # TODO: add docker-compose test + ''; } ) From 52844efcd67028a481a24103d8e93c7ef2bf4f08 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 10:16:30 +0200 Subject: [PATCH 421/664] nixos/podman: Add generic networkSocket interface --- .../virtualisation/podman-network-socket.nix | 91 +++++++++++++++++++ nixos/modules/virtualisation/podman.nix | 1 + 2 files changed, 92 insertions(+) create mode 100644 nixos/modules/virtualisation/podman-network-socket.nix diff --git a/nixos/modules/virtualisation/podman-network-socket.nix b/nixos/modules/virtualisation/podman-network-socket.nix new file mode 100644 index 000000000000..1429164630b3 --- /dev/null +++ b/nixos/modules/virtualisation/podman-network-socket.nix @@ -0,0 +1,91 @@ +{ config, lib, pkg, ... }: +let + inherit (lib) + mkOption + types + ; + + cfg = config.virtualisation.podman.networkSocket; + +in +{ + options.virtualisation.podman.networkSocket = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Make the Podman and Docker compatibility API available over the network + with TLS client certificate authentication. + + This allows Docker clients to connect with the equivalents of the Docker + CLI -H and --tls* family of options. + + For certificate setup, see https://docs.docker.com/engine/security/protect-access/ + + This option is independent of . + ''; + }; + + server = mkOption { + type = types.enum []; + description = '' + Choice of TLS proxy server. + ''; + example = "ghostunnel"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the port in the firewall. + ''; + }; + + tls.cacert = mkOption { + type = types.path; + description = '' + Path to CA certificate to use for client authentication. + ''; + }; + + tls.cert = mkOption { + type = types.path; + description = '' + Path to certificate describing the server. + ''; + }; + + tls.key = mkOption { + type = types.path; + description = '' + Path to the private key corresponding to the server certificate. + + Use a string for this setting. Otherwise it will be copied to the Nix + store first, where it is readable by any system process. + ''; + }; + + port = mkOption { + type = types.port; + default = 2376; + description = '' + TCP port number for receiving TLS connections. + ''; + }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Interface address for receiving TLS connections. + ''; + }; + }; + + config = { + networking.firewall.allowedTCPPorts = + lib.optional (cfg.enable && cfg.openFirewall) cfg.port; + }; + + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; +} diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index edf4bbe079a3..01ff84bc6293 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -25,6 +25,7 @@ let in { imports = [ + ./podman-network-socket.nix (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; From b6570e723836167640c9b7efc63f327ff17b0755 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 10:15:22 +0200 Subject: [PATCH 422/664] nixos/podman-network-socket-ghostunnel: init --- nixos/modules/module-list.nix | 1 + .../podman-network-socket-ghostunnel.nix | 34 ++++ nixos/tests/all-tests.nix | 1 + nixos/tests/podman-tls-ghostunnel.nix | 150 ++++++++++++++++++ .../virtualization/podman/default.nix | 6 +- 5 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix create mode 100644 nixos/tests/podman-tls-ghostunnel.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e51c833a01ca..c45f3268b975 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1113,6 +1113,7 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman.nix + ./virtualisation/podman-network-socket-ghostunnel.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix ./virtualisation/spice-usb-redirection.nix diff --git a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix new file mode 100644 index 000000000000..1f1ada7f0891 --- /dev/null +++ b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix @@ -0,0 +1,34 @@ +{ config, lib, pkg, ... }: +let + inherit (lib) + mkOption + types + ; + + cfg = config.virtualisation.podman.networkSocket; + +in +{ + options.virtualisation.podman.networkSocket = { + server = mkOption { + type = types.enum [ "ghostunnel" ]; + }; + }; + + config = { + + services.ghostunnel = lib.mkIf (cfg.enable && cfg.server == "ghostunnel") { + enable = true; + servers."podman-socket" = { + inherit (cfg.tls) cert key cacert; + listen = "${cfg.listenAddress}:${toString cfg.port}"; + target = "unix:/run/podman/podman.sock"; + allowAll = lib.mkDefault true; + }; + }; + systemd.services.ghostunnel-server-podman-socket.serviceConfig.SupplementaryGroups = ["podman"]; + + }; + + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ab24c2c857a2..f6417170a6fc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -335,6 +335,7 @@ in plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; diff --git a/nixos/tests/podman-tls-ghostunnel.nix b/nixos/tests/podman-tls-ghostunnel.nix new file mode 100644 index 000000000000..0e687b199b26 --- /dev/null +++ b/nixos/tests/podman-tls-ghostunnel.nix @@ -0,0 +1,150 @@ +/* + This test runs podman as a backend for the Docker CLI. + */ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let gen-ca = pkgs.writeScript "gen-ca" '' + # Create CA + PATH="${pkgs.openssl}/bin:$PATH" + openssl genrsa -out ca-key.pem 4096 + openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -subj '/C=NL/ST=Zuid-Holland/L=The Hague/O=Stevige Balken en Planken B.V./OU=OpSec/CN=Certificate Authority' -out ca.pem + + # Create service + openssl genrsa -out podman-key.pem 4096 + openssl req -subj '/CN=podman' -sha256 -new -key podman-key.pem -out service.csr + echo subjectAltName = DNS:podman,IP:127.0.0.1 >> extfile.cnf + echo extendedKeyUsage = serverAuth >> extfile.cnf + openssl x509 -req -days 365 -sha256 -in service.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out podman-cert.pem -extfile extfile.cnf + + # Create client + openssl genrsa -out client-key.pem 4096 + openssl req -subj '/CN=client' -new -key client-key.pem -out client.csr + echo extendedKeyUsage = clientAuth > extfile-client.cnf + openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out client-cert.pem -extfile extfile-client.cnf + + # Create CA 2 + PATH="${pkgs.openssl}/bin:$PATH" + openssl genrsa -out ca-2-key.pem 4096 + openssl req -new -x509 -days 365 -key ca-2-key.pem -sha256 -subj '/C=NL/ST=Zuid-Holland/L=The Hague/O=Stevige Balken en Planken B.V./OU=OpSec/CN=Certificate Authority' -out ca-2.pem + + # Create client signed by CA 2 + openssl genrsa -out client-2-key.pem 4096 + openssl req -subj '/CN=client' -new -key client-2-key.pem -out client-2.csr + echo extendedKeyUsage = clientAuth > extfile-client.cnf + openssl x509 -req -days 365 -sha256 -in client-2.csr -CA ca-2.pem -CAkey ca-2-key.pem -CAcreateserial -out client-2-cert.pem -extfile extfile-client.cnf + + ''; + in + { + name = "podman-tls-ghostunnel"; + meta = { + maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; + }; + + nodes = { + podman = + { pkgs, ... }: + { + virtualisation.podman.enable = true; + virtualisation.podman.dockerSocket.enable = true; + virtualisation.podman.networkSocket = { + enable = true; + openFirewall = true; + server = "ghostunnel"; + tls.cert = "/root/podman-cert.pem"; + tls.key = "/root/podman-key.pem"; + tls.cacert = "/root/ca.pem"; + }; + + environment.systemPackages = [ + pkgs.docker-client + ]; + + users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = ["podman"]; + }; + + }; + + client = { ... }: { + environment.systemPackages = [ + # Installs the docker _client_ only + # Normally, you'd want `virtualisation.docker.enable = true;`. + pkgs.docker-client + ]; + environment.variables.DOCKER_HOST = "podman:2376"; + environment.variables.DOCKER_TLS_VERIFY = "1"; + }; + }; + + testScript = '' + import shlex + + + def su_cmd(user, cmd): + cmd = shlex.quote(cmd) + return f"su {user} -l -c {cmd}" + + def cmd(command): + print(f"+{command}") + r = os.system(command) + if r != 0: + raise Exception(f"Command {command} failed with exit code {r}") + + start_all() + cmd("${gen-ca}") + + podman.copy_from_host("ca.pem", "/root/ca.pem") + podman.copy_from_host("podman-cert.pem", "/root/podman-cert.pem") + podman.copy_from_host("podman-key.pem", "/root/podman-key.pem") + + client.copy_from_host("ca.pem", "/root/.docker/ca.pem") + # client.copy_from_host("podman-cert.pem", "/root/podman-cert.pem") + client.copy_from_host("client-cert.pem", "/root/.docker/cert.pem") + client.copy_from_host("client-key.pem", "/root/.docker/key.pem") + + # TODO (ghostunnel): add file watchers so the restart isn't necessary + podman.succeed("systemctl reset-failed && systemctl restart ghostunnel-server-podman-socket.service") + + podman.wait_for_unit("sockets.target") + podman.wait_for_unit("ghostunnel-server-podman-socket.service") + + with subtest("Create default network"): + podman.succeed("docker network create default") + + with subtest("Root docker cli also works"): + podman.succeed("docker version") + + with subtest("A podman member can also still use the docker cli"): + podman.succeed(su_cmd("alice", "docker version")) + + with subtest("Run container remotely via docker cli"): + client.succeed("docker version") + + # via socket would be nicer + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + + client.succeed( + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + client.succeed("docker ps | grep sleeping") + podman.succeed("docker ps | grep sleeping") + client.succeed("docker stop sleeping") + client.succeed("docker rm sleeping") + + with subtest("Clients without cert will be denied"): + client.succeed("rm /root/.docker/{cert,key}.pem") + client.fail("docker version") + + with subtest("Clients with wrong cert will be denied"): + client.copy_from_host("client-2-cert.pem", "/root/.docker/cert.pem") + client.copy_from_host("client-2-key.pem", "/root/.docker/key.pem") + client.fail("docker version") + + ''; + } +) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f392fd98c43b..f2b560bf8661 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -80,7 +80,11 @@ buildGoModule rec { patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman ''; - passthru.tests = { inherit (nixosTests) podman; }; + passthru.tests = { + inherit (nixosTests) podman; + # related modules + inherit (nixosTests) podman-tls-ghostunnel; + }; meta = with lib; { homepage = "https://podman.io/"; From db31d8354d9c1988968f076c4e01843330162e03 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 May 2021 17:39:23 +0200 Subject: [PATCH 423/664] podman: Add iproute2, fixing docker network rm --- nixos/tests/podman.nix | 1 + pkgs/applications/virtualization/podman/wrapper.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 343ecbe14b2d..7eae575fd7f0 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -132,6 +132,7 @@ import ./make-test-python.nix ( podman.succeed("podman ps | grep sleeping") podman.succeed("docker stop sleeping") podman.succeed("docker rm sleeping") + podman.succeed("docker network rm default") with subtest("A podman non-member can not use the docker cli"): podman.fail(su_cmd("docker version", user="mallory")) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index ae163583e699..d141ba49a928 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -12,6 +12,7 @@ , util-linux # nsenter , cni-plugins # not added to path , iptables +, iproute2 }: let @@ -25,6 +26,7 @@ let fuse-overlayfs util-linux iptables + iproute2 ] ++ extraPackages); in runCommand podman.name { From 2eeecef3fc70e35b2f4c6d8424e4c726c140e330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 30 May 2021 11:55:19 +0200 Subject: [PATCH 424/664] nixos/libvirtd: Take ethertypes from iptables-nftables-compat iptables is currently defined in `all-packages.nix` to be iptables-compat. That package does however not contain `ethertypes`. Only `iptables-nftables-compat` contains this file so the symlink dangles. --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d12169787c5a..084ba0634797 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -160,7 +160,7 @@ in { etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ]; - etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes"; + etc.ethertypes.source = "${pkgs.iptables-nftables-compat}/etc/ethertypes"; }; boot.kernelModules = [ "tun" ]; From 2d7f554229393ddb0441dd31e37db7ad7b48dab0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 29 May 2021 20:38:07 +0100 Subject: [PATCH 425/664] yara: 4.0.5 -> 4.1.1 --- pkgs/tools/security/yara/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 506bf0f719d7..3d4411d9087c 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , autoreconfHook , pcre @@ -14,14 +13,14 @@ }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.1"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1gkdll2ygdlqy1f27a5b84gw2bq75ss7acsx06yhiss90qwdaalq"; + sha256 = "185j7firn7i5506rcp0va7sxdbminwrm06jsm4c70jf98qxmv522"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -34,19 +33,6 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; - # If static builds are disabled, `make all-am` will fail to find libyara.a and - # cause a build failure. It appears that somewhere between yara 4.0.1 and - # 4.0.5, linking the yara binaries dynamically against libyara.so was broken. - # - # This was already fixed in yara master. Backport the patch to yara 4.0.5. - patches = [ - (fetchpatch { - name = "fix-build-with-no-static.patch"; - url = "https://github.com/VirusTotal/yara/commit/52e6866023b9aca26571c78fb8759bc3a51ba6dc.diff"; - sha256 = "074cf99j0rqiyacp60j1hkvjqxia7qwd11xjqgcr8jmfwihb38nr"; - }) - ]; - configureFlags = [ (lib.withFeature withCrypto "crypto") (lib.enableFeature enableCuckoo "cuckoo") From 8cda1cc59e7cd01ce2ff18bc78f6b7a0e7faed19 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 29 May 2021 20:47:22 +0100 Subject: [PATCH 426/664] yara: add enableStatic mode useful because tests can be enabled in this mode --- pkgs/tools/security/yara/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 3d4411d9087c..3eb5495d2c96 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -10,6 +10,7 @@ , enableDotNet ? true , enableMacho ? true , enableMagic ? true, file +, enableStatic ? false }: stdenv.mkDerivation rec { @@ -40,8 +41,11 @@ stdenv.mkDerivation rec { (lib.enableFeature enableDotNet "dotnet") (lib.enableFeature enableMacho "macho") (lib.enableFeature enableMagic "magic") + (lib.enableFeature enableStatic "static") ]; + doCheck = enableStatic; + meta = with lib; { description = "The pattern matching swiss knife for malware researchers"; homepage = "http://Virustotal.github.io/yara/"; From ba677b14dd937dc00723dc13dfa2f53c934db392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 30 May 2021 14:17:56 +0200 Subject: [PATCH 427/664] halide: Fix build --- pkgs/development/compilers/halide/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 69b7cd4d8682..916d8fa56f75 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -41,7 +41,17 @@ llvmPackages.stdenv.mkDerivation rec { # 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 - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ]; + buildInputs = [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libpng + libjpeg + mesa + eigen + openblas + ]; nativeBuildInputs = [ cmake ]; From a7cd70f3676d60c64e1c079bbef072bfdd96807c Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Sun, 30 May 2021 08:23:29 -0400 Subject: [PATCH 428/664] vimPlugins.gruvbox-flat-nvim: init at 2021-05-28 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b213ff9089e2..8215d35a9e89 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1845,6 +1845,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + gruvbox-flat-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-flat-nvim"; + version = "2021-05-28"; + src = fetchFromGitHub { + owner = "eddyekofo94"; + repo = "gruvbox-flat.nvim"; + rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0"; + sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh"; + }; + meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; + }; + gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; version = "2021-05-12"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8184ee35aad6..79c85a7bfe69 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -107,6 +107,7 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion eddiebergman/nvim-treesitter-pyfold +eddyekofo94/gruvbox-flat.nvim editorconfig/editorconfig-vim edluffy/hologram.nvim@main edluffy/specs.nvim@main From 6c638ee6b10e7b9f567601068a195f45740805fc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 30 May 2021 15:10:00 +0200 Subject: [PATCH 429/664] ungoogled-chromium: 90.0.4430.212 -> 91.0.4472.77 --- .../networking/browsers/chromium/common.nix | 7 ++----- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2cf3556e7ea3..7e95da747d1e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -165,14 +165,10 @@ let ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch - ] ++ optionals (chromiumVersionAtLeast "91") [ ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ]; - postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' - # Required for patchShebangs (unsupported): - chmod -x third_party/webgpu-cts/src/tools/deno - '' + '' + postPatch = '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -191,6 +187,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi + chmod -x third_party/webgpu-cts/src/tools/deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2cb53eda3e3e..995e4c9be61e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "90.0.4430.212", - "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", - "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", + "version": "91.0.4472.77", + "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5", + "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad", "deps": { "gn": { - "version": "2021-02-09", + "version": "2021-04-06", "url": "https://gn.googlesource.com/gn", - "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", - "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" + "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", + "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "90.0.4430.212-1", - "sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8" + "rev": "91.0.4472.77-1", + "sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0" } } } From 3f3f5a0d5df1d6b2ab6ff6ff512aa9b0ee2e74a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 30 May 2021 15:18:00 +0200 Subject: [PATCH 430/664] scons: Remove myself as maintainer I'm not using it anymore but it would be great if we could find a new maintainer as SCons is a build tool on which a few other packages depend. --- pkgs/development/tools/build-managers/scons/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 8b5b608fdf39..6af302851234 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -43,6 +43,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; }; } From 964fc7cfef94bd598d816979a4ca1a42d9753d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 30 May 2021 16:00:50 +0200 Subject: [PATCH 431/664] Update nixos/modules/virtualisation/libvirtd.nix Co-authored-by: Martin Weinelt --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 084ba0634797..61ebc3ab8cf2 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -160,7 +160,7 @@ in { etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ]; - etc.ethertypes.source = "${pkgs.iptables-nftables-compat}/etc/ethertypes"; + etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes"; }; boot.kernelModules = [ "tun" ]; From 544db849a172f03c7eda038705e303e94bf5a53e Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 25 May 2021 09:00:09 +0200 Subject: [PATCH 432/664] =?UTF-8?q?ocamlPackages.uri:=204.0.0=20=E2=86=92?= =?UTF-8?q?=204.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/uri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 7933b3bd8d42..f669a98c4def 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "uri"; - version = "4.0.0"; + version = "4.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380"; + sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; checkInputs = [ ounit ]; From 416340800d1910ced2b02097215d530dfe28074a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 May 2021 16:16:55 +0200 Subject: [PATCH 433/664] python3Packages.pygtfs: init at 0.1.6 --- .../python-modules/pygtfs/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pygtfs/default.nix diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix new file mode 100644 index 000000000000..735990c09448 --- /dev/null +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, docopt +, fetchPypi +, nose +, pytz +, setuptools-scm +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "pygtfs"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nx2idgza07kmvj7pcgpj3pqhw53v5rq63paw2ly51cjas2fv5pr"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + docopt + pytz + six + sqlalchemy + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ "pygtfs" ]; + + meta = with lib; { + description = "Python module for GTFS"; + homepage = "https://github.com/jarondl/pygtfs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03ffc1a6bda4..d9ba0532782a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5759,6 +5759,8 @@ in { pygrok = callPackage ../development/python-modules/pygrok { }; + pygtfs = callPackage ../development/python-modules/pygtfs { }; + pygtail = callPackage ../development/python-modules/pygtail { }; pygtrie = callPackage ../development/python-modules/pygtrie { }; From a759f21d3769b1cf774ee15981d6f6e8d6edc4a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 May 2021 16:25:00 +0200 Subject: [PATCH 434/664] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0e952c444deb..98e0781186b9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -331,7 +331,7 @@ "group" = ps: with ps; [ ]; "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player - "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs + "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups From edcde75b989c69d566b8da67db2fa7351ca3c191 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 30 May 2021 14:23:36 +0100 Subject: [PATCH 435/664] neomutt: add patch for CVE-2021-32055 no upstream release yet --- .../networking/mailreaders/neomutt/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b2187371f299..50b3b66f15dc 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; }; + patches = [ + (fetchpatch { + name = "CVE-2021-32055.patch"; + url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; + sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; + }) + ]; + buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb From 4e318bcca19e7972d1fa8b15c4eadf85e3d5a6a1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 30 May 2021 16:54:09 +0200 Subject: [PATCH 436/664] cacerts: Make updater script aware of the nss_latest attribute Usually, on the stable channel, we have a nss_latest attribute that is more up to date than the nss attribute (which is usually frozen during branch-off and only receives security updates). Cacerts are a sensitive matter and should be updated more frequently than the stable NSS package, if required. By making the update script aware of the nss_latest attribute we can prefer that when it exists. By having this change in the unstable branch of Nixpgks we can carry it from release to release without requiring more churn from those doing the stable release maintenance. --- pkgs/data/misc/cacert/update.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh index 7bf3d46cb02f..1c286dc6206f 100755 --- a/pkgs/data/misc/cacert/update.sh +++ b/pkgs/data/misc/cacert/update.sh @@ -12,6 +12,14 @@ # # As of this writing there are a few magnitudes more packages depending on # cacert than on nss. +# +# If the current nixpkgs revision contains the attribute `nss_latest` that will +# be used instead of `nss`. This is done to help the stable branch maintenance +# where (usually) after branch-off during the first Firefox upgrade that +# requries a new NSS version that attribute is introduced. +# By having this change in the unstable branch we can safely carry it from +# release to release without requiring more backport churn on those doing the +# stable maintenance. set -ex @@ -20,7 +28,7 @@ BASEDIR="$(dirname "$0")/../../../.." CURRENT_PATH=$(nix-build --no-out-link -A cacert.out) -PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out") +PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; let nss_pkg = pkgs.nss_latest or pkgs.nss; in (cacert.overrideAttrs (_: { inherit (nss_pkg) src version; })).out") # Check the hash of the etc subfolder # We can't check the entire output as that contains the nix-support folder From 83c102f66c3ee9252cf012b9a9c85c6f953f7cf3 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 26 May 2021 08:29:44 +0200 Subject: [PATCH 437/664] =?UTF-8?q?ocamlPackages.tyxml:=204.4.0=20?= =?UTF-8?q?=E2=86=92=204.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tyxml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index bf0e06507c9e..c49327d7d338 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.4.0"; + version = "4.5.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; + sha256 = "0s30f72m457c3gbdmdwbx7ls9zg806nvm83aiz9qkpglbppwr6n6"; }; propagatedBuildInputs = [ uutf re ]; @@ -19,7 +19,7 @@ buildDunePackage rec { license = licenses.lgpl21; maintainers = with maintainers; [ gal_bolle vbgl - ]; + ]; }; } From d07f52bf810beb4c67bcbf012aad78a2c9f3e495 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 30 May 2021 17:26:13 +0200 Subject: [PATCH 438/664] nixos/test-driver: mention the elapsed time when it times out For now you had to know that the actions are retried for 900s when seeing an error like > Traceback (most recent call last): > File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 927, in run_tests > exec(tests, globals()) > File "", line 1, in > File "", line 31, in > File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 565, in wait_for_file > retry(check_file) > File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 142, in retry > raise Exception("action timed out") > Exception: action timed out in your (hydra) build failure. Due to the absence of timestamps you were left guessing if the machine was just slow, someone passed a low timeout value (which they couldn't until now) or whatever might have happened. By making this error a bit more descriptive (by including the elapsed time) these hopefully become more useful. --- nixos/lib/test-driver/test-driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e216e566f286..6bbca95a97f6 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -128,18 +128,18 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any] return (vlan_nr, vde_socket, vde_process, fd) -def retry(fn: Callable) -> None: +def retry(fn: Callable, timeout: int = 900) -> None: """Call the given function repeatedly, with 1 second intervals, until it returns True or a timeout is reached. """ - for _ in range(900): + for _ in range(timeout): if fn(False): return time.sleep(1) if not fn(True): - raise Exception("action timed out") + raise Exception(f"action timed out after {timeout} seconds") class Logger: From 20db1f287f07358439390e96fbc4cde20558ee9c Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 30 May 2021 13:20:39 +0000 Subject: [PATCH 439/664] luajit_2_1: 2.1.0-2021-05-22 -> 2.1.0-2021-05-29 --- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 8be8aa82b08c..f85fc0932cca 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-05-22"; - rev = "5783ba1bf73c53ca56e64ed0c462c62224f0393c"; + version = "2.1.0-2021-05-29"; + rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567"; isStable = false; - sha256 = "1j25xnbradks58lwsqnxcc7k29wsk2hnky0b1vjzpadrj0sxxc42"; + sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6"; } From b9bf83bc5a7dfe6554c9714e8215e866189d1a4e Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 30 May 2021 13:21:15 +0000 Subject: [PATCH 440/664] luajit_2_0: 2.1.0-2021-05-17 -> 2.1.0-2021-05-29 --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index c0be721701cb..528c14a8b247 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-05-17"; - rev = "44684fa71d8af6fa8b3051c7d763bbfdcf7915d7"; + version = "2.0.5-2021-05-29"; + rev = "c2cfa04231785116d9d198462830f41ef94147c0"; isStable = true; - sha256 = "049d3l0miv4n0cnm35ml8flrb9vs12zvbda2743vypckymidliqp"; + sha256 = "1fw64pv0dvzb9bgr2zwcv9q8gqgsmfnvrcrmrdfgj4ncamgdnilj"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); From 878103ce553567118aedc30cc23c8377181480cd Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 30 May 2021 18:16:13 +0200 Subject: [PATCH 441/664] nixos/trilium: use boolToString for noBackup --- nixos/modules/services/web-apps/trilium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index ae41ba50d2e2..35383c992fe8 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -9,7 +9,7 @@ let # Disable automatically generating desktop icon noDesktopIcon=true - noBackup=${cfg.noBackup} + noBackup=${lib.boolToString cfg.noBackup} [Network] # host setting is relevant only for web deployments - set the host on which the server will listen From 2c7d2ce295296553451a7839513427f63377e92e Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 29 May 2021 13:33:43 -0300 Subject: [PATCH 442/664] sageWithDoc: fix documentation symlinks --- pkgs/applications/science/math/sage/sagedoc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index f4a8bf19b69c..d53947d806d1 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { mv html/en/_static{,.tmp} for _dir in `find -name _static` ; do rm -r $_dir - ln -s html/en/_static $_dir + ln -rs html/en/_static $_dir done mv html/en/_static{.tmp,} ''; From e546f97664601f3828a92f76fa2b2a12d05fb1d5 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sun, 30 May 2021 10:59:16 -0600 Subject: [PATCH 443/664] rpg-cli: unstable-2021-05-27 -> 0.3.0 --- pkgs/games/rpg-cli/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 1e07c3418fcc..0c3a58c98a96 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "unstable-2021-05-27"; + version = "0.3.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; - # certain revision because the Cargo.lock was checked-in in that commit - rev = "4d8a1dac79a1d29d79c0c874475037769dcef5a1"; - sha256 = "sha256-qfj1uij9lYyfyHFUnVi9I0ELOoObjFG2NS9UreC/xio="; + rev = version; + sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM="; }; - cargoSha256 = "sha256-I+rSfuiGFdzA5zqPfvMPcERaQfiX92LW2NKjazWh9c4="; + cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw="; # tests assume the authors macbook, and thus fail doCheck = false; @@ -22,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/facundoolano/rpg-cli"; license = licenses.mit; maintainers = with maintainers; [ legendofmiracles ]; - mainProgram = "rpg-cli"; }; } From 170e2e4976849239088657858752031e1cbaf1f3 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sun, 30 May 2021 11:30:46 -0600 Subject: [PATCH 444/664] xcp: init at 0.9.0 --- pkgs/tools/misc/xcp/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/xcp/default.nix diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix new file mode 100644 index 000000000000..907e39a3f27b --- /dev/null +++ b/pkgs/tools/misc/xcp/default.nix @@ -0,0 +1,25 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "xcp"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "tarka"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Kwt1qLuP63bIn0VY3oFEcbKh1GGBdObfOmtPV4DMQUU="; + }; + + # no such file or directory errors + doCheck = false; + + cargoSha256 = "sha256-wFOXRQSOfmGB6Zmkqn7KoK+vyHeFKyGNx7Zf2zzPcE4="; + + meta = with lib; { + description = "An extended cp(1)"; + homepage = "https://github.com/tarka/xcp"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bab2eae8da9..e8544f7fb0af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31298,6 +31298,8 @@ in zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + xcp = callPackage ../tools/misc/xcp { }; + xcpc = callPackage ../misc/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; From 9d84a846395315d276eb73109e0d7d0767ddf0ef Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 26 May 2021 19:58:23 -0400 Subject: [PATCH 445/664] pythonPackages.scikit-hep-testdata: init at 0.4.3 --- .../scikit-hep-testdata/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/scikit-hep-testdata/default.nix diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix new file mode 100644 index 000000000000..281564601102 --- /dev/null +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, pythonAtLeast +, buildPythonPackage +, importlib-resources +, pyyaml +, requests +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "scikit-hep-testdata"; + version = "0.4.3"; + format = "pyproject"; + + # fetch from github as we want the data files + # https://github.com/scikit-hep/scikit-hep-testdata/issues/60 + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-3uy2uZb0Y9nOHlXtsDd9LGALvTXl1ZQ6P3m2dQ2ceHo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ + pyyaml + requests + ] ++ lib.optional (!pythonAtLeast "3.9") importlib-resources; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + SKHEP_DATA = 1; # install the actual root files + + doCheck = false; # tests require networking + pythonImportsCheck = [ "skhep_testdata" ]; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/scikit-hep-testdata"; + description = "A common package to provide example files (e.g., ROOT) for testing and developing packages against"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c87442d00883..ef27d31c615a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7448,6 +7448,8 @@ in { scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; + scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikit-learn = callPackage ../development/python-modules/scikit-learn { From fa0e4b7c418df6e3d5f1514b43fde70a922b973a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 26 May 2021 20:01:03 -0400 Subject: [PATCH 446/664] python3Packages.uproot: init at 4.0.8 --- .../python-modules/uproot/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/uproot/default.nix diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix new file mode 100644 index 000000000000..8a687534005e --- /dev/null +++ b/pkgs/development/python-modules/uproot/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, awkward +, numpy +, lz4 +, xxhash +, zstandard +, pytestCheckHook +, scikit-hep-testdata +}: + +buildPythonPackage rec { + pname = "uproot"; + version = "4.0.8"; + + # fetch from github for tests + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "uproot4"; + rev = version; + sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4="; + }; + + propagatedBuildInputs = [ + awkward + numpy + lz4 + xxhash + zstandard + ]; + + checkInputs = [ + pytestCheckHook + scikit-hep-testdata + ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + disabledTests = [ + # tests that try to download files + "test_http" + "test_no_multipart" + "test_fallback" + "test_pickle_roundtrip_http" + ]; + disabledTestPaths = [ + # tests that try to download files + "tests/test_0066-fix-http-fallback-freeze.py" + "tests/test_0088-read-with-http.py" + "tests/test_0220-contiguous-byte-ranges-in-http.py" + ]; + pythonImportsCheck = [ "uproot" ]; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/uproot4"; + description = "ROOT I/O in pure Python and Numpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef27d31c615a..287073aa5bdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8573,6 +8573,8 @@ in { upnpy = callPackage ../development/python-modules/upnpy { }; + uproot = callPackage ../development/python-modules/uproot { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; From 3d2092ab58fe83e89a3162728e9d4b733295b561 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 30 May 2021 11:37:31 -0400 Subject: [PATCH 447/664] libccd: fix pkgconfig file paths libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have submitted the fix upstream, but don't have much hope of getting it merged because there have been no updates since 2018. --- pkgs/development/libraries/libccd/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/development/libraries/libccd/default.nix index a9e0c2b3feb0..c8e7c8af2104 100644 --- a/pkgs/development/libraries/libccd/default.nix +++ b/pkgs/development/libraries/libccd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "libccd"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; }; + patches = [ + # Fix pkgconfig file with absolute CMAKE_INSTALL_*DIR + # https://github.com/danfis/libccd/pull/76 + (fetchpatch { + url = "https://github.com/danfis/libccd/commit/cd16c4f168ae308e4c77db66ac97a2eaf47e059e.patch"; + sha256 = "02wj21c185kwf8bn4qi4cnna0ypzqm481xw9rr8jy1i0cb1r9idg"; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { From 2d372c1f69a382654caa628bd1e1beb986d56625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 May 2021 20:29:55 +0200 Subject: [PATCH 448/664] python3Packages.pytube: 10.8.2 -> 10.8.3 https://github.com/pytube/pytube/releases/tag/v10.8.3 --- pkgs/development/python-modules/pytube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index a557c623a07c..086c3a8671b1 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.2"; + version = "10.8.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-LY1aDFzF0vHwEa3pfAoxZ3KM1l39PDo6S6F3xtqqspU="; + sha256 = "sha256-U/TXA/0y5tsuj0q3kxacHk76wjYG6k8mPX5F3MpADmk="; }; checkInputs = [ From 0885a2d40fe1e01e80481b3d649ddb1defbe68ef Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Sat, 29 May 2021 08:37:06 -0500 Subject: [PATCH 449/664] bunnyfetch: init at unstable-2021-05-24 --- pkgs/tools/misc/bunnyfetch/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/bunnyfetch/default.nix diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix new file mode 100644 index 000000000000..37e1be80e3c3 --- /dev/null +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bunnyfetch"; + version = "unstable-2021-05-24"; + + src = fetchFromGitHub { + owner = "Mewyuna"; + repo = pname; + rev = "7bcc45fb590b37f410e60af893e679eb0729ecb1"; + sha256 = "1lgqrwmxdxd1d99rr0akydfwcsbcmz75fkbq9zrl842rksnp5q3r"; + }; + + vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + + # No upstream tests + doCheck = false; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Tiny system info fetch utility"; + homepage = "https://github.com/Mewyuna/bunnyfetch"; + license = licenses.mit; + maintainers = with maintainers; [ devins2518 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3877b502a11d..b0edc0db1607 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31616,6 +31616,8 @@ in kodelife = callPackage ../applications/graphics/kodelife {}; + bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; + _3proxy = callPackage ../applications/networking/3proxy {}; pigeon = callPackage ../development/tools/pigeon {}; From 61654ca131c1431b172cc0464c83227c40331e16 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 30 May 2021 21:42:39 +0200 Subject: [PATCH 450/664] nixos/pam: use new plasma5Packages, fixes #124973 --- nixos/modules/security/pam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index b5bd22f6ba7b..3cde7e951551 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -965,7 +965,7 @@ in mr ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so, '' + optionalString (isEnabled (cfg: cfg.enableKwallet)) '' - mr ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so, + mr ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so, '' + optionalString config.virtualisation.lxc.lxcfs.enable '' mr ${pkgs.lxc}/lib/security/pam_cgfs.so From c71b9d7e0aeb3b7cd1deab0f1cfaf3cf75da3bca Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 21:56:07 +0200 Subject: [PATCH 451/664] python3Packages.explorerscript: init at 1.2.3 --- .../python-modules/explorerscript/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/explorerscript/default.nix diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix new file mode 100644 index 000000000000..b0f1a16fe421 --- /dev/null +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, python-igraph }: + +buildPythonPackage rec { + pname = "explorerscript"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; + }; + + propagatedBuildInputs = [ antlr4-python3-runtime python-igraph ]; + checkInputs = [ pygments ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/explorerscript"; + description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03ffc1a6bda4..f3e336fef56e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2295,6 +2295,8 @@ in { expiringdict = callPackage ../development/python-modules/expiringdict { }; + explorerscript = callPackage ../development/python-modules/explorerscript { }; + exrex = callPackage ../development/python-modules/exrex { }; extractcode = callPackage ../development/python-modules/extractcode { }; From 4d1125e8a8cd3d13dd9562f9cf751886c8d09c5c Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 21:57:12 +0200 Subject: [PATCH 452/664] python3Packages.ndspy: init at 3.0.0 --- .../python-modules/ndspy/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/ndspy/default.nix diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix new file mode 100644 index 000000000000..9c4d91df9d65 --- /dev/null +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, crcmod }: + +buildPythonPackage rec { + pname = "ndspy"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s0i81gspas22bjwk9vhy3x5sw1svyybk7c2j1ixc77drr9ym20a"; + }; + + propagatedBuildInputs = [ crcmod ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "ndspy" ]; + + meta = with lib; { + homepage = "https://github.com/RoadrunnerWMC/ndspy"; + description = "A Python library for many Nintendo DS file formats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3e336fef56e..c954498757b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4527,6 +4527,8 @@ in { ndjson = callPackage ../development/python-modules/ndjson { }; + ndspy = callPackage ../development/python-modules/ndspy { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; neo = callPackage ../development/python-modules/neo { }; From fb651e653be9c8ce3e526c420c53226a4f76d91e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 21:58:14 +0200 Subject: [PATCH 453/664] python3Packages.py-desmume: init at 0.0.3.post2 --- .../python-modules/py-desmume/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/py-desmume/default.nix diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix new file mode 100644 index 000000000000..a249b0aede13 --- /dev/null +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -0,0 +1,44 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython +, libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 +, alsaLib, soundtouch, openal +}: + +let + desmume = fetchFromGitHub { + owner = "SkyTemple"; + repo = "desmume"; + rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7"; + sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842"; + }; +in +buildPythonPackage rec { + pname = "py-desmume"; + version = "0.0.3.post2"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1"; + }; + + postPatch = '' + cp -R --no-preserve=mode ${desmume} __build_desmume + ''; + + buildInputs = [ GitPython libpcap SDL2 alsaLib soundtouch openal ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + propagatedBuildInputs = [ pillow pygobject3 ]; + + hardeningDisable = [ "format" ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "desmume" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/py-desmume"; + description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c954498757b8..01e3311054d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5603,6 +5603,8 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; + py-desmume = callPackage ../development/python-modules/py-desmume { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; pydicom = callPackage ../development/python-modules/pydicom { }; From 7747a6081124cf345e95dda01da819c6f4fc6acd Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 21:58:55 +0200 Subject: [PATCH 454/664] python3Packages.pygtkspellcheck: init at 4.0.6 --- .../pygtkspellcheck/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pygtkspellcheck/default.nix diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix new file mode 100644 index 000000000000..9dcb2b732ca3 --- /dev/null +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, gobject-introspection, gtk3, pyenchant, pygobject3 }: + +buildPythonPackage rec { + pname = "pygtkspellcheck"; + version = "4.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pc3xmv1q775hn4kc1kspvpdn4gm7ix3aw6hz9iy3brfcw6ddcl4"; + }; + + nativeBuildInputs = [ gobject-introspection gtk3 ]; + propagatedBuildInputs = [ pyenchant pygobject3 ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "gtkspellcheck" ]; + + meta = with lib; { + homepage = "https://github.com/koehlma/pygtkspellcheck"; + description = "A Python spell-checking library for GtkTextViews based on Enchant"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01e3311054d2..e808711b8624 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5767,6 +5767,8 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; + pygtkspellcheck = callPackage ../development/python-modules/pygtkspellcheck { }; + pygtrie = callPackage ../development/python-modules/pygtrie { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; From f6122ba3ddc93043b7142ebc59a2d807a90dae4a Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 21:59:42 +0200 Subject: [PATCH 455/664] python3Packages.pypresence: init at 4.2.0 --- .../python-modules/pypresence/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pypresence/default.nix diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix new file mode 100644 index 000000000000..0fa188c0771a --- /dev/null +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pypresence"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c8r7yxih5zp46qb9anq5s91pw2wr7d9d0nzcfh4l42x10c8lqal"; + }; + + doCheck = false; # tests require internet connection + pythonImportsCheck = [ "pypresence" ]; + + meta = with lib; { + homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; + description = "Discord RPC client written in Python"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e808711b8624..cd900e8a3c02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6102,6 +6102,8 @@ in { pyppeteer = callPackage ../development/python-modules/pyppeteer { }; + pypresence = callPackage ../development/python-modules/pypresence { }; + pyprind = callPackage ../development/python-modules/pyprind { }; pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; From 8a395dec8276cc11c1d308464f6314a1da0c7da1 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:00:48 +0200 Subject: [PATCH 456/664] python3Packages.tilequant: init at 0.4.0.post0 --- .../python-modules/tilequant/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/tilequant/default.nix diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix new file mode 100644 index 000000000000..90caab8ebef8 --- /dev/null +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, click, ordered-set, pillow, sortedcollections }: + +let + aikku93-tilequant = fetchFromGitHub { + owner = "SkyTemple"; + repo = "aikku93-tilequant"; + rev = "6604e0906edff384b6c8d4cde03e6601731f66fd"; + sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1"; + }; +in +buildPythonPackage rec { + pname = "tilequant"; + version = "0.4.0.post0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25"; + }; + + postPatch = '' + cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant + ''; + + buildInputs = [ GitPython ]; + propagatedBuildInputs = [ click ordered-set pillow sortedcollections ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_tilequant" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/tilequant"; + description = "Tool for quantizing image colors using tile-based palette restrictions"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd900e8a3c02..8f865b53404f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8284,6 +8284,8 @@ in { inherit (pkgs) tiledb; }; + tilequant = callPackage ../development/python-modules/tilequant { }; + tilestache = callPackage ../development/python-modules/tilestache { }; timeago = callPackage ../development/python-modules/timeago { }; From 845ba2eeef2843b90b0287d99b448d7daac93fad Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:01:46 +0200 Subject: [PATCH 457/664] python3Packages.skytemple-icons: init at 1.2.0 --- .../skytemple-icons/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-icons/default.nix diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix new file mode 100644 index 000000000000..0bf3659605c9 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "skytemple-icons"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "036bxy0n3p0ivcdaymj11z0nw555xjxxj15ja0rpjsvq1mqamd80"; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_icons" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-icons"; + description = "Icons for SkyTemple"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f865b53404f..98f4c5273ad2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7691,6 +7691,8 @@ in { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; From d4cb1ca985a6a7e64f0d9c2e655fa0e49e891ebc Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:02:27 +0200 Subject: [PATCH 458/664] python3Packages.skytemple-rust: init at unstable-2021-05-30 --- .../python-modules/skytemple-rust/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-rust/default.nix diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix new file mode 100644 index 000000000000..d22d61099587 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, rustPlatform, setuptools-rust }: + +buildPythonPackage rec { + pname = "skytemple-rust"; + version = "unstable-2021-05-30"; # Contains build bug fixes, but is otherwise identical to 0.0.1.post0 + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = "cff8b2930af6d25d41331fab8c04f56a4fd75e95"; + sha256 = "18y6wwvzyw062zlv3gcirr1hgld9d97ffyrvy0jvw8nr3b9h9x0i"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1ypcsf9gbq1bz29kfn7g4kg8741mxg1lfcbb14a0vfhjq4d6pnx9"; + }; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_rust" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-rust"; + description = "Binary Rust extensions for SkyTemple"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98f4c5273ad2..de3077fc9ed7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7693,6 +7693,8 @@ in { skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; + skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; From 28ba38555f662b0fa08228837fc928389c5ee6ff Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:03:19 +0200 Subject: [PATCH 459/664] python3Packages.skytemple-files: init at 1.2.3 --- .../skytemple-files/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-files/default.nix diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix new file mode 100644 index 000000000000..cb03d73b4270 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: + +buildPythonPackage rec { + pname = "skytemple-files"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + }; + + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; + + doCheck = false; # requires Pokémon Mystery Dungeon ROM + pythonImportsCheck = [ "skytemple_files" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-files"; + description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de3077fc9ed7..2279a0d4b347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7691,6 +7691,8 @@ in { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skytemple-files = callPackage ../development/python-modules/skytemple-files { }; + skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; From c878cb5dbf114eba4b6322c17dab29946a726e4a Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:03:45 +0200 Subject: [PATCH 460/664] python3Packages.skytemple-dtef: init at 1.1.2 --- .../python-modules/skytemple-dtef/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-dtef/default.nix diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix new file mode 100644 index 000000000000..80bebd556968 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, skytemple-files }: + +buildPythonPackage rec { + pname = "skytemple-dtef"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc"; + }; + + propagatedBuildInputs = [ skytemple-files ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_dtef" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-dtef"; + description = "A format for standardized rule-based tilesets with 256 adjacency combinations"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2279a0d4b347..024ad8d46882 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7691,6 +7691,8 @@ in { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { }; + skytemple-files = callPackage ../development/python-modules/skytemple-files { }; skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; From b3d72fde9fea2daa96352727f91388d95419bd9b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:04:20 +0200 Subject: [PATCH 461/664] python3Packages.skytemple-ssb-debugger: init at 1.2.4 --- .../skytemple-ssb-debugger/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-ssb-debugger/default.nix diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix new file mode 100644 index 000000000000..88ae80f7242a --- /dev/null +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3 +, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools +, skytemple-files, skytemple-icons +}: + +buildPythonPackage rec { + pname = "skytemple-ssb-debugger"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "0jmsli3wg386y0lxwddpwp1xqxsn2bsy4d1f7dyh0jjz8lqiz03i"; + }; + + buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ + nest-asyncio + pycairo + py-desmume + pygtkspellcheck + setuptools + skytemple-files + skytemple-icons + ]; + + doCheck = false; # requires Pokémon Mystery Dungeon ROM + pythonImportsCheck = [ "skytemple_ssb_debugger" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-ssb-debugger"; + description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 024ad8d46882..8388e1346bdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7699,6 +7699,8 @@ in { skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; + skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; From b8ba235a52d9f2494fa820e9c8f25d2e2830d916 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:04:51 +0200 Subject: [PATCH 462/664] python3Packages.skytemple-eventserver: init at 1.0.0 --- .../skytemple-eventserver/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/skytemple-eventserver/default.nix diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix new file mode 100644 index 000000000000..123f4ba6d853 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "skytemple-eventserver"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1xcf7ljvi5ixhwx9rkg3hnwcyv4wsgd2yb6is11jffbrdp00j2bq"; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_eventserver" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-eventserver"; + description = "Websocket server that emits SkyTemple UI events"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8388e1346bdd..00b339af475f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7693,6 +7693,8 @@ in { skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { }; + skytemple-eventserver = callPackage ../development/python-modules/skytemple-eventserver { }; + skytemple-files = callPackage ../development/python-modules/skytemple-files { }; skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; From 34d772c8688129ec3f43eb8dba0658175c8432cd Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 30 May 2021 22:05:43 +0200 Subject: [PATCH 463/664] skytemple: init at 1.2.3 --- pkgs/applications/misc/skytemple/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/skytemple/default.nix diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix new file mode 100644 index 000000000000..a67d79f9bf90 --- /dev/null +++ b/pkgs/applications/misc/skytemple/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "skytemple"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; + }; + + buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = with python3Packages; [ + natsort + packaging + pycairo + pygal + pypresence + setuptools + skytemple-dtef + skytemple-eventserver + skytemple-files + skytemple-icons + skytemple-ssb-debugger + ]; + + doCheck = false; # there are no tests + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple"; + description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0a7aee3ad9..6672b49c3c8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8598,6 +8598,8 @@ in tex = texlive.combined.scheme-small; }; + skytemple = callPackage ../applications/misc/skytemple {}; + sleuthkit = callPackage ../tools/system/sleuthkit {}; # Not updated upstream since 2018, doesn't support qt newer than 5.12 From fbe60d186b79349632d1fd0e225f502c96628e0a Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Sun, 30 May 2021 18:05:51 -0400 Subject: [PATCH 464/664] neovim: always generate rplugin.vim (#124990) --- pkgs/applications/editors/neovim/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4defc2d43278..7fa15efd82cc 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -107,6 +107,7 @@ let '') + '' rm $out/bin/nvim + touch $out/rplugin.vim makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; From b72b3c557170013601ceffd8c94a40764d34d302 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 30 May 2021 18:26:05 -0400 Subject: [PATCH 465/664] xfitter: remove `hardeningDisable = [ "format" ];` Not needed after f42aa7e1 ('cc-wrapper: set FC when langFortran is on') --- pkgs/applications/science/physics/xfitter/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4390826ccee0..230f2f0e0efb 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { ./undefined_behavior.patch ]; - # patch needs to updated due to version bump - #CXXFLAGS = "-Werror=return-type"; - preConfigure = # Fix F77LD to workaround for a following build error: # @@ -48,8 +45,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; From 09202ef1a89aa9cda237a5c06aad9f8825a93b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 May 2021 01:00:54 +0200 Subject: [PATCH 466/664] spatialite_tools: 5.0.0 -> 5.0.1 --- pkgs/development/libraries/spatialite-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ee6d05247dc6..265769f872f4 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "spatialite-tools"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${pname}-${version}.tar.gz"; - sha256 = "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd"; + sha256 = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw="; }; nativeBuildInputs = [ pkg-config ]; From 2c988b6132f8b5bdaf490efd26f8d027366c7548 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 31 May 2021 01:15:05 +0200 Subject: [PATCH 467/664] plex: 1.23.0.4482-62106842a -> 1.23.1.4602-280ab6053 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6f29d336da12..32612d2e4521 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.0.4482-62106842a"; + version = "1.23.1.4602-280ab6053"; 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 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; + sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; + sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli"; }; outputs = [ "out" "basedb" ]; From 1f4163d8394b5fa933368d10853f106bebe9c18d Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 31 May 2021 01:16:46 +0200 Subject: [PATCH 468/664] fix deprecated sandbox.h features, causing impure syscalls on aarch64-darwin --- pkgs/tools/typesetting/lowdown/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index b9b5e806a4ec..2de00702a388 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -24,12 +24,20 @@ stdenv.mkDerivation rec { ''; # Fix lib extension so that fixDarwinDylibNames detects it - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString (stdenv.isDarwin && !stdenv.isAarch64) '' mv $lib/lib/liblowdown.{so,dylib} ''; patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; + patchPhase = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + substituteInPlace main.c \ + --replace '#elif HAVE_SANDBOX_INIT' '#elif 0' + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = "echo '# TEST' > test.md; $out/bin/lowdown test.md"; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "regress"; @@ -41,4 +49,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - From 29b5264841b5c82a5bf81f335b306c3a10229849 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 31 May 2021 00:29:06 +0100 Subject: [PATCH 469/664] postgresqlPackages.pg_partman: 4.4.1 -> 4.5.1 addressing CVE-2021-33204 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index fb690e96328d..d2e7dd37be15 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.4.1"; + version = "4.5.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-jFG2Zna97FHZin2V3Cwy5JcdeFh09Yy/eoyHtcCorPA="; + sha256 = "182yqvgcpgw99swn7w516f6d1bid2gnmf6dfsgmldx5viz0d6vi0"; }; installPhase = '' From 79c75e54e57590fabc14ba0b132cea864c140580 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 30 May 2021 22:15:00 +0900 Subject: [PATCH 470/664] vscode-extensions.B4dM4n.vscode-nixpkgs-fmt: init --- pkgs/misc/vscode-extensions/default.nix | 55 +++++++++++++++---------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6f61a94ca149..549b2785382a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -87,6 +87,18 @@ let }; }; + B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { name = "scaladex-search"; @@ -516,7 +528,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform {}; + hashicorp.terraform = callPackage ./terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -698,15 +710,16 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode.cpptools = callPackage ./cpptools { }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; - ms-python.python = let - raw-package = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; - in + ms-python.python = + let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in buildEnv { name = "vscode-extension-ms-python-python-full"; paths = [ raw-package self.ms-toolsai.jupyter ]; @@ -786,7 +799,7 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer {}; + matklad.rust-analyzer = callPackage ./rust-analyzer { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { @@ -1029,7 +1042,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1094,7 +1107,7 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; - WakaTime.vscode-wakatime = callPackage ./wakatime {}; + WakaTime.vscode-wakatime = callPackage ./wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1109,17 +1122,17 @@ let }; }; - aliases = self: super: { - # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; - }; + aliases = self: super: { + # aliases + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + }; - # TODO: add overrides overlay, so that we can have a generated.nix - # then apply extension specific modifcations to packages. + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. - # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals (config.allowAliases or true) [ aliases ]; + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; - toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in - lib.fix toFix +lib.fix toFix From c383345cc8fa978a71dc07d23acc4cd9eafcc934 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 27 May 2021 23:09:01 +0900 Subject: [PATCH 471/664] erlang: main R23 -> R24 --- pkgs/top-level/beam-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e4ce5b6d3c84..334aac359b37 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -6,11 +6,11 @@ rec { # Each interpreters = rec { - # R23 is the default version. - erlang = erlangR23; # The main switch to change default Erlang version. - erlang_odbc = erlangR23_odbc; - erlang_javac = erlangR23_javac; - erlang_odbc_javac = erlangR23_odbc_javac; + # R24 is the default version. + erlang = erlangR24; # The main switch to change default Erlang version. + erlang_odbc = erlangR24_odbc; + erlang_javac = erlangR24_javac; + erlang_odbc_javac = erlangR24_odbc_javac; # Standard Erlang versions, using the generic builder. From 1c979e4116d132dba334091878ad0bb5cfa966a0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:26:32 +0900 Subject: [PATCH 472/664] elixir 1_8: set erlang to R23 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 203668c3cb87..234f1d3a9990 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -63,7 +63,7 @@ let }; elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { - inherit erlang; + erlang = pkgs.beam.interpreters.erlangR23; debugInfo = true; }; From f5e242b7b625bab1e903c2e7c3021e02aea288ac Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:26:44 +0900 Subject: [PATCH 473/664] cl: set erlang to R23 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85af183b8bcd..6234cbceb9e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14438,7 +14438,9 @@ in chromaprint = callPackage ../development/libraries/chromaprint { }; - cl = callPackage ../development/libraries/cl { }; + cl = callPackage ../development/libraries/cl { + erlang = erlangR23; + }; clanlib = callPackage ../development/libraries/clanlib { }; From 8aee68a9f7e87a057c66e00bd445c64f64fe527e Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:39:18 +0900 Subject: [PATCH 474/664] rabbitmq-server: set erlang version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6234cbceb9e5..54998083704b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19692,7 +19692,7 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; elixir = beam_nox.interpreters.elixir_1_8; - erlang = erlang_nox; + erlang = beam_nox.interpreters.erlangR23; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; From 0e705d7a255efbc6d5e345985da46f34a4f4afae Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 21:19:26 +0900 Subject: [PATCH 475/664] relxExe: 3.32.1 -> 4.3.0 --- pkgs/development/tools/erlang/relx-exe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index 0f9d973e6773..890b90e4888f 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -2,18 +2,18 @@ rebar3Relx rec { name = "relx-exe"; - version = "3.32.1"; + version = "4.3.0"; releaseType = "escript"; src = fetchHex { pkg = "relx"; - sha256 = "0693k8ac7hvpm9jd3ysbdn8bk97d68ini22p1fsqdsi9qv9f7nq7"; + sha256 = "sha256-c44JSab8fQ3p5FSdwPc9m24FtTnhURuySFkHArMiBEA="; inherit version; }; checkouts = fetchRebar3Deps { inherit name version; src = "${src}/rebar.lock"; - sha256 = "0l7r3x7zwcz49013zv8z5v2i06p7wqkgzdyzrl8jk0hglscvhpf6"; + sha256 = "sha256-BY/c4+vqdnn4FBPzLExEZIZ27f1g46XISb8mIpMU8aI="; }; } From 2402d70ef36cb7b09575c7e21bd8ee70ec76d259 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 29 May 2021 08:43:32 +0900 Subject: [PATCH 476/664] relxExe: remove relxExe is not intended to be used as a single standalone executable, but as a library by rebar3 --- pkgs/development/beam-modules/default.nix | 1 - .../tools/erlang/relx-exe/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/tools/erlang/relx-exe/default.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 234f1d3a9990..0c184e0ba730 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -83,7 +83,6 @@ let # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex { }; webdriver = callPackage ./webdriver { }; - relxExe = callPackage ../tools/erlang/relx-exe { }; }; in makeExtensible packages diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix deleted file mode 100644 index 890b90e4888f..000000000000 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchHex, fetchRebar3Deps, rebar3Relx }: - -rebar3Relx rec { - name = "relx-exe"; - version = "4.3.0"; - releaseType = "escript"; - - src = fetchHex { - pkg = "relx"; - sha256 = "sha256-c44JSab8fQ3p5FSdwPc9m24FtTnhURuySFkHArMiBEA="; - inherit version; - }; - - checkouts = fetchRebar3Deps { - inherit name version; - src = "${src}/rebar.lock"; - sha256 = "sha256-BY/c4+vqdnn4FBPzLExEZIZ27f1g46XISb8mIpMU8aI="; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54998083704b..5f060afa922b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12099,8 +12099,7 @@ in inherit (beam.packages.erlang) erlang-ls rebar rebar3 rebar3WithPlugins - fetchHex beamPackages - relxExe; + fetchHex beamPackages; inherit (beam.packages.erlangR21) lfe lfe_1_3; From b62962b2746ac9b21d5d22583cd30e1bbdb63964 Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 31 May 2021 02:18:05 +0200 Subject: [PATCH 477/664] remove unneccecary substitute and aarch64 platform check --- pkgs/tools/typesetting/lowdown/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 2de00702a388..8c55985a404c 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + "echo 'HAVE_SANDBOX_INIT=0' > configure.local"; + configurePhase = '' runHook preConfigure ./configure PREFIX=''${!outputDev} \ @@ -24,17 +27,12 @@ stdenv.mkDerivation rec { ''; # Fix lib extension so that fixDarwinDylibNames detects it - postInstall = lib.optionalString (stdenv.isDarwin && !stdenv.isAarch64) '' + postInstall = lib.optionalString (stdenv.isDarwin) '' mv $lib/lib/liblowdown.{so,dylib} ''; patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; - patchPhase = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace main.c \ - --replace '#elif HAVE_SANDBOX_INIT' '#elif 0' - ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; installCheckPhase = "echo '# TEST' > test.md; $out/bin/lowdown test.md"; From 85d6f6f1f328ad78d963609e4fd5d091291c4bb0 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 31 May 2021 02:56:33 +0200 Subject: [PATCH 478/664] teamspeak_server: 3.13.3 -> 3.13.5 (#124601) --- .../instant-messengers/teamspeak/server.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e266265291b3..daa97b682176 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.3"; + version = "3.13.5"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw=" - else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c="; + then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY=" + else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; @@ -18,6 +18,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + # Install files. mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ @@ -26,18 +28,20 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver + + runHook postInstall ''; passthru.updateScript = writeScript "update-teampeak-server" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused jq pup set -eu -o pipefail version=$( \ - curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ - | grep softwareVersion \ - | sed -E -e 's/^.*([^<]+)<\/span>.*$/\1/' \ + curl https://www.teamspeak.com/en/downloads/ \ + | pup "#server .linux .version json{}" \ + | jq -r ".[0].text" ) versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") From 34c6163ed91a8ab4c0d1160590ccb510fb285a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Ch=C3=A9rel?= <6168820+guillaumecherel@users.noreply.github.com> Date: Mon, 31 May 2021 02:58:14 +0200 Subject: [PATCH 479/664] mblaze: fix mcom to use file utility. (#94881) Co-authored-by: Sandro --- .../networking/mailreaders/mblaze/default.nix | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 278561e0e5f4..f24ed3a51df6 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }: +{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused +, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby +}: stdenv.mkDerivation rec { pname = "mblaze"; version = "1.1"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { @@ -22,6 +24,24 @@ stdenv.mkDerivation rec { installShellCompletion contrib/_mblaze '' + lib.optionalString (ruby != null) '' install -Dt $out/bin contrib/msuck contrib/mblow + + # The following wrappings are used to preserve the executable + # names (the value of $0 in a script). The script mcom is + # designed to be run directly or via symlinks such as mrep. Using + # symlinks changes the value of $0 in the script, and makes it + # behave differently. When using the wrapProgram tool, the resulting + # wrapper breaks this behaviour. The following wrappers preserve it. + + mkdir -p $out/wrapped + for x in mcom mbnc mfwd mrep; do + mv $out/bin/$x $out/wrapped + makeWrapper $out/wrapped/$x $out/bin/$x \ + --argv0 $out/bin/$x \ + --prefix PATH : $out/bin \ + --prefix PATH : ${lib.makeBinPath [ + coreutils file gawk gnugrep gnused + ]} + done ''; meta = with lib; { From a57fcabd330f5ad90246f6560a61e574aa14fc13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 01:49:11 +0000 Subject: [PATCH 480/664] ckan: 1.30.2 -> 1.30.4 --- pkgs/games/ckan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 050a11a5ce1e..3649369aeaad 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.30.2"; + version = "1.30.4"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-ggmUsJb3xKpI3ygTmzR5f3na/oU4OEa3r3edjlN5R+Q="; + sha256 = "sha256-IgPqUEDpaIuGoaGoH2GCEzh3KxF3pkJC3VjTYXwSiQE="; }; dontUnpack = true; From 3f4d1d89aa921eb86ff4fc8c7e61650e514b607b Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 31 May 2021 10:52:51 +0900 Subject: [PATCH 481/664] vscode-extensions.alefragnani.project-manager: init 12.1.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 549b2785382a..e56f3293b6ed 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ let }; }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "project-manager"; + publisher = "alefragnani"; + version = "12.1.0"; + sha256 = "sha256-fYBKmWn9pJh2V0fGdqVrXj9zIl8oTrZcBycDaMOXL/8="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { mktplcRef = { name = "copy-relative-path"; From 67191e0bd08e26616c6b1a46bd9d717192664dbf Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 31 May 2021 11:00:02 +0900 Subject: [PATCH 482/664] vscode-extensions.svelte.svelte-vscode: init 105.0.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 549b2785382a..93ede63279ae 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -968,6 +968,18 @@ let }; }; + svelte.svelte-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "svelte-vscode"; + publisher = "svelte"; + version = "105.0.0"; + sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; From af25be16236399e319e11a4b2cb8f707dedb1c4b Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 31 May 2021 11:05:02 +0900 Subject: [PATCH 483/664] vscode-extensions.bradlc.vscode-tailwindcss: init 0.6.6 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 549b2785382a..622b05cd0903 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -123,6 +123,18 @@ let }; }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tailwindcss"; + publisher = "bradlc"; + version = "0.6.6"; + sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + }; + meta = with lib; { + license = licenses.mpl20; + }; + }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixfmt-vscode"; From 259bf508105c7007c366090ab75c31dba503256b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 30 May 2021 22:10:20 -0400 Subject: [PATCH 484/664] lowdown: remove extra brackets --- pkgs/tools/typesetting/lowdown/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 8c55985a404c..e7280f06529e 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # Fix lib extension so that fixDarwinDylibNames detects it - postInstall = lib.optionalString (stdenv.isDarwin) '' + postInstall = lib.optionalString stdenv.isDarwin '' mv $lib/lib/liblowdown.{so,dylib} ''; From 3a4f245d86faf4e117db1f6f4515f68998b92700 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 03:04:33 +0000 Subject: [PATCH 485/664] elinks: 0.14.0 -> 0.14.1 --- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 9a7551a6fff4..df9fc3f822cd 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-LxJJ0yBlw9hJ/agyL9dbVe4STKdXE8rtk1mMFqe1fFI="; + sha256 = "sha256-D7dUVHgYGzY4FXEnOzXw0Fao3gLgfFuCl8LJdLVpcSM="; }; buildInputs = [ From 879e6926ce663313b336974bb28dbaf10967b195 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Thu, 15 Apr 2021 13:32:28 -0600 Subject: [PATCH 486/664] maintainers: add kennyballou Signed-off-by: Kenny Ballou --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4235741d38d8..bb992d90509f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5178,6 +5178,16 @@ githubId = 37185887; name = "Calvin Kim"; }; + kennyballou = { + email = "kb@devnulllabs.io"; + github = "kennyballou"; + githubId = 2186188; + name = "Kenny Ballou"; + keys = [{ + longkeyid = "rsa4096/0xB0CAA28A02958308"; + fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; + }]; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; From 7ff8b88e6ea79db0f4a1314d46997ad37f0704a8 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 7 May 2021 08:13:13 -0600 Subject: [PATCH 487/664] akonadi-calendar-tools: init 20.12.3 Borrowing expressions from a stalled/stale PR: NixOS/nixpkgs#98212. Co-authored-by: freezeboy Signed-off-by: Kenny Ballou --- .../kde/akonadi-calendar-tools.nix | 24 +++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/kde/akonadi-calendar-tools.nix diff --git a/pkgs/applications/kde/akonadi-calendar-tools.nix b/pkgs/applications/kde/akonadi-calendar-tools.nix new file mode 100644 index 000000000000..64fe3e1f4388 --- /dev/null +++ b/pkgs/applications/kde/akonadi-calendar-tools.nix @@ -0,0 +1,24 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, akonadi +, calendarsupport +}: + +mkDerivation { + pname = "akonadi-calendar-tools"; + meta = { + homepage = "https://github.com/KDE/akonadi-calendar-tools"; + description = "Console applications and utilities for managing calendars in Akonadi"; + license = with lib.licenses; [ gpl2Plus cc0 ]; + maintainers = with lib.maintainers; [ kennyballou ]; + platforms = lib.platforms.linux; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi + calendarsupport + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 18e857a24713..f375ea1d9f48 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -68,6 +68,7 @@ let in { akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; From af22c928fc87dcdc0396e6efc9fa1909d23603f9 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 7 May 2021 08:19:13 -0600 Subject: [PATCH 488/664] kaccounts-providers: init 20.12.3 Borrowing expressions from a stalled/stale PR: NixOS/nixpkgs#98212. Co-authored-by: freezeboy Signed-off-by: Kenny Ballou --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kaccounts-providers.nix | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/kde/kaccounts-providers.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f375ea1d9f48..d501375126cd 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -94,6 +94,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; + kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/kaccounts-providers.nix b/pkgs/applications/kde/kaccounts-providers.nix new file mode 100644 index 000000000000..e0e5ee3cd326 --- /dev/null +++ b/pkgs/applications/kde/kaccounts-providers.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, accounts-qt +, extra-cmake-modules +, intltool +, kaccounts-integration +, kcmutils +, kcoreaddons +, kdeclarative +, kdoctools +, kio +, kpackage +, kwallet +, qtwebengine +, signond +}: + +mkDerivation { + pname = "kaccounts-providers"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online account providers"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + intltool + kdoctools + ]; + buildInputs = [ + accounts-qt + kaccounts-integration + kcmutils + kcoreaddons + kdeclarative + kio + kpackage + kwallet + qtwebengine + signond + ]; +} From 28c3c08b5323d9818ee38f1d3f63af8cd43056fb Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 7 May 2021 08:19:39 -0600 Subject: [PATCH 489/664] kio-gdrive: init 20.12.3 Borrowing expressions from a stalled/stale PR: NixOS/nixpkgs#98212. Co-authored-by: freezeboy Signed-off-by: Kenny Ballou --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kio-gdrive.nix | 36 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/kde/kio-gdrive.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d501375126cd..686007588410 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -139,6 +139,7 @@ let kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kio-gdrive = callPackage ./kio-gdrive.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; klettres = callPackage ./klettres.nix {}; diff --git a/pkgs/applications/kde/kio-gdrive.nix b/pkgs/applications/kde/kio-gdrive.nix new file mode 100644 index 000000000000..0be35469d406 --- /dev/null +++ b/pkgs/applications/kde/kio-gdrive.nix @@ -0,0 +1,36 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, libkgapi +, kcalendarcore +, kcontacts +, qtkeychain +, libsecret +, kaccounts-integration +}: + +mkDerivation { + pname = "kio-gdrive"; + meta = with lib; { + homepage = "https://github.com/KDE/kio-gdrive"; + description = "KIO slave for Google APIs"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcalendarcore + kcontacts + kaccounts-integration + libkgapi + libsecret + kio + qtkeychain + ]; +} From 768621c16b475e71538ab8b7bb099fa77aa6d59e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 03:18:01 +0000 Subject: [PATCH 490/664] esbuild: 0.12.1 -> 0.12.5 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2dfb58013dd7..f0f8c156dbdf 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.1"; + version = "0.12.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-X+mWuGm6hpTofoZSpM9U2GmYlETMH7MuYwk4ahFSyVE="; + sha256 = "sha256-9EVlmdolr189vdnuA01UUrcrmZ9W0FtvCcJuuSX1nLs="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From eec2131b93aeb8bf628e1403fe2bbaec926522c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 02:51:54 +0000 Subject: [PATCH 491/664] dua: 2.12.0 -> 2.12.1 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d53676f91d6f..a7de0183b673 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.0"; + version = "2.12.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-YCpWi5+p+d9YG8YEKRbppcX5/IizI1FnUfcnaoCGZNM="; + sha256 = "sha256-ZJCixDh2+H+G+lVgxw9H61Xy4hMg+3MbhI+e7sU4GQU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-WFxDY4K257QE/tH4B2c3qOzVG3t1RUh4lWRMzqyBC14="; + cargoSha256 = "sha256-rwgvyfjCBPe20xN6gNXBexjN/BwNhZjT1RtabKhCkJs="; doCheck = false; From b1e1a50c0091bad2200271bfce8939a25b5648fd Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 30 May 2021 21:59:29 -0700 Subject: [PATCH 492/664] libjpeg-turbo: Fix tests on RISC-V This fixes the tests on RISC-V caused by floating point behavior differences (see linked upstream issue). --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f2d4e00d1aad..1ac842e5593c 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ] ++ lib.optionals enableJava [ "-DWITH_JAVA=1" + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 + "-DFLOATTEST=fp-contract" ]; doInstallCheck = true; From f924460e91cba6473c5dc4b8ccb1a1cfc05bc2d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 30 May 2021 23:46:01 +0200 Subject: [PATCH 493/664] =?UTF-8?q?ijq:=200.2.3=20=E2=86=92=200.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/gpanders/ijq/compare/v0.2.3...v0.3.4 --- pkgs/development/tools/ijq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 0b0af79301ef..f3c0b6c7b1b8 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ijq"; - version = "0.2.3"; + version = "0.3.4"; src = fetchgit { url = "https://git.sr.ht/~gpanders/ijq"; rev = "v${version}"; - sha256 = "14n54jh5387jf97zhc7aidn7w60zp5624xbvq4jdbsh96apg3bk1"; + sha256 = "ZKxEK6SPxEC0S5yXSzITPn0HhpJa4Bcf9X8/N+ZZAeA="; }; - vendorSha256 = "0xbni6lk6y3ig7pj2234fv7ra6b8qv0k8m3bvh59wwans8xpihzb"; + vendorSha256 = "04KlXE2I8ZVDbyo9tBnFskLB6fo5W5/lPzSpo8KGqUU="; nativeBuildInputs = [ makeWrapper ]; From 5d64abee44f4b7b13e16ea910eadcb79c998c2e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 05:17:21 +0000 Subject: [PATCH 494/664] goreleaser: 0.166.0 -> 0.166.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index fb7bb2f9648d..a5c3fbad32d9 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.166.0"; + version = "0.166.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4D8KiTGuiJ0y1w3NdWcOs5q61kuIIZ49ys18wMb3fXI="; + sha256 = "sha256-+8hh4BR6sTpQyNeiaXgcp/ezPptvbZESky6VAAg1dfI="; }; - vendorSha256 = "sha256-UI/cz9xZYi6BU/4MK/Qup55Kc1yv6DQHCEJM/I5oMec="; + vendorSha256 = "sha256-PkSvdpP9SuftxdcZMA5xG1zSb87e1Ui/oX+HdLBEW0E="; buildFlagsArray = [ "-ldflags=" From 2cc146464c720a93789d6f12852af0b7133cab0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 06:20:10 +0000 Subject: [PATCH 495/664] janet: 1.15.5 -> 1.16.0 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index b55c4b613a24..4c836264017b 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.15.5"; + version = "1.16.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-szqH2Qqc+AKTuoZjYHhTmiHcFQ+PMsljh0RSD/q4gD4="; + sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems="; }; nativeBuildInputs = [ meson ninja ]; From 660c4a822c1631016060ab3420ae467dabaa508e Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sun, 30 May 2021 14:20:21 +0200 Subject: [PATCH 496/664] libiio: fix build with wrong libxml2 find_package Co-authored-by: Dmitry Kalinkin --- .../libiio/cmake-fix-libxml2-find-package.patch | 13 +++++++++++++ pkgs/development/libraries/libiio/default.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch diff --git a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch new file mode 100644 index 000000000000..25345bef90c4 --- /dev/null +++ b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch @@ -0,0 +1,13 @@ +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200 ++++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200 +@@ -333,7 +333,7 @@ + # So, try first to find the CMake module provided by libxml2 package, then fallback + # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially + # in static build case). +-find_package(LibXml2 QUIET NO_MODULE) ++find_package(LibXml2 QUIET MODULE) + if(DEFINED LIBXML2_VERSION_STRING) + set(LIBXML2_FOUND ON) + set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) +Seulement dans b: good.patch diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 043e27fb4b2a..e704076ab57a 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; }; + # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is + # fixed properly + patches = [ ./cmake-fix-libxml2-find-package.patch ]; + nativeBuildInputs = [ cmake flex From db89e667afcca79a329afd3a71b22a7177014124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Mon, 31 May 2021 08:41:18 +0200 Subject: [PATCH 497/664] Update pkgs/tools/typesetting/lowdown/default.nix Co-authored-by: Dmitry Kalinkin --- pkgs/tools/typesetting/lowdown/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e7280f06529e..257f02e0dd3a 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -34,7 +34,12 @@ stdenv.mkDerivation rec { patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckPhase = "echo '# TEST' > test.md; $out/bin/lowdown test.md"; + installCheckPhase = '' + runHook preInstallCheck + echo '# TEST' > test.md + lowdown test.md + runHook postInstallCheck + ''; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "regress"; From 33e9bc9b4388f7733442daccca8ae94e5f1db573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Mon, 31 May 2021 08:41:51 +0200 Subject: [PATCH 498/664] Update pkgs/tools/typesetting/lowdown/default.nix Co-authored-by: Dmitry Kalinkin --- pkgs/tools/typesetting/lowdown/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 257f02e0dd3a..174052b9aecb 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + echo 'HAVE_SANDBOX_INIT=0' > configure.local + '' "echo 'HAVE_SANDBOX_INIT=0' > configure.local"; configurePhase = '' From 05ddbbe148deac00c8ecbaae5c9ffe4d9124f3e7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 31 May 2021 02:43:09 -0400 Subject: [PATCH 499/664] lowdown: fix preConfigure --- pkgs/tools/typesetting/lowdown/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 174052b9aecb..6e8da3dd110b 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' echo 'HAVE_SANDBOX_INIT=0' > configure.local - '' - "echo 'HAVE_SANDBOX_INIT=0' > configure.local"; + ''; configurePhase = '' runHook preConfigure From 47c2be0ad02b8a73bfd9c7e892fd7d3f3cfcff7d Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 31 May 2021 08:46:09 +0200 Subject: [PATCH 500/664] cleanup from github suggestions --- pkgs/tools/typesetting/lowdown/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 174052b9aecb..e45eda3326a1 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' echo 'HAVE_SANDBOX_INIT=0' > configure.local - '' - "echo 'HAVE_SANDBOX_INIT=0' > configure.local"; + ''; configurePhase = '' runHook preConfigure @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { installCheckPhase = '' runHook preInstallCheck echo '# TEST' > test.md - lowdown test.md + $out/bin/lowdown test.md runHook postInstallCheck ''; From b4d29b878b49c1d81104fd60677e2e8e13f6cd06 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 31 May 2021 01:47:47 -0600 Subject: [PATCH 501/664] powerline-mem-segment: init at 2.4.1 (#123978) Co-authored-by: Sandro --- .../powerline-mem-segment/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/powerline-mem-segment/default.nix diff --git a/pkgs/development/python-modules/powerline-mem-segment/default.nix b/pkgs/development/python-modules/powerline-mem-segment/default.nix new file mode 100644 index 000000000000..7bc38f2227ae --- /dev/null +++ b/pkgs/development/python-modules/powerline-mem-segment/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +}: + +buildPythonPackage rec { + pname = "powerline-mem-segment"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0507zw7g449zk7dcq56adcdp71inbqfdmp6y5yk4x4j7kkp6pii9"; + }; + + propagatedBuildInputs = [ psutil ]; + + pythonImportsCheck = [ "powerlinemem" ]; + + meta = with lib; { + description = "Segment for Powerline showing the current memory usage in percent or absolute values."; + homepage = "https://github.com/mKaloer/powerline_mem_segment"; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ba0532782a..1855f5c24fcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5239,6 +5239,8 @@ in { powerline = callPackage ../development/python-modules/powerline { }; + powerlineMemSegment = callPackage ../development/python-modules/powerline-mem-segment { }; + pox = callPackage ../development/python-modules/pox { }; poyo = callPackage ../development/python-modules/poyo { }; From 3b941360f20914a3d8747228e0fb6997ebe88979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Topuzovi=C4=87?= Date: Sun, 30 May 2021 11:49:09 +0100 Subject: [PATCH 502/664] python3Packages.solo-python: 0.0.27 -> 0.0.30 solo-python since version 0.0.28 supports fido2 >= v0.9 therefore no longer broken --- pkgs/development/python-modules/solo-python/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 8d84ce34eb95..88df4e50fbc4 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solo-python"; - version = "0.0.27"; + version = "0.0.30"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -22,7 +22,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE="; + sha256 = "1i9kybp08qfcdx6m4wl7ij40y1v17mvvhcdg7zglwfakblf69w41"; }; # replaced pinned fido, with unrestricted fido version @@ -60,8 +60,5 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; - # solo-python v0.0.27 does not support fido2 >= v0.9 - # https://github.com/solokeys/solo-python/issues/110 - broken = true; }; } From 20b1b6e68ba4db1b39ac49280c0d83e811a5c19a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 31 May 2021 00:17:59 +0200 Subject: [PATCH 503/664] schismtracker: 20200412 -> 20210525 --- .../audio/schismtracker/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 797d2c1d7337..7e276e072247 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , autoreconfHook -, alsaLib, python, SDL }: +, alsaLib +, python +, SDL +}: stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20200412"; + version = "20210525"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; + sha256 = "06ybkbqry7f7lmzgwb9s7ipafshl5gdj98lcjsjkcbnywj8r9b3h"; }; configureFlags = [ "--enable-dependency-tracking" ] @@ -23,8 +28,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; }; } From ee4b583ae8b11a38065ed7aa3eef01389f44b30f Mon Sep 17 00:00:00 2001 From: embr Date: Mon, 31 May 2021 10:47:46 +0200 Subject: [PATCH 504/664] bozohttpd: minor formatting The Nix style guide isn't exactly comprehensive, but this at least seems slightly closer to the examples: https://nixos.org/manual/nixpkgs/stable/#sec-syntax I'm annoyed that nixpkgs-fmt as of writing won't accept: COPTS = [ # ... ] ++ optional (...) "..." ++ optional (...) "..."; ...which seems to be the actual convention, looking at eg. pkgs.nginx. --- pkgs/servers/http/bozohttpd/default.nix | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 32a21f842643..9a3526d380e1 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -45,25 +45,24 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ] ++ optional (luaSupport) lua; nativeBuildInputs = [ bmake groff ]; - COPTS = - [ - "-D_DEFAULT_SOURCE" - "-D_GNU_SOURCE" + COPTS = [ + "-D_DEFAULT_SOURCE" + "-D_GNU_SOURCE" - # Ensure that we can serve >2GB files even on 32-bit systems. - "-D_LARGEFILE_SOURCE" - "-D_FILE_OFFSET_BITS=64" + # ensure that we can serve >2GB files even on 32-bit systems. + "-D_LARGEFILE_SOURCE" + "-D_FILE_OFFSET_BITS=64" - # unpackaged dependency: https://man.netbsd.org/blocklist.3 - "-DNO_BLOCKLIST_SUPPORT" - ] - ++ optional (!userSupport) "-DNO_USER_SUPPORT" - ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" - ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT" - ++ optional (!luaSupport) "-DNO_LUA_SUPPORT" - ++ optional (!sslSupport) "-DNO_SSL_SUPPORT" - ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" - ++ optional (htpasswdSupport) "-DDO_HTPASSWD"; + # unpackaged dependency: https://man.netbsd.org/blocklist.3 + "-DNO_BLOCKLIST_SUPPORT" + ] + ++ optional (!userSupport) "-DNO_USER_SUPPORT" + ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" + ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT" + ++ optional (!luaSupport) "-DNO_LUA_SUPPORT" + ++ optional (!sslSupport) "-DNO_SSL_SUPPORT" + ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" + ++ optional (htpasswdSupport) "-DDO_HTPASSWD"; _LDADD = [ "-lcrypt" "-lm" ] ++ optional (luaSupport) "-llua" From 37c63402f29f78e67e54ac5dcae91c60253fbad9 Mon Sep 17 00:00:00 2001 From: Vincent Cui Date: Fri, 14 May 2021 20:21:10 +0200 Subject: [PATCH 505/664] yaru-remix-theme: init at 40 --- pkgs/data/themes/yaru-remix/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/themes/yaru-remix/default.nix diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/data/themes/yaru-remix/default.nix new file mode 100644 index 000000000000..87056583b555 --- /dev/null +++ b/pkgs/data/themes/yaru-remix/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: + +stdenv.mkDerivation rec { + pname = "yaru-remix"; + version = "40"; + + src = fetchFromGitHub { + owner = "Muqtxdir"; + repo = pname; + rev = "v${version}"; + sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c"; + }; + + nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + + dontDropIconThemeCache = true; + + postPatch = "patchShebangs ."; + + meta = with lib; { + description = "Fork of the Yaru GTK theme"; + homepage = "https://github.com/Muqtxdir/yaru-remix"; + license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ hoppla20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34540ed59b1e..88b064171daf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22354,6 +22354,8 @@ in yaru-theme = callPackage ../data/themes/yaru {}; + yaru-remix-theme = callPackage ../data/themes/yaru-remix {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { inherit (plasma5Packages) breeze-icons; }; From a75c0a7f8702f62258300de15ce99216d0a12e92 Mon Sep 17 00:00:00 2001 From: embr Date: Mon, 31 May 2021 10:53:33 +0200 Subject: [PATCH 506/664] bozohttpd: experimental darwin compat patch As far as I can tell, libSystem on darwin provides a libm compatibility symlink, but not a libcrypt one. Prior art (eg. CPython) appears to use `stdenv.isDarwin` as a proxy for `stdenv.hostPlatform.libc == "libSystem"`, but the latter also works in cases where we're building on Darwin, but with eg. musl for some reason. --- pkgs/servers/http/bozohttpd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 9a3526d380e1..c01be041e86f 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation rec { ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" ++ optional (htpasswdSupport) "-DDO_HTPASSWD"; - _LDADD = [ "-lcrypt" "-lm" ] + _LDADD = [ "-lm" ] + ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt" ++ optional (luaSupport) "-llua" ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; makeFlags = [ "LDADD=$(_LDADD)" "prefix=$(out)" "MANDIR=$(out)/share/man" "BINOWN=" ]; From d80b17d530badbd7792ad6dcfc5e4584211e3a97 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Sun, 30 May 2021 10:25:30 +0000 Subject: [PATCH 507/664] maintainers: init tfc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bb992d90509f..36738748f292 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10013,6 +10013,12 @@ githubId = 27386; name = "Milan Svoboda"; }; + tfc = { + email = "jacek@galowicz.de"; + github = "tfc"; + githubId = 29044; + name = "Jacek Galowicz"; + }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; From 8e17ef825d681e0e684ef4dad62c20c660722228 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 10:09:21 +0000 Subject: [PATCH 508/664] armadillo: 10.5.0 -> 10.5.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index ee557ba6067e..9e81ce0c6c8f 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-6pkMNNxtcNfJW0NU2fOwgZveJX27Z3ljSOkeGWCCy4c="; + sha256 = "sha256-lq1uHLzyjz0cH/ly3ixA2t3b12gyVrrVAtPEY9L2TN8="; }; nativeBuildInputs = [ cmake ]; From 15aa45fe70ffc7359623c16c3a76f5e22a8917e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 May 2021 12:17:21 +0200 Subject: [PATCH 509/664] python3Packages.pymata-express: 1.19 -> 1.20 --- pkgs/development/python-modules/pymata-express/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix index 1a50a91a3092..69d7585e8a5d 100644 --- a/pkgs/development/python-modules/pymata-express/default.nix +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -2,20 +2,19 @@ , buildPythonPackage , fetchFromGitHub , pyserial -, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pymata-express"; - version = "1.19"; + version = "1.20"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MrYsLab"; repo = pname; rev = "v${version}"; - sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79"; + sha256 = "sha256-spYmd+Cb7Ej5FmniuJYAVVmq0mhOz5fu4+2UUXctRWs="; }; propagatedBuildInputs = [ pyserial ]; From c2260adb3ef7f5ba17397b85a4fdf8099e777104 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 May 2021 12:19:23 +0200 Subject: [PATCH 510/664] gdu: 5.0.0 -> 5.0.1 --- pkgs/tools/system/gdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index da629e3de35d..629085d346f6 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d1CErJ/vorfXgQCnSfPcM/6iIixPwFXndDqFv+mBhwY="; + sha256 = "sha256-78eQinKR4w7K8MFd4uyj5IPkUs0Mz5XeO7JUG/1cKLw="; }; - vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; + vendorSha256 = "sha256-9upXhTvQJ9oFfomgqja3SiifiZpl8RUQ85HwL9bDPlQ="; nativeBuildInputs = [ installShellFiles ]; From fe414b367d0119fe72850e063671142d2a252f99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 10:58:03 +0000 Subject: [PATCH 511/664] cbonsai: 1.1.1 -> 1.2.0 --- pkgs/games/cbonsai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 42e89d235df7..eda9e37752e6 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.2.0"; pname = "cbonsai"; src = fetchFromGitLab { owner = "jallbrit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IgtBHy6JCuTTXL0GNnaRCLrmQ9QDatK15WvrBBvux6s="; + sha256 = "sha256-j3RNCUxNyphZy5c7ZcKwyVbcYt7l6wiB+r7P3sWPFwA="; }; nativeBuildInputs = [ pkg-config ]; From bcc35ef63fbabdd9e0b03213fb4af67dedf4c359 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 May 2021 13:31:09 +0200 Subject: [PATCH 512/664] firefox: 88.0.1 -> 89.0 https://www.mozilla.org/en-US/firefox/89.0/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 05f2524f9492..b4d87b859ae6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "88.0.1"; + ffversion = "89.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934"; + sha512 = "5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3"; }; meta = { From 10f8f0826788c602e086b4a429a2741848f69cab Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 29 May 2021 12:50:32 +0200 Subject: [PATCH 513/664] bmake: 20200902 -> 20210420 * Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl. --- .../tools/build-managers/bmake/default.nix | 42 +++++++++++++++++-- .../bmake/fix-localtime-test.patch | 23 ++++++++++ .../bmake/fix-unexport-env-test.patch | 14 +++---- 3 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index d2b0e5a45dba..a93de053c446 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,21 +1,45 @@ -{ lib, stdenv, fetchurl -, getopt +{ lib, stdenv, fetchurl, fetchpatch +, getopt, tzdata }: stdenv.mkDerivation rec { pname = "bmake"; - version = "20200902"; + version = "20210420"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1v1v81llsiy8qbpy38nml1x08dhrihwh040pqgwbwb9zy1108b08"; + sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7"; }; + # Make tests work with musl + # * Disable deptgt-delete_on_error test (alpine does this too) + # * Fix test failing due to different strerror(3) output for musl and glibc + postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d' + substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" + ''; + nativeBuildInputs = [ getopt ]; patches = [ + # make bootstrap script aware of the prefix in /nix/store ./bootstrap-fix.patch + # preserve PATH from build env in unit tests ./fix-unexport-env-test.patch + # Fix localtime tests without global /etc/zoneinfo directory + ./fix-localtime-test.patch + # decouple tests from build phase + (fetchpatch { + name = "separate-tests.patch"; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; + sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a"; + }) + # add a shebang to bmake's install(1) replacement + (fetchpatch { + name = "install-sh.patch"; + url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; + sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6"; + }) ]; # The generated makefile is a small wrapper for calling ./boot-strap @@ -43,6 +67,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doCheck = true; + checkInputs = [ tzdata ]; + checkPhase = '' + runHook preCheck + + ./boot-strap -o . op=test + + runHook postCheck + ''; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch b/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch new file mode 100644 index 000000000000..b377292cce28 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch @@ -0,0 +1,23 @@ +--- bmake/unit-tests/Makefile.orig 2021-05-30 14:24:38.822484317 +0200 ++++ bmake/unit-tests/Makefile 2021-05-31 13:25:21.645751428 +0200 +@@ -455,7 +455,8 @@ + ENV.varmisc= FROM_ENV=env + ENV.varmisc+= FROM_ENV_BEFORE=env + ENV.varmisc+= FROM_ENV_AFTER=env +-ENV.varmod-localtime+= TZ=Europe/Berlin ++# Set absolute path to tz file since musl doesn't support TZDIR ++ENV.varmod-localtime+= TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin + ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2 + + # Override make flags for some of the tests; default is -k. +--- bmake/unit-tests/varmod-localtime.mk.orig 2021-05-30 14:30:34.397986246 +0200 ++++ bmake/unit-tests/varmod-localtime.mk 2021-05-31 13:24:41.430906606 +0200 +@@ -3,7 +3,7 @@ + # Tests for the :localtime variable modifier, which formats a timestamp + # using strftime(3) in local time. + +-.if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile ++.if ${TZ} != ":${TZDIR}/Europe/Berlin" # see unit-tests/Makefile + . error + .endif + diff --git a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch index 339348f37c32..fbf7225a6d6f 100644 --- a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch +++ b/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch @@ -1,13 +1,13 @@ ---- bmake/unit-tests/unexport-env.mk.orig 2019-02-19 10:24:14.356713136 -0800 -+++ bmake/unit-tests/unexport-env.mk 2019-02-19 10:25:43.838775388 -0800 -@@ -3,8 +3,8 @@ - # pick up a bunch of exported vars +--- bmake/unit-tests/unexport-env.mk.orig 2021-05-27 14:44:45.263392298 +0200 ++++ bmake/unit-tests/unexport-env.mk 2021-05-27 14:46:46.188881996 +0200 +@@ -4,8 +4,8 @@ + FILTER_CMD= grep ^UT_ .include "export.mk" -# an example of setting up a minimal environment. --PATH = /bin:/usr/bin:/sbin:/usr/sbin +-PATH= /bin:/usr/bin:/sbin:/usr/sbin +# preserve PATH so commands used in the "all" target are still available -+PATH := ${PATH} ++PATH := ${PATH} # now clobber the environment to just PATH and UT_TEST - UT_TEST = unexport-env + UT_TEST= unexport-env From 2c1ac935d5903ca4740b4f6694cb3e95e27dacaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 May 2021 13:40:51 +0200 Subject: [PATCH 514/664] rust-cbindgen: 0.18.0 -> 0.19.0 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 2e3391de94e2..c1bc2fb4c07b 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "sha256-S3t1hv/mRn6vwyzT78DPIacqiJV3CnjGdOKsdSyYs8g="; + sha256 = "0753dklr5lm1dmk6hy5khh8k3xyr5srfsq11l07685h71j7z0r00"; }; - cargoSha256 = "1ycvbdgd50l1nahq63zi9yp3793smkswlwhsqjrmws5b1fqzv9w0"; + cargoSha256 = "0qyw0iqin7i31kk23ddsmywk7z0xxpd5n4q6dr6mf44y35a8krm8"; buildInputs = lib.optional stdenv.isDarwin Security; From 0e7ee4d6a05201a08944f81c33337a72b84fa5d0 Mon Sep 17 00:00:00 2001 From: sveitser Date: Mon, 26 Apr 2021 09:21:40 +0800 Subject: [PATCH 515/664] python3Packages.black: 20.8b1 -> 21.5b1 - Avoid excluding files during tests by setting a project root. - Enable some previously disabled tests. --- pkgs/development/python-modules/black/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 3346afbb4ab9..0ce3b8d0eaea 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -8,6 +8,7 @@ , dataclasses , mypy-extensions , pathspec +, parameterized , regex , toml , typed-ast @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "black"; - version = "20.8b1"; + version = "21.5b1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1spv6sldp3mcxr740dh3ywp25lly9s8qlvs946fin44rl1x5a0hw"; + sha256 = "1cdkrl5vw26iy7s23v2zpr39m6g5xsgxhfhagzzflgfbvdc56s93"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -30,19 +31,19 @@ buildPythonPackage rec { # Black starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook parameterized ]; preCheck = '' export PATH="$PATH:$out/bin" + + # The top directory /build matches black's DEFAULT_EXCLUDE regex. + # Make /build the project root for black tests to avoid excluding files. + touch ../.git ''; disabledTests = [ - # Don't know why these tests fails - "test_cache_multiple_files" - "test_failed_formatting_does_not_get_cached" # requires network access "test_gen_check_output" - "test_process_queue" ] ++ lib.optionals stdenv.isDarwin [ # fails on darwin "test_expression_diff" From f61dc8420d1b7287fc654f1e108a3743e4cd74d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 12:06:23 +0000 Subject: [PATCH 516/664] bpytop: 1.0.65 -> 1.0.66 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 8cb3c16bebb9..9820e6ac00d4 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.65"; + version = "1.0.66"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sWANeoUbvnrTksqfeIRU4a5XeX7QVzT9+ZT3R5Utp+4="; + sha256 = "sha256-gggsZHKbEt4VSMNTkKGFLcPPt2uHRFDCkqyHYx0c9Y0="; }; nativeBuildInputs = [ makeWrapper ]; From 29c70d515a827c043fcef37ddbb675cd620f9301 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 31 May 2021 15:09:22 +0300 Subject: [PATCH 517/664] jitsi-meet-electron: 2.8.5 -> 2.8.6 --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 363d123dbe12..27bc38cf6c2c 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.5"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0r3jj3qjx38l1g733vhrwcm2yg7ppp23ciz84x2kqq51mlzr84c6"; + sha256 = "sha256-kLX8SZERlyNVSvszkV/fkQh/Z/Z20PAPJ9eug2oKlqI="; name = "${pname}-${version}.AppImage"; }; From 223a1e1bb4ab9a8c18da8a3b4147a1d08899a946 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 31 May 2021 08:14:59 -0400 Subject: [PATCH 518/664] Revert "release.nix: add aarch64-darwin as a supportedSystem" --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 34f74117729c..0b18dd1ecf26 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -11,7 +11,7 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } , officialRelease ? false # The platforms for which we build Nixpkgs. -, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true From 16ce96934052e728445e57e5c9b1242dbfa836bd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 31 May 2021 12:53:11 +0200 Subject: [PATCH 519/664] radare2: add patch for CVE-2021-32613 Closes #124670 See also https://nvd.nist.gov/vuln/detail/CVE-2021-32613 --- .../development/tools/analysis/radare2/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e59c48f91d30..0ffe937a93fb 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -20,6 +20,7 @@ , ruby , lua , capstone +, fetchpatch , useX11 ? false , rubyBindings ? false , pythonBindings ? false @@ -37,6 +38,19 @@ stdenv.mkDerivation rec { sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc"; }; + patches = [ + # fix for CVE-2021-32613 + (fetchpatch { + url = "https://github.com/radareorg/radare2/commit/5e16e2d1c9fe245e4c17005d779fde91ec0b9c05.patch"; + sha256 = "sha256-zCFNn968buLuSqfUT5E+72qz0l1tA3fEUQIxJl2nd3I="; + }) + (fetchpatch { + name = "CVE-2021-32613.patch"; + url = "https://github.com/radareorg/radare2/commit/049de62730f4954ef9a642f2eeebbca30a8eccdc.patch"; + sha256 = "sha256-s8SWGuSQ6fxDCybtjO2ZW8w7H6mr+AuzVLL6dw+XKDw="; + }) + ]; + postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; From 651777934941480a36f7df9c434e6044957d045d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 May 2021 08:32:21 +0200 Subject: [PATCH 520/664] dnsname-cni: Use wrapper instead of patch for dnsmasq The patch proved to be an incomplete solution while developing nixosTests.podman-dnsname --- .../cluster/dnsname-cni/default.nix | 16 +++++++++++----- .../dnsname-cni/hardcode-dnsmasq-path.patch | 19 ------------------- 2 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 91ef8b68fb63..2770617db7e5 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -1,4 +1,11 @@ -{ buildGoModule, fetchFromGitHub, lib, dnsmasq }: +{ + buildGoModule, + dnsmasq, + fetchFromGitHub, + lib, + nixosTests, + makeWrapper, +}: buildGoModule rec { pname = "cni-plugin-dnsname"; @@ -11,10 +18,9 @@ buildGoModule rec { sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3"; }; - patches = [ ./hardcode-dnsmasq-path.patch ]; - - postPatch = '' - substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq' + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]} ''; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch b/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch deleted file mode 100644 index 24ef5eb85d13..000000000000 --- a/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go -index fc05f75..f6b4caf 100644 ---- a/plugins/meta/dnsname/service.go -+++ b/plugins/meta/dnsname/service.go -@@ -16,10 +16,14 @@ import ( - - // newDNSMasqFile creates a new instance of a dnsNameFile - func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) { -+ /* - dnsMasqBinary, err := exec.LookPath("dnsmasq") - if err != nil { - return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH") - } -+ */ -+ _ = errors.Errorf // XXX(mikroskeem): reduce diff -+ dnsMasqBinary := "@DNSMASQ@" - masqConf := dnsNameFile{ - ConfigFile: makePath(networkName, confFileName), - Domain: domainName, From efba949352271ec77d9d5e7d54f2d16b9c53ee4f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 27 May 2021 13:00:09 +0200 Subject: [PATCH 521/664] nixos/containers: Add virtualisation.containers.containersConf.cniPlugins --- nixos/modules/virtualisation/containers.nix | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 3974caf2233b..45d4f877ae5b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -48,6 +48,23 @@ in description = "containers.conf configuration"; }; + containersConf.cniPlugins = mkOption { + type = types.listOf types.package; + defaultText = '' + [ + pkgs.cni-plugins + ] + ''; + example = lib.literalExample '' + [ + pkgs.cniPlugins.dnsname + ] + ''; + description = '' + CNI plugins to install on the system. + ''; + }; + registries = { search = mkOption { type = types.listOf types.str; @@ -97,8 +114,11 @@ in }; config = lib.mkIf cfg.enable { + + virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ]; + virtualisation.containers.containersConf.settings = { - network.cni_plugin_dirs = [ "${pkgs.cni-plugins}/bin/" ]; + network.cni_plugin_dirs = map (p: "${lib.getBin p}/bin") cfg.containersConf.cniPlugins; engine = { init_path = "${pkgs.catatonit}/bin/catatonit"; } // lib.optionalAttrs cfg.ociSeccompBpfHook.enable { From d81631fb98ea35b107d86f5de287cf727d0dfc18 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 27 May 2021 16:19:01 +0200 Subject: [PATCH 522/664] nixos/podman: Add defaultNetwork.extraPlugins --- nixos/modules/virtualisation/podman.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index b16afb668949..ee9565abc24b 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -2,6 +2,7 @@ let cfg = config.virtualisation.podman; toml = pkgs.formats.toml { }; + json = pkgs.formats.json { }; inherit (lib) mkOption types; @@ -22,6 +23,19 @@ let done ''; + net-conflist = pkgs.runCommand "87-podman-bridge.conflist" { + nativeBuildInputs = [ pkgs.jq ]; + extraPlugins = builtins.toJSON cfg.defaultNetwork.extraPlugins; + jqScript = '' + . + { "plugins": (.plugins + $extraPlugins) } + ''; + } '' + jq <${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist \ + --argjson extraPlugins "$extraPlugins" \ + "$jqScript" \ + >$out + ''; + in { imports = [ @@ -99,6 +113,13 @@ in ''; }; + defaultNetwork.extraPlugins = lib.mkOption { + type = types.listOf json.type; + default = []; + description = '' + Extra CNI plugin configurations to add to podman's default network. + ''; + }; }; @@ -107,7 +128,7 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = net-conflist; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration From 54f2f1e5f1c7fd34e564a84443e8490477e26eb7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 27 May 2021 16:22:28 +0200 Subject: [PATCH 523/664] nixos/podman-dnsname: init --- .../modules/virtualisation/podman-dnsname.nix | 36 ++++++++++++++++ nixos/modules/virtualisation/podman.nix | 1 + nixos/tests/all-tests.nix | 1 + nixos/tests/podman-dnsname.nix | 42 +++++++++++++++++++ .../cluster/dnsname-cni/default.nix | 4 ++ 5 files changed, 84 insertions(+) create mode 100644 nixos/modules/virtualisation/podman-dnsname.nix create mode 100644 nixos/tests/podman-dnsname.nix diff --git a/nixos/modules/virtualisation/podman-dnsname.nix b/nixos/modules/virtualisation/podman-dnsname.nix new file mode 100644 index 000000000000..beef19755079 --- /dev/null +++ b/nixos/modules/virtualisation/podman-dnsname.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) + mkOption + mkIf + types + ; + + cfg = config.virtualisation.podman; + +in +{ + options = { + virtualisation.podman = { + + defaultNetwork.dnsname.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable DNS resolution in the default podman network. + ''; + }; + + }; + }; + + config = { + virtualisation.containers.containersConf.cniPlugins = mkIf cfg.defaultNetwork.dnsname.enable [ pkgs.dnsname-cni ]; + virtualisation.podman.defaultNetwork.extraPlugins = + lib.optional cfg.defaultNetwork.dnsname.enable { + type = "dnsname"; + domainName = "dns.podman"; + capabilities.aliases = true; + }; + }; +} diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index ee9565abc24b..e245004e04a6 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -39,6 +39,7 @@ let in { imports = [ + ./podman-dnsname.nix ./podman-network-socket.nix (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f6417170a6fc..413db7063b82 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -335,6 +335,7 @@ in plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {}; podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; diff --git a/nixos/tests/podman-dnsname.nix b/nixos/tests/podman-dnsname.nix new file mode 100644 index 000000000000..dd352f754dcf --- /dev/null +++ b/nixos/tests/podman-dnsname.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + inherit (pkgs) writeTextDir python3 curl; + webroot = writeTextDir "index.html" "

Hi

"; + in + { + name = "podman-dnsname"; + meta = { + maintainers = with lib.maintainers; [ roberth ] ++ lib.teams.podman.members; + }; + + nodes = { + podman = { pkgs, ... }: { + virtualisation.podman.enable = true; + virtualisation.podman.defaultNetwork.dnsname.enable = true; + }; + }; + + testScript = '' + podman.wait_for_unit("sockets.target") + + with subtest("DNS works"): # also tests inter-container tcp routing + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000" + ) + podman.succeed("podman ps | grep webserver") + podman.succeed(""" + for i in `seq 0 120`; do + podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${curl}/bin/curl http://webserver:8000 >/dev/console \ + && exit 0 + sleep 0.5 + done + exit 1 + """) + podman.succeed("podman stop webserver") + podman.succeed("podman rm webserver") + + ''; + } +) diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 2770617db7e5..27b37fdee0c4 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -28,6 +28,10 @@ buildGoModule rec { doCheck = false; # NOTE: requires root privileges + passthru.tests = { + inherit (nixosTests) podman-dnsname; + }; + meta = with lib; { description = "DNS name resolution for containers"; homepage = "https://github.com/containers/dnsname"; From 1d781e5c80d3c392933479a114e9e3857a1d9529 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 May 2021 09:40:04 +0200 Subject: [PATCH 524/664] podman: Add nixosTests.podman-dnsname to tests --- pkgs/applications/virtualization/podman/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 6c518ab8934a..10a6d726aef8 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -84,7 +84,10 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) podman; # related modules - inherit (nixosTests) podman-tls-ghostunnel; + inherit (nixosTests) + podman-tls-ghostunnel + podman-dnsname + ; }; meta = with lib; { From 971f2a66a5f01e8f55e9199fae845bb41778fff1 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 31 May 2021 15:33:44 +0300 Subject: [PATCH 525/664] cinnamon.nemo: 4.8.6 -> 5.0.0 --- pkgs/desktops/cinnamon/nemo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 806ca5d664ee..e48b205d1802 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -17,11 +17,12 @@ , intltool , shared-mime-info , cinnamon-translations +, libgsf }: stdenv.mkDerivation rec { pname = "nemo"; - version = "4.8.6"; + version = "5.0.0"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-OUv7l+klu5l1Y7m+iHiq/dDyxH3/hT4k7F9gDuUiGds="; + sha256 = "07n9p93iyrzb7636qqwknq8dd3im1y6wb9jfvif96mbvvdwsnfyz"; }; outputs = [ "out" "dev" ]; @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { libexif exempi gobject-introspection + libgsf ]; nativeBuildInputs = [ From 5de82b83a35bd39995f616ebb0aacb184d888eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 May 2021 14:35:24 +0200 Subject: [PATCH 526/664] kdeltachat: unstable-2021-05-22 -> unstable-2021-05-31 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index cdda2fccc18e..dfd4f266f813 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-05-22"; + version = "unstable-2021-05-31"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "9c22c6d6a03f620f14f289b464354159b8a76f6b"; - sha256 = "1qmal6dng8ynp5mrkrgykz78c8zp1gbv53s479qvj0h3axrp2s8p"; + rev = "318ae67c17f3e64532bad23c2a61a93446db553d"; + sha256 = "1qy0hlp0r91sqn26ai9isxw4rl8kcmmb10a2p9yqynhm8py3dfn4"; }; nativeBuildInputs = [ From bb2070754cc5fab4a4c40ba4fc5915dd470c592c Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 31 May 2021 21:50:53 +0900 Subject: [PATCH 527/664] firefox-bin: 88.0.1 -> 89.0 --- .../browsers/firefox-bin/release_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index db1b6eccefa9..136c2c4c7177 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "88.0.1"; + version = "89.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ach/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ach/firefox-89.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "fbe4ef0bfa83e9e90930de50c565eb7759e5f57dcc3421c09704461e1bab3211"; + sha256 = "f55831518c6d1a590a48093a5737862418b543d3349c6fe0418d378cc78846d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/af/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/af/firefox-89.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "12d3645ba8482adea46ffb3fac4b0da13e6b95987b9a3725c758268f9b7919bb"; + sha256 = "a124ce560aabae43fa0fe7b5c2c88f286839bb01ef94185faae640ce8937afe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/an/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/an/firefox-89.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4617ff8785b07993c7c81ad277c08ed3cde61ae64fd2700707b413f52085b5fa"; + sha256 = "f2624d37b96a23d447dc16ea8b8a627db2cb497945d0c4cbe20cc20570d579e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ar/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ar/firefox-89.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6647d9d711be4cc63ea5a302666dd69be48dcb089884ba0f9855c6cc32ba9beb"; + sha256 = "c01e143107753ea3363e6f8f0ca77c12f9f4803da342578c15c94554ca6d946d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ast/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ast/firefox-89.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0e2e27f7357d2598b681ba029e63fb752f63c557da18b3e1d2a65678528246be"; + sha256 = "d2bfb999bdb31daffee3774ba1f940a84ae5f4ca846a03852181b2ebb5ec9b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/az/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/az/firefox-89.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "66f48578e7a4ebd2b64c3c11a803bd668aa63d5c72dcac8cb8e5e610ace3c54c"; + sha256 = "61c408e9333730c5cee83c48c8d0e1aa20c62b76e32159b68d0e529e92cf15d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/be/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/be/firefox-89.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "050da876d2fa8875a57a0246c2d72337f2b386f0a9f429906b5f1933f35edb64"; + sha256 = "5d53d478b0728e9bfc0445e9a9a6373e0105e416ed98f50398fcc8d6466e9690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bg/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bg/firefox-89.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ff37f9a70ead543dc7b5b36c5c99e3f1bffd474ff154cbba854270793240317f"; + sha256 = "0dce261fd2be11436ab182de4bd78ebf50da9f9cb439d100063e714b2e55cfc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bn/firefox-89.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "cdc0248a70211e73efd73d4c2a202b9d68837f1e9b6eff23c46a114da6a30c45"; + sha256 = "9d1dff74b8ee7d4e81900e079921b06ff332c3db1affe9691a23db74aa2e2990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/br/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/br/firefox-89.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "30cd2111be00e2cf7526910d02b90f0b7440ebc47e76a447ac41ac073797de64"; + sha256 = "db9c9c3db5636d1bc10e3ae627f37c1c55716debaec4e68d9b2e6771801802a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bs/firefox-89.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2880580aec6a53f9b9341d3d31acf82bba3934d5086eed84649b4ff4d5874ccc"; + sha256 = "202a5b093879193327673a39f0f217323f0c0e2ede9f586fde0fe224b0bc034e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca-valencia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca-valencia/firefox-89.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "81826cc131a301933bbce8b1bd5629265657b27193ab264434fadf4cd1db6b18"; + sha256 = "d607a4d86c66b8aeb74724e29ffdf22d287ba729b7962db19cdc64f6d03a8004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca/firefox-89.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ed6ff9b83193b815a9ee3ba066ecd7b9841d1022ce4edcdb0d18ab283c406a7"; + sha256 = "8a2c7d2b455f31b868779cd2254fc130ce4f84f6935f127c0c6a0dae85daabfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cak/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cak/firefox-89.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b74da38062d948de36f58f33146e1cfe2a114000c041b3d13863ca4d0fb7b072"; + sha256 = "e631bfdc8a6a71973b16bee03221ee882ac28a289e8ff92ee3319e05c0260d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cs/firefox-89.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "86ccaa52061c1c0740cf49e9f6566fd64e447c51a2f3d4576341a728631e51d8"; + sha256 = "c08e64765f30591e3b4aeb4721e7f149b299dc19069476d0af453e38b2b68926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cy/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cy/firefox-89.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2ada972ae4bb948e7968a2e647cabb4e9a0de0f25b878894288e0c456a7c10c0"; + sha256 = "da30c1b07a2c1eb840d87da41cf36b4e0bbdfa2df6f82c9f4562e460a742b9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/da/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/da/firefox-89.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d1b75371b0104dc9c845108abe73194675aa59d7034c23fe223e4aee73ad1933"; + sha256 = "8263b20f80c5bad2dcf571c7cd71c0875a41e41550fa4b9062e90de1a544b81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/de/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/de/firefox-89.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "727e5845111ed3650d71f1a73567a2a08983a60200ecdba51fb56a0818a7c139"; + sha256 = "122d301da28d961efd7418d925a6ed0a99c302c3935f94dff6b36129454d171b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/dsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/dsb/firefox-89.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0c22bee8cce6f437fd656be89f223fd5e5ca9b1103104410902aa54849c1f9a0"; + sha256 = "7f4a167e9ba002628aac487f55d1f8b549257da18abb58938d250b16ae086597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/el/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/el/firefox-89.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "882791aee0b2d41468199e432aa075f139ff18f7849a8104c5734e98f9064dee"; + sha256 = "51f50c9f3c9c8857d2fd155129ccad90e59343d120514d90c4adba8876547662"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-CA/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-CA/firefox-89.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "92f2d7fc7f73af9d649d51e99d9a116e1624911a018f10a1d5e98372a70b0390"; + sha256 = "990bd24aed34581e0c477737327867582a2995b6e69f601d4be967d49140be64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-GB/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-GB/firefox-89.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b8714d6c55b9daad6aee75aa923efb90ae49298e6da24a6b917aeaf340d9cf7a"; + sha256 = "c56e3405009e405e565fb3dd69b8b6a22894cea9002568b2cf88b820d0f7d6db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-US/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-US/firefox-89.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cd2dcac9fb08ab63738b35b143696ce05f42ead465003e6164f7a090ffc72416"; + sha256 = "5011b87e0795de19a05694b06965435c6896c907d51a31631e9c8d427602d159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eo/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eo/firefox-89.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c6cb9b0c77712246307c4753c1af3a73031e7bc8fd519c00bbc9fd57c179e0f7"; + sha256 = "c6554905a466dc9d117bb91aaf0be3e0030467b492d44ef3374f01219d7bf0e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-AR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-AR/firefox-89.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "eb1d036f9610eef44af2d32e758c9a29bfb9bc545033e467efc4f1a42b6a82d2"; + sha256 = "91e72c2251d2740129baac9d34ffa54b8b0631c5951b1b667f4e58d0c86ed1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-CL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-CL/firefox-89.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "0f485aedeaaba00409cb1967c78206c67e488813599f75f2a4dba9e70843672f"; + sha256 = "b719701fffa142991f78aae717a247c6b5310d9dc4832757a773b077be0bfc16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-ES/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-ES/firefox-89.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b529792912d9cb51bb0ff6718e3306433e3ce60d2411eb2096f148356f53dcd1"; + sha256 = "a4153f99eacb4cc4fe647e9285b76800ed1208e988a6ddb148bc4cdefbe23f55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-MX/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-MX/firefox-89.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b85b49e105589866a09371258091af3d07b1a6ba9f3e602352d0647dab6d239f"; + sha256 = "fce8b910fe58b8096a36ce28289f8125dc9074c02655ed5df1d1bfd97a67d2e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/et/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/et/firefox-89.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fc1d6961720be961f92991c1881fdf884629ebeaec9b3dc994b8a554d6c74ce8"; + sha256 = "07165b740a9772c1ac102cdcac3d26aedef5beb6db8b3f222b4bdbd6abdb2fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eu/firefox-89.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "85479fe2eeea6e87ed42a11447cecb002b454367a1ca5d0474a07a0537bacd06"; + sha256 = "11b35cf208f2568f06181858702ea4471bc040b3be1d2a192c40db431cc02a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fa/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fa/firefox-89.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e6a82eb02c3a55b098137303a634c74a728011a50952842021772d5d98740496"; + sha256 = "a935878e3675c34d85103f3c002ea5fe7f86b12a5298bda38f2d398821ba0c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ff/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ff/firefox-89.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b0f5370a62f414c469b14cb046ab8da2391325215e4025fc28998f3b7ac2b015"; + sha256 = "13860860e6f60e7ca9f7aadadee36645f7b8a4f1fbd6b9e0a7b3d94f04d77129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fi/firefox-89.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "977bdef5c8c249fb347792553bcc8df45d918847ab8be8acf2c0ed693149f10a"; + sha256 = "c84d9dbfbb89fe5573763ce54b533fd072bf17e22d9c6904dbf52401b635630d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fr/firefox-89.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "116e04692aa319a97ec8d459006bba6306f47b35ab4851d58c8cb458a41c67b7"; + sha256 = "0e5abac1e39f3234603906c237a0f14b927853668b13f6ef8ea0d74e00407296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fy-NL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fy-NL/firefox-89.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c7ad0294c58dcbfebb086e0831fcf9fe6a97451cedc2c19da5eefc6c288d5196"; + sha256 = "2ecf98f47651abc6f90ca79f98ab0b055b099f500db8cd684c60605e20549878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ga-IE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ga-IE/firefox-89.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8b828caf41bb1ac0b4696a84f5a83d43bb0345cada7877f6889b7b1b057bc167"; + sha256 = "f1dccee366c64afc0a8d9037488cb57be9e6ef544ab4c1bfa3e7d8b7b91cb16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gd/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gd/firefox-89.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "877a2c355503b27d80945b81050269ceda6514629b196dbd89158406965b07fb"; + sha256 = "374a47ef2069c6a3dea4ac510ab10592ed48b25715d16d19ebafc3070efc7b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gl/firefox-89.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a286beeaf4d40f5b0d37c9323985521ba8f86a67f7f48420e5cf6c461e920b1e"; + sha256 = "393f39cdc555613553d27743e681c07501e253ead1562fd14d2523b1a3249723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gn/firefox-89.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "508c3424921cfce56148199a133e0dd1704ebbdb2d20c5169d23c42ecb5d449e"; + sha256 = "19c207a40e588d072cd056c056583f9745017691aee2caf5aa8e6f78680a53cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gu-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gu-IN/firefox-89.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2975ba7be697f7592b1f8c8b0f4099b06363a72096935b7483881f62739a37e9"; + sha256 = "ce4db1d47376ed287392b13c959c40dae98e9461428d8f8df5ff8d99730f1f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/he/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/he/firefox-89.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "06bc66687abc0a4451aa636c9415e066081ff7d80203fc08556a7a590d948d37"; + sha256 = "9ec972022e45ed803c441c68e704874164a3cea4bdb9d26addf23097b3bb40d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hi-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hi-IN/firefox-89.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d80a4be0f997a9dc84509f87160e7f915845c8adae99eeb5e40f704b07fa9ce1"; + sha256 = "dda729303a9183baff446f2a84de68333c9aa3a9d90a34e80548e4f46d84e045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hr/firefox-89.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "603a831c5f88c6f7a3c3ac7b5236c4818cd89027374ef6fe518012f721ae710b"; + sha256 = "dcd696d7acd7f991591f2f93ab0d94a7c2e7a7d07c5e644792d890fe8c653f4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hsb/firefox-89.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3f88023c28b4ed29d5b4cd24db70c5a4aafd661763f17e563fd50a2d52df8e06"; + sha256 = "a3b37e2df58a2ccd6ec422a8c61da35bfb9109c1464c3babedea6ec3be5fbaf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hu/firefox-89.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0796975d470dd462812babb11089c5686bee7a47c499cf2064a9030386d8205d"; + sha256 = "bfb9a458ab0c80037dce953b4c478765373e79a9368ad267f4da75cf22bcdf76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hy-AM/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hy-AM/firefox-89.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3d6bb583508b0c2523519852c8bdca1d8c522e4c7ee52e16cc40a3bbcfb2f28c"; + sha256 = "a3e67a5cd54082cd00976f17b47f719f3f262af6a39f0d0f5107b71f5119fa3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ia/firefox-89.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5cb92b254d22838db46edfe62bdd566a3d34bfba58deaa7d36a4efd7e257c8eb"; + sha256 = "54175c830b7a28047788721645796b925e37803b23ce7c3f7f287a3a3e6943e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/id/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/id/firefox-89.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aabf5e60d4cb953c712538326beaf053693a61008e00551d46e5261d284d804e"; + sha256 = "20f207ceb1b090ff6be21c36b928d93a53c7f2547adafa7a7559b7d914ae24e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/is/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/is/firefox-89.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "31131cb9fe7500c7f83aac790b08ad87aeede79d59ef2ebbf19c7fa376140e6b"; + sha256 = "79bee0347eab828d9022708131ff8eb32d1a895d1f39f1d074bc6fa536463289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/it/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/it/firefox-89.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4de9bba3bd048e96980abbf2180ca6664566f88b0b095c4dcd5eb940d9eb1137"; + sha256 = "28909f3a4e9ee97e290c52a762e74529793ec218c848fd2b260094d9295425ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ja/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ja/firefox-89.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a073f1e1c466b875da47e46c55bc2b784b3f407273089db33025a9d99da5d7b3"; + sha256 = "1fc39129fcc4e05a6ffa62302f7a01bec771e2aba1aca084c9fca518f0f3ecb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ka/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ka/firefox-89.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c834937d4a011ec3bf1c08b93e66cc8b6f7fcbdb2f2f64db09e1fe39b39698c8"; + sha256 = "513bdc1e8c8f6568eee0b24846d23bed788053cb3487799a3360ba97c3f5471f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kab/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kab/firefox-89.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "031907892957f23243df5d037111ba838af23adae39c62965376915b0b85c68a"; + sha256 = "39c7c01947863bf17fd0fe7360c1c02029f8c4eac6e27747c029c60f12a524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kk/firefox-89.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "43154e9101e01dafb91103d8f5f1fe12ea6b84039feab5b3ea12fe8b776db5de"; + sha256 = "0c99f13e466294845bec2f54ca8a10f3d03f87b9b2aee80416db799c5761a4e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/km/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/km/firefox-89.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7e5e996c2a12a5f849d989e46cfd762858abc2580fbed99c70b5c2e007114880"; + sha256 = "3494d56e45a2a9071a0993191a438155ad4b76579e6a6f29d919254c567a0078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kn/firefox-89.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b9cd7bc9d57b599532f38e1cf2332e6c5284f04c63e45c47480657b84522e657"; + sha256 = "4889cd958be7bcd108c374e0e0575f13f07210abeec076b8369186cf61f4ea7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ko/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ko/firefox-89.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "500bb904657afda7fd5f723cdd03337a1ceb2f00a17f9a6f107b363c26eb44c6"; + sha256 = "71da744479496c2c62449d42373af839b02cfb1ebe2e6ffebb662816aa8cf59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lij/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lij/firefox-89.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "061bd89c3b9d9b9c4a76f0df31a17248029482f44679096233a85ab005dbe6ac"; + sha256 = "785afee6c3a9e26e8e81032ab5e9c94c886d1e950ce2174d63a9d7f6f15acdb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lt/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lt/firefox-89.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4c9609e7a9bb11db56c8216f1e4e3e480ccce4cd012ccc590c01396d589f9c8a"; + sha256 = "00de67ef54ad73ff1b8397f9d86ae90da57a0272268336ec7ce6f7790faf0a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lv/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lv/firefox-89.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "541c09d7aadcc77306045ce53c0b735887e270c42c53a5066c5dd4408ff8452b"; + sha256 = "e28f07fccef57a2ca94b7b7074b518188599e851ad4e21a13b08b5b242407154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mk/firefox-89.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "da4749a1c1417b0c4d00b54571a6e4a86eec5295dd886ed71d5d8287512e6af9"; + sha256 = "6fb8c785136d3040865698d91cde31cece022072594aa61803cff9e63e2e5a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mr/firefox-89.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1bbf941693b2ce0165240aff245c7287536276b84d3592f63f3f42385e79fcfe"; + sha256 = "c91ea884c587115fa2c9b6d6615f724937b77e24a22ff84de7bd50d843907432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ms/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ms/firefox-89.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "447449f63e8a02e137b02de708c0c6999788b456d838b3b503ad37ac997640f3"; + sha256 = "36c50cbfef5e729f57797635aa1745c74872f6adb77daa0b4e5e804072c8d15d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/my/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/my/firefox-89.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "22ce8c15e71c270477f391282792cf9a1375ee377b6c19f0170630c62999da7d"; + sha256 = "cb17e54ee6ed511fcb7de27ab2bc9dea5c52417ffe807a572d65f8e8d202c05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nb-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nb-NO/firefox-89.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7f27637af6797bdfc10a208e76552db8283e1aae82f4d985859b9dbfee377b51"; + sha256 = "08e7a9935376166b3344a85345a932b6ea90691f6f5c28d345fb210cae64252d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ne-NP/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ne-NP/firefox-89.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9853db886cfe679a7f81e17b2e8223f40fee642c0c769cfb0f089b97fe26ee5f"; + sha256 = "b6791b6c336fb9b3683be41798620071f1ef569f3809c0f0ae9db90a1dd758b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nl/firefox-89.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e6b99f1b76d4a768d656c062cc044b2fa0a5af66bdfabacc669f5af6b408be0e"; + sha256 = "1bd8d6737393297378f127cf320ee0945970ac4688ee9aa3a045288fcde54f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nn-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nn-NO/firefox-89.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e1a7400a6a1a49de0a24e2797dea2e3111f1712e6fb855192f82475918df7354"; + sha256 = "919312922060bc90e5a3398a76bc7e6f224dc3ae46275d7ba7a0fd596e46360b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/oc/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/oc/firefox-89.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "23d166c8d9ca49331699131390e3653442a014f08b0e8dab51a26156c695b7c7"; + sha256 = "65ed4ea16b6696fa5866db932b82767301c6f3eb72a9ed089c4ba5d2a439352a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pa-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pa-IN/firefox-89.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b725c7a5d8e415ba00fe0aab7afd24cad9c1edc6e7edd7e550a89b3004ea1b31"; + sha256 = "d996838f73d04f0bc91b22933e5c6bb2d2c7340a43933de48c352cf548097040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pl/firefox-89.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b835f1c5dc1da4082a4ff3f6d5ce66b90abc19f465c6f2ff0284b14fc2b44cca"; + sha256 = "aa3167304eb7d5ceed1235be8d864b0d6ff48d47d680e62b613462378215d9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-BR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-BR/firefox-89.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "494f7ce43f33ae5d3e7da325b2956b5aa520c99753826a525ac023191212c025"; + sha256 = "74f7801e8e2f9c60a9824380060769afb61771fa9516206ee85a882705eab3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-PT/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-PT/firefox-89.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "50ed069473845929d46af61e3fbbfcf9e94db70a54ef0fedd08349c4b7cd1120"; + sha256 = "961575b359317228991d81b76b9967658b18229ee8ef58480dcf19d6bfa57ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/rm/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/rm/firefox-89.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c6da3d38bcb69ebccf373159fdfdb9fac2fe3613c321a38d5182baea03e3818c"; + sha256 = "60780c817e379fc25d4234363c72fcf8a0cb3ae14c4ea87865d85c46aa206801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ro/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ro/firefox-89.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b34610eb3f654053e053375f7c0c93730bb38ee436b1a7970e5375698e9a9ef0"; + sha256 = "20f1e503651308e2f1e0f41091c5699dd20b02a9fe32e0cb6541d00ba81d2b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ru/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ru/firefox-89.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "dca61fde2dbe956ba0ebe63d461f0a2b816c98567abdeefbb6e451824c22cd21"; + sha256 = "1f980091bf909f7f7f53d358b79c918e80df36f7ab389053c02051cacbb1ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/si/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/si/firefox-89.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "24dbd2c0b4b3361c3af2fd3eff703f74fb47ac27a81eee98877c3692fcaa6097"; + sha256 = "6be2db2f350b67befdbe0d12788c8b076ea592ad7cd40c0c27a5a1a90f73cfcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sk/firefox-89.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2f222a2dd627796a9be5345534450a4b18e4b181c5cea09742b27cd7fff40e8f"; + sha256 = "2b975d58ab76144db56408acefd5e5f63a81a65d11d79abbbe724ef60cc0b7ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sl/firefox-89.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5060e2da8fec071b6f4799c88a2f2e156a9943c9640e35f2958bbeb79a6b8254"; + sha256 = "2459093c57b5784ff0a496ca6a294086700684a85b6a5444a25a877e1bd51767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/son/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/son/firefox-89.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2ce56f65cddd20c74162b68b7594053dc156fa713d2a5ffcbc4f0aa34b6a4287"; + sha256 = "1f5f111543d1db02a8b86ed760cb159e3dedbb4a44ca43b31bd78cc9cdcf3ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sq/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sq/firefox-89.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cf68aea0c36405738962057f01c86323d1f71968aaa5eec693b52af55ebfdfcd"; + sha256 = "8a2c424aecf0e95d6acb41a66d07b750e85b74dfe5cb2154f9d84cbae51a2b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sr/firefox-89.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5ba52f0c4546532d75668cafd129137543764dad21480d897a99558ad6e3c5d3"; + sha256 = "cbef46fd1e72f542efc8959bf602fffc026a2866a2dc546d008fe8b08a24ed5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sv-SE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sv-SE/firefox-89.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8b17ba3c4dc2c625a59b44c64d887377cd7a3472f4562f1e0341b02d2f5daecc"; + sha256 = "c5a6dbca197540c22e370cf69183f32edd993242ca651a04c46ece8b43824a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/szl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/szl/firefox-89.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "46d70b4b572b48e387083ea199f49e716c559c3331d1cb85999e619f3419576d"; + sha256 = "29a4470782609b31b494f3759e9cb3b5704790e4520acd1b33988877cd982b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ta/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ta/firefox-89.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "19405af9598548d36ba0cec286829eb6810aad3a5ceda3d038e53c947716f776"; + sha256 = "8a8311028e7681f6a51013ad9c15911bdf9e572544d9c26982ec056889d79fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/te/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/te/firefox-89.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "84e059d870b748b0cccce94180be5b35e0130443a3e31b3e78b16512a0069d25"; + sha256 = "072a234399aa63cae9089da050b647ad042c8b346ea6943f1f2dbbabd5d454f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/th/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/th/firefox-89.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "dab86d509bb31c262bab2ec4e9193658e42ff3ef517a69c3757830d947de9798"; + sha256 = "f43f10f82d50a40e8b7d83295244d1edc9058826160fb7529397751fb4cce43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tl/firefox-89.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e6b94d304eb6e10314abd8b1f893b0b704939250c823bc9ee56575612815fb44"; + sha256 = "2b30195f74227e71c21b7c7004faea8cf4c95da5fc2bfe4210d50392d35902a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tr/firefox-89.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "214338ab9d55c50e667d1b79f7735adcfa848e95902f8a50e7c817f6a5096387"; + sha256 = "901fdb54ca10a0c90bc9253d6d1c6f683a7d5dc4ab8487e6aa0fff2b04e32f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/trs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/trs/firefox-89.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a021fe8271e5a39dee0c4a695a70f52206de3cab0300358966c33c5339147c12"; + sha256 = "85c3386e16611e2cd2b64a5095734c7c4703b9889df4e3656300d98b7a392ce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uk/firefox-89.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "49fc053833d0ab39767ff035edad9ae6c50a5e18e32e627af6bd6bf5a71b0f96"; + sha256 = "21fe9ab7f0a41ebabe2715f139f2343e0fb6e8057b42927a3044f7ba665eb80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ur/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ur/firefox-89.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8c3ce3d99d31c1ead914d7b70761cecfe0ca6e11c3f6546ed19e03ed1c823f13"; + sha256 = "098d33b86191172fbf5348689b1d704df4cf3237e9dd789c67b95656a6b79e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uz/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uz/firefox-89.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a8667b0c2289847b59aeef4d7809b1834872e8702a9a7cd7988afad5778c1261"; + sha256 = "b891212d3cdd66b7edc970edea6aee044b906174054f2f06a55e5060ff751ada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/vi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/vi/firefox-89.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c885bd7b03ec6bf9f8842c67e34e790d458fe4746eb4f9d28e8fcb402d393c37"; + sha256 = "fff4b31a6889e1b5829b7713fe0f54d4a68cc3da3600f6bc69c6b652596fabca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/xh/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xh/firefox-89.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5f6e840eb00573c70328c05d9caf44ac36c48fca7611ac9a60491df80933def7"; + sha256 = "b73adfcec53fe584ace193f3f8c3c1ecd9b3346847cf620cd543d21fc4f14be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-CN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-CN/firefox-89.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c6c72206aadd6b54b5456ec7021a5480d5acb33941d371e36c449db229c8e4b3"; + sha256 = "79c53f5f973bb9d85233c49c0c9e02b9e1df35f500e44b4bb541cb1c097d77ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-TW/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-TW/firefox-89.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d98c58530a4c1a66cae84430b9263f0317221ea217e26a67390faf147a3afb61"; + sha256 = "270a0e18b978ef33b8b71fd3690ca859e0c286ad1ce5302c5da5b7375f8928d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ach/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ach/firefox-89.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "3ced1adf6b286ba44757d7b01fddd80dcc733bf9d442589f07c8725ed8d0afa1"; + sha256 = "e239cc3380b017b549c5ec0824c0b351374412562a810f85faa3e39b020702d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/af/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/af/firefox-89.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ee141cebc464565c4cc45d04a5c6f12220fa693bd4f3b631a029df57a2f514cb"; + sha256 = "6049bd79e3e3fe7f141a97941489b9be8bd1b5e907ff92f07907d0433c52f8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/an/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/an/firefox-89.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d14907a7a14ed3263da99f3cec6616e8a3aa91f75366afd15a6018a197139309"; + sha256 = "8fd1aefeac276a40ccfa434d376b895a7b9674ff67fd587121255df34cc5b1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ar/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ar/firefox-89.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8054273b82ca17b1b1e0d5e838c1de8b363bfc5b8f3ea72e4ba6c17523e1ae66"; + sha256 = "4ddc0f938be2806d27cbb9810ff39749ea9f6b0fddab1bc4eae211ba121959c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ast/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ast/firefox-89.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bccb4d0af2f07204c7d44771c09d5ab458098b6f388f1a57ded76c91425bdb67"; + sha256 = "f4ada3fdb3229992af94002e3b812bf95e3ade3af7e913ca990ca3164c04ab66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/az/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/az/firefox-89.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f22ec26b5a52e857869cc22af13672f297878836d7a3969dfa65902f366df918"; + sha256 = "07e95af87afc048c1e0d273025e4ac2ce6d5e15f93bf4b2e6fd24699b9afee8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/be/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/be/firefox-89.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ca7cf7a1be8fa0043e7fffbf7f28dcc04b27bb0c7b8865e877293e898292ee2e"; + sha256 = "d967424a01532dd37a57c7e87063c022905a38d794c6077f99fc4d23a581bc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bg/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bg/firefox-89.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f7672b0d6a94dd8bf1b4c997a0cdc8884d4af4e3d30a071a449cd2565bb9ae5d"; + sha256 = "c8b667539135c6cb2fb98663259d75757efbcc6ce374c85506b2972457f01bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bn/firefox-89.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "94608024f27db272438321d59c1dd447288c241a16c87ff958a110c13dcc1add"; + sha256 = "436b1de6ffc38b2a17dcef6ed395e67e8f75058539bd10cc510b5db95add0b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/br/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/br/firefox-89.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "56baf6c6f57c68bbd7b69ad925e6fe1da4d46b8d2f8711850f31c1e31c3ff793"; + sha256 = "0a0469ed2f2d338bf05f051f300bff65f42d53f34c6344fc81d7179faaff7b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bs/firefox-89.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2350f1ad88129e8eeee7179b6bd28a06aa6173125807fbe7896afbf04ecab359"; + sha256 = "a7907780adcbef8cd64793500a9f664d552f7c993c277c1e10d8afaee2c13acd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca-valencia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca-valencia/firefox-89.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "8ac160032f48d637bf198e0bc06ddb7921d2eead3d14bb056fdb4c3195aacfad"; + sha256 = "8e7cb11f19878ac1dd7943be5132b59316c067e7f435e2456200115d0eb22470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca/firefox-89.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f2a94bcbe73b43c9258412514bf02fa834d0018af6c15bb99927236b04d24e90"; + sha256 = "235c16a101af708376903609695a0e2cd1d863094f1a98ce2e916533abc33b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cak/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cak/firefox-89.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ba366df74b7062c14803427c0c69bb7c28f66e78f6cd9beb81a1fa492f73fda3"; + sha256 = "735e1f803533c7ed092b10df7a3e7435588866ba94b88b37c9b2afda75891f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cs/firefox-89.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7a30c5e10de398f28228af82916d41f0cb8848db29fe7dd034d0ce8bd0bdabba"; + sha256 = "881d8c7a1af57a90c81ab4d5c89d8d946d6666073509f9c194ff44466f44e4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cy/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cy/firefox-89.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4f711ad9dfaf59a35e99284b8eb4cbcf3f459b9f9085b101de70d1a148c5d4b2"; + sha256 = "1c74c73b3e52ad625ede28e7043b650a8c90ed09862fb26fb1dda9497902ad54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/da/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/da/firefox-89.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e064c9517420b95ff16a9d3e7346d21f9a42f506b476762c6372978ed8c16e73"; + sha256 = "41429f458803677eac22b654be2e9e3708d4007e3faf6496ef8a9ce31f558a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/de/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/de/firefox-89.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c334d22f7e28b188ec50c6aa1269f1c409181747953c157281c2a77b9e173439"; + sha256 = "de0b79f4b60172379b523a851ffa94e750aa68e6a008e740084028da2473b8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/dsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/dsb/firefox-89.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "da4fadd3a07c19ec04ad1e8a9ed6de780114cd8859419b8119bfb12d6dacc044"; + sha256 = "b7cb7153c0e2ac1b0976eebb9a627ec608f49969b8571770409bfff5916d5ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/el/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/el/firefox-89.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e44ba8ab5ca51bc7efe4823a0a70b43adbfc75e63932ffbfe47a6fd0af1a7b3b"; + sha256 = "f764ff32d668f36cac903c808b46bf81afa81fda8231e9c500e71495573a10f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-CA/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-CA/firefox-89.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1a67ce9de292df925ebec96fd47133735e725b844cdca8a62864f7aac4e16e64"; + sha256 = "8df9136b6895266dcae765d15a601ea69707c6c31b858682d4a0037262032452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-GB/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-GB/firefox-89.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5350e887e76e323b7c81ab887b679cbb2d49c7d30c618f65c3426ac4717d0612"; + sha256 = "b9df457be4785e3ee38e44b8fc5daa265699f0fed60357b0e2ab6d650d5629e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-US/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-US/firefox-89.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6f4e0157594d46d10edc3f73e401e31338356d731b8a2673a0726609c675be42"; + sha256 = "9b40343e4094acc2ef4813a2aa0b943a4e4f34538da4f9b4356c44120c928194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eo/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eo/firefox-89.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8b0343f789d3faca9290a33d72fff1ab9664eafc6ad56cf029156ae12cd7abe5"; + sha256 = "053aaad2a50948969c2dc85854a6da0a8ef276351eb84ccf3535af2f479b4472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-AR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-AR/firefox-89.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "76f317e2f262cfac1bb0b41be3e108d51174b8532aecc2250f82d17badcd7d1c"; + sha256 = "b128326043c53635ed3dd0fd7bfc2b52192bfc48ac4d95917ff72c9aa31b8b6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-CL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-CL/firefox-89.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "160e6d9e69122f2ddfdde25a234f6bea63fe8c7367225cd4dcb6009f0eaceec4"; + sha256 = "5227c5108c01539d98c52224eb4b76c08db8577853cd2e5307ed548c11c73e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-ES/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-ES/firefox-89.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6e205028086cacaf99234afc9f0621da65401651b0a43699dec688f271e1642f"; + sha256 = "c9d0120abbfc52d5a33c1905d460332d15c1d742f2b7902dd99e49881ac1b41a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-MX/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-MX/firefox-89.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "37eb7eef32fafd273855727fd9bfb6d510c682c94751cc5f4b7b29919215b8c7"; + sha256 = "b1d030328017cd2e03d8c3431582f7ee5c4a0d368074d310cf41d771bfe536e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/et/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/et/firefox-89.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "633e0339a52de8fd6f77a8066312b2daf57b45bde6cd57adcd0f6ee23240a1ce"; + sha256 = "897be30748bce6cd0772be06cca5f02a4768864f8ba433f7840aeb245bd7be6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eu/firefox-89.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3a3504b6b2c05ebd3e62c59a5d601725867986aea7b6a78466068bcdf7e8f064"; + sha256 = "93f97c38ce8393a6bad65d682a2ced7260e2313114979bbcbe9beb7650ea8fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fa/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fa/firefox-89.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "779667c40298064d4d6cb85b2c9e8f75b5a54874e101899385efb53be4732e60"; + sha256 = "9d5820a4facbdb6959cbbfca9db5158c049c5420744edc77afa933d3c3c7250c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ff/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ff/firefox-89.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f372af781709a6e07db786f27fbcbeca71868ff6adca3019a53e51a63115d0f6"; + sha256 = "cfa3059f3f12a5f02b4f9cc076738d32f631fad945db99df3783f9cbfae68628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fi/firefox-89.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a2e622bf0c5ddf95530fb8e02547a7c6f5e23edc61f5b5e387a0144f7d7eb5ae"; + sha256 = "806c05b03a7dd6f40ebf17f78e56d1829f7aade412ec8f54ddd25ae6bab4317c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fr/firefox-89.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "92fb6b1a095048633e12033d701190762cfda7a0ca1126e1122f8ae90793e237"; + sha256 = "e0c6056f04d7c75491c020d0372ce8b2cc5f23959540fb0956b793e4c16ef736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fy-NL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fy-NL/firefox-89.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3fafb1d37961b75f63d46cb43c8dd4e4fa25471d47f1d75601940ea0df87f5fb"; + sha256 = "e9ae16b0b0f43e4b4e236d47836ed4aa03ccfe0dc6d6401dcd84012d0375d405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ga-IE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ga-IE/firefox-89.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0c562ee44f470672ae36f0e383c8ee77f982c9fc3c302572b6fb22ad1e4ad721"; + sha256 = "f37630c20e722165f2e03bbdb6d7d9d9dda86be17dcdc086d95403509309d32d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gd/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gd/firefox-89.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5e29a4496f69c35d1cb2b69cd86091f368faf598a959052023a46366001a22a5"; + sha256 = "ae13cdb56c7363fbe96eb07355ac18952c35c2fe078e79438144b2780a363bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gl/firefox-89.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5f9caa18bc2425943ed6aba3974b5bf8578004b262797402d10ea10fad939afc"; + sha256 = "f0ee99e1b32c8ab573c4057520c8a4dc7d4639e98574da1a7f4339e9b9cba083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gn/firefox-89.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "38eb2039f153a6e0178b70bf2df455568927888935ab4c1cff7f7d3a31a9c56c"; + sha256 = "c94c8b272a781019e92d4f6ba41349041f0f5a795eccce66719bed137e39b66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gu-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gu-IN/firefox-89.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1a7559932d13c6aa7b1dda6baa384269683de7ea3d37880592615513ee5835d0"; + sha256 = "9249604f06abd977e1c4992ed857950fa17b150435691df67bb97c1fe6a67adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/he/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/he/firefox-89.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9819474d9fc40886ec70f5fdc84a84ad2f9244cb43f1cbe6dc9954f51686d913"; + sha256 = "5a035ba5537709127a368d89fc4b59fc2eddbe7b56ee9fd0e4fd7b91d4bfdd2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hi-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hi-IN/firefox-89.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fb9d266b9d80b685176d8ef3711a7f91aef2b79d4f46a3201f14492c433ac579"; + sha256 = "2bdfa548c53bb05064d8a9daf7a83859290f0a1dbaa9979e54615978973c2401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hr/firefox-89.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4ea28d2eb6a0c5d888d581d0bd15557d4cce3dc5a09b8c858ccc7cbbeee10c2a"; + sha256 = "853c90ad71a8133c2c3282682aa1b4ab3fb45dcc574fe0f099a6fd1b79fea4a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hsb/firefox-89.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "837f0c17da85db3194385717e13e36e41f01b3f735d33c48794831762b4dbfd1"; + sha256 = "c5d474cb0ea800ac062678b636b4f09586c430c31eb63438ade304ae009b8c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hu/firefox-89.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f9cc01711910a92379872131ec8ba7f0620edf4b83f43308bbd9f7d2f0b4ebab"; + sha256 = "047ef8b66359959150acff1cd8fc5d3294075cd93028b1c397461bef6b940943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hy-AM/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hy-AM/firefox-89.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9dff255e306dac4d98b12d0d3dc556152ccdcfb8f61e2f3314393fae39eb827d"; + sha256 = "67d8f771638ac429aaf585a6624a80c0a4369f0ef4de4906c1324a25ef54d3ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ia/firefox-89.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "855dd75e2fd4d14158bfe5ac2377105ee4c3a5e2a04fdd6fff1eed939f332a65"; + sha256 = "fae0a1445107a5632865f159d6ef367243e846fefbd8ae86fedd8e74307ac894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/id/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/id/firefox-89.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4fde420623110fe68b126d09c3ee72ddc88b1ce8a0f9b0d27990f619933db399"; + sha256 = "d48d736d7825249d72647e07fa0a497434373e8c2b43e31c88d4853c5e57b595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/is/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/is/firefox-89.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d3c352ed8d91105449e50847ca80f484f93ae0d23ff6e7a21f9f66b7c39748bb"; + sha256 = "5534810b724fc9931a6aea47768c1c3990d7097127fc7ef96744d0fedd509535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/it/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/it/firefox-89.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6e52fbeda5410c5169ed3a6a6f4279659cf873ac474f4c43d9f78deb740ea853"; + sha256 = "3fb63402a8a4e495842c7de7c4aaf4b08e258e96371d20f40d0da21769af7d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ja/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ja/firefox-89.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "520f31cd27c1dfebe4fefc1b3fd6de17a4ff7f589e0ba4f8822c968e3a22e7d5"; + sha256 = "216996e405bce22f6836178c95f2db19cfcc138ca25eb01670b6243fd6b4595b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ka/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ka/firefox-89.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "74b52e2eb83b0f7f73ab049fcf8b8cc446ccd75d55feaf363f46ecedb35c119d"; + sha256 = "4184f7b69f0a075a580a8ec059c4ddc237ecd5fc019fc819b1b161cab6841fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kab/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kab/firefox-89.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c77b40df85b97a7cb41b22188d158f100946b813850371d04a9db0702a3c43e0"; + sha256 = "9d5ec12b8a302644b0fdc0bd20e67b471b6426f075284fb21b1c23b8bb592df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kk/firefox-89.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0c8a89395c091f2c56e7b992db7dc48f5116cf9c54e179fee976e2f5d9ea07b8"; + sha256 = "c37d42b7472c1b53d9d38a62510be2c559908dbe2a60cba6ee066821ad52dfa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/km/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/km/firefox-89.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "1b5198b18f01ef509943dacd6f9c02fd52c5196c466a054efd5464ee091a75db"; + sha256 = "13d81552dcf88f8ab5b294c0e500af4cf27d0cc6f8f3c2b9ecd60ccf28601fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kn/firefox-89.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "91a1facfc9abb247b428c1598cc32f4c932bd8ea3e9c0affdafb156747789611"; + sha256 = "385af04026d1137d7f3d110a3070332ece0f02465686e330307d6f7dff09310c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ko/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ko/firefox-89.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6d98305b42ef4744681fd07031c71b38d10a847981fdf1b5b094c74d1c367817"; + sha256 = "d408b25b22b84500fad5014aff28a1f0fcafa47f35328121ec944682c8252a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lij/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lij/firefox-89.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "431aa8855b211010f88efeb95ee46e05f38176e5656ad0c050922bce2ae4a81a"; + sha256 = "22f0806c3ce1c15ea10c5d7ca9b3148d0bc6274df88e6224efdbafa4ff1824db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lt/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lt/firefox-89.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da7f416e9223ec1770b28d3d902785cd626496f82e5fd76c3ab091c4a2668a37"; + sha256 = "4f3af6bf854de0ba54631c3d462cdf4b8735de28075c249649db7219ec1cc1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lv/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lv/firefox-89.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "364742b8aca7ea82e393f9194401f8acbf203dcbb0f8b13cf119d2324e3577de"; + sha256 = "a7d5920c2f93178f3d95bef5a5b16413a307ca468b023bfaf65cdfdeeaf58025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mk/firefox-89.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0048ddc6ea21b6c06890e914f5fa457435adcd4ec6f57c98a73262fdb8079e2f"; + sha256 = "ae8dda2d271962faafe1e27bc4448d86efb2283f1ecd3b546e077fbe73f25649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mr/firefox-89.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "cbeb8be98074c6f57ccd0c917005ff04b8deda3ae8ef03126becd40591295ecc"; + sha256 = "6e632ecd870759209c2e05d119db8c3018ec23ec178fa066408c2db40283606c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ms/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ms/firefox-89.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cdabbad9cf3b6012b086b5f3997c9338574a57315a5330b602a5ad2bcd40aa59"; + sha256 = "afb86390e11a6631583797f36471ab72780db95c42d80908edd2e30f2f8c7cee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/my/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/my/firefox-89.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4f44d11d8a15dd2f5f827377e4a6f64d68440fa5a3595011ee58715b9bce802d"; + sha256 = "709e24a1c4145da05b77d7e86351e617f8ffd1a7a1b0b39733e46640a953cd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nb-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nb-NO/firefox-89.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d61b79587b55540f845800462ca1cd52bfc7b380f60dd1bb51f15c16c511c066"; + sha256 = "63e00266d4ebb3212cbcc5a54a46bd2f56c595e6be29aed646b3313a488ad8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ne-NP/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ne-NP/firefox-89.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3f076d3def39e76a68d12e9e8b2ce7c6d60892fc6187b660f24abe454382a347"; + sha256 = "1f1a7d20758e4c654ace094f2d79daef76247433474be9cf228d26e76819c64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nl/firefox-89.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "003d8a9b1e7e641b8c8eda226a43342f9c4c05fd616f50dd8fb0bcf7a07ef704"; + sha256 = "afb68f242b89b97a9495be420b91ad65aa0ee254932660defe141117acd83c66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nn-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nn-NO/firefox-89.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0cca3c831508fb2040b57fd710823dd6c8051defe1c2c71e94b168feefb24b4b"; + sha256 = "31e20f0e5171e9137999dbefdec33f9e97205ecef2b141766db275b66592c7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/oc/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/oc/firefox-89.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "b4a2ff73e2bb3f81b3e1522c2cd87b36b3406a961eed68d43972784cb7467474"; + sha256 = "68a990d30be02eee79f1fc7a799e88a3e41749e44b28f5b59fd1741a458f668c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pa-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pa-IN/firefox-89.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "14b692ec9884d2eee7b6f790413472943e90f80da2fca35121210ee0f9cfc23b"; + sha256 = "133c91f6932454e70fbc10bb881d00f859032be6d92a1b41dd1df31dfa57f376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pl/firefox-89.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a70084487dcdf2a6f5ad386284cf9dc97f7db971a5905e9460ed76bc4db47d20"; + sha256 = "a86f0230c57ecfeb12a41762a1bde5bfd49224b898f891215a094ca7056e2b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-BR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-BR/firefox-89.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "038641582e1a02b241860c99f4256e868b5feff4f0392b2c9107d2885894934c"; + sha256 = "a0ec38a70fc4ad0d0f67962df8d2478fa00f767b1797e69803d24913be5facb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-PT/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-PT/firefox-89.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5bfb803863b648d99cb7a61f1f3a667f66a371e896265003162594c7f769bef0"; + sha256 = "e443929ef871d56be734b8b3d766845583e174e51137e87193cef5aa83cdb55b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/rm/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/rm/firefox-89.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "64705af1fa78953feb1281eff94a38be82e2320f6013fe45abf593af2ef9a014"; + sha256 = "3c044dd647fbf331a4389719c4d1105c1e5cb58c3eb1636b56058730a9e956e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ro/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ro/firefox-89.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7d9ba545a17b3d4aaa4bd79a990ad931ccddc88aae76a6d3fb95675f38f77f6e"; + sha256 = "5a9fa20d508d9de6559664e96050b8843eff0633d5d660f3fa7cce2da375660c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ru/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ru/firefox-89.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2efcc64a1159f30ff00e495eeecde0d9243b0c75a4762f3e6fdd47ebdcbe1e70"; + sha256 = "99d6b8116f594f01936bb9528b2d03e2e78a6aa7371eb10e4de50593200a7bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/si/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/si/firefox-89.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b4467e9ff46e28caea70472d9fa25f03137978508f0342d1e646aa77e8916018"; + sha256 = "b80d42d72e039cfb15b30a7054bb84f709d7bb509c299862054a5c65f588075b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sk/firefox-89.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "536f535124a6052e8d627928d3607cfa0301f90ed87de7701821f14f5fde40dd"; + sha256 = "e21b18c60376edd371b5a52966b7c8d339e0adc0b46e5ac98381a46cfa42056f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sl/firefox-89.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2f50d761df9f8e4883972134ec989e8fbafebc29a4712bb4467eb0f2bb17f603"; + sha256 = "63b70e14e9c7cb579a49013f3f6b31ffcc88f1424a17987ffd2788b876e22c13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/son/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/son/firefox-89.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "55e11dde97be10ca510ac23e301a46e5314832bef10cd32e39503cb105d5b489"; + sha256 = "d77f34b17861c607125b1bbdf84f048634b6e7d3d3e35a8c0f4b55e3ce4351b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sq/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sq/firefox-89.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "10b41cd2ba7789182902196153491b4fed86d1a655fe1b3fb22cc3bfe95bd7b5"; + sha256 = "fb5b14076d7e6a12ea0c5f510dc15c94fa6a311285cec612f9c7a216c1d71af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sr/firefox-89.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "133a16999527f53b57123d47a191ba415c04fae837d735a295569e64492ac3b9"; + sha256 = "9606afc3903197860f2b5d6cfddfbf32cb88c43f8edcdac6c94130d6a7dc4f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sv-SE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sv-SE/firefox-89.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d0fcfd1cdbdb051cd48cc141e826993ea429683199bf88fbf12ac2372a2a5c03"; + sha256 = "457c4ed993411a6407fd51a88c8f6993abaf26215e335f7d871c9445e2cf7cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/szl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/szl/firefox-89.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "b9bb3914f6918b64249f3b32f744a8f089bfd37eaebbe983748bff288f54a6d5"; + sha256 = "d06c745ac74ad48a5083768774dcc72d020a34c9dd2cc9aed2551410de1b86ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ta/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ta/firefox-89.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0d74e3c6e73fbb99dd6269925567e5127569fb3dded3de80d55a10b45e8a595b"; + sha256 = "acdc690bd1816fe043640d62b678de02c3386736bde18f31eefaba749847f6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/te/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/te/firefox-89.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d76e37e73ceea536957373bb774e4971041d09fbfb361274b90d763d39fda134"; + sha256 = "e2cbc4ff9b7682cc4ec3b49db69c841d95cf6336645c50025236885b24fc3090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/th/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/th/firefox-89.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fd81d3ec70a449f3122fea36edbc519cf06ef12bebc776ec746d980386ce3c94"; + sha256 = "83c88f10bddd3ed8e1100bc57bebeeb4d0ccab30f2093813c6e121adb04be5e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tl/firefox-89.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "53c67df49f0c01f5b2f8cd0e990b4d7794f2363740fa4ec2e61fbf6763830c35"; + sha256 = "3dd0c9dbb655c54db0b672ef3ca4b61bbe6a488185d92814e474da58b15ac7e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tr/firefox-89.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3d95619bf046b7afa7e8dcdd3b61b6eff44f7e96a2bb4bfe8abe518a729a24bb"; + sha256 = "442f82197c929080e432817a7cfe42fafee2640799596ab5fcc55d4dd6e7a296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/trs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/trs/firefox-89.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2ea46a3f91c465514cd1721f6fc4ff96014b364a8120ef3c5782411c307b2a06"; + sha256 = "98f10ccebd94fb4d0fd68bee80a691248e0033e1e33f03f97dcd9e3b3c602712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uk/firefox-89.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7ad249c8355e8fab698cc9451f0716b0d88bb26fa7f7f95862c14d79f0b5210f"; + sha256 = "99cf2753defcec16447dc176b331ce6e6e70f66dacbc341e3f719cf9392d0acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ur/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ur/firefox-89.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d0f6f7aab4499c7b01a1f2ba6a36f00f83cb3fc7c4f8d477f0cbf9c7df4f9dee"; + sha256 = "904484ad86e2e27d792b40aaa8a73857476c786cf500344305795bfbad87cba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uz/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uz/firefox-89.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "49ce46676f8d1735d8a0439a9e0149a66aee20f3bbcd26308f00ab394cc4ac71"; + sha256 = "b44a544c6f473a0b4d1c4b408d5fbde422199e23b3b85957b60d2eaf27351b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/vi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/vi/firefox-89.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "afacb2c2cb34b2791f14cb9ebe13a38cc87863b0de15e81f92e65e41b51d8a53"; + sha256 = "e4f5417a5e294ab2b38744a260280c1307c47b072aa78657ba1143020c26c778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/xh/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/xh/firefox-89.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c08da22b2ede0799cd802a6750f1b05150e2089521f74100cdac873802a7e39e"; + sha256 = "39ce93e0459299d54a99c317d0dd8b01cb694a8140d5036f09e13d72887a8d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-CN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-CN/firefox-89.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "55e00d8106a2516bb23f2dc48978a96e5102dffc100790103491447e48834810"; + sha256 = "7f6ae88c4eda5fb7893e7b35f9ae04df658f78919fe3476ba78fe2460a2896ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-TW/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-TW/firefox-89.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "849c7e52452bf72983e5e7ce1b958ffc20cdddd4a401b320b3d1a817c027db78"; + sha256 = "7e6db3c697021be17253b616d348e67df62ea3d86828af768881f67f4d340379"; } ]; } From 2f89ce11938d4c2aff29756be24e0d0ad678b023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 31 May 2021 14:58:18 +0200 Subject: [PATCH 528/664] cinnamon.cinnamon-translations: 4.8.3 -> 5.0.0 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index dafb5f4b3fea..f790c54052de 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.8.3"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-o/JFfwloXLUOy9YQzHtMCuzK7yBp/G43VS/RguxiTPY="; + hash = "sha256-qBLg0z0ZoS7clclKsIxMG6378Q1iv1NnhS9cz3f4cEc="; }; nativeBuildInputs = [ From 9b257db87d7ee67ac2cbe1a7551723ce671a03ba Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 31 May 2021 16:34:10 +0300 Subject: [PATCH 529/664] =?UTF-8?q?gpxsee:=209.0=20=E2=86=92=209.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gpxsee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b99b6460f4f6..0eca08907e98 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.0"; + version = "9.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-4MzRXpxvJcj5KptTBH6rSr2ZyQ13nV7Yq96ti+CMytw="; + sha256 = "sha256-szq1i2/NEtMK4paSkxtkKXc8yY8qGj2U/p6CzNIecAY="; }; patches = (substituteAll { @@ -39,6 +39,6 @@ mkDerivation rec { changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } From 6f6270d477a33bb727b26d45af71a45fdb559cc2 Mon Sep 17 00:00:00 2001 From: sveitser Date: Mon, 31 May 2021 20:33:11 +0800 Subject: [PATCH 530/664] python3Packages.pyls-black: add patch to fix test --- .../development/python-modules/pyls-black/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index c59a67606ee6..7c8652b0a5e3 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , black, toml, pytest, python-language-server, isPy3k }: @@ -13,6 +13,15 @@ buildPythonPackage rec { sha256 = "0cjf0mjn156qp0x6md6mncs31hdpzfim769c2lixaczhyzwywqnj"; }; + # Fix test failure with black 21.4b0+ + # Remove if https://github.com/rupert/pyls-black/pull/39 merged. + patches = [ + (fetchpatch { + url = "https://github.com/rupert/pyls-black/commit/728207b540d9c25eb0d1cd96419ebfda2e257f63.patch"; + sha256 = "0i3w5myhjl5lq1lpkizagnmk6m8fkn3igfyv5f2qcrn5n7f119ak"; + }) + ]; + disabled = !isPy3k; checkPhase = '' From 72f54c32a6114a69caec30170a29837c91434aff Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 May 2021 22:57:39 +1000 Subject: [PATCH 531/664] nixos/podman-network-socket-ghostunnel: move condition to include socket --- .../virtualisation/podman-network-socket-ghostunnel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix index 1f1ada7f0891..a0e7e433164a 100644 --- a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix +++ b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix @@ -15,9 +15,9 @@ in }; }; - config = { + config = lib.mkIf (cfg.enable && cfg.server == "ghostunnel") { - services.ghostunnel = lib.mkIf (cfg.enable && cfg.server == "ghostunnel") { + services.ghostunnel = { enable = true; servers."podman-socket" = { inherit (cfg.tls) cert key cacert; From 97c3d70a39070547a8342f7ee6f5c4a560282179 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 10:50:59 +0000 Subject: [PATCH 532/664] dnsname-cni: 1.1.1 -> 1.2.0 --- pkgs/applications/networking/cluster/dnsname-cni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 91ef8b68fb63..8f5e2889521d 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugin-dnsname"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "dnsname"; rev = "v${version}"; - sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3"; + sha256 = "sha256-hHkQOHDso92gXFCz40iQ7j2cHTEAMsaeW8MCJV2Otqo="; }; patches = [ ./hardcode-dnsmasq-path.patch ]; From f8beeb6f596593ce9d64a4d41e4edda794b5ed6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 May 2021 15:51:55 +0200 Subject: [PATCH 533/664] python3Packages.aiodns: 2.0.0 -> 3.0.0 --- .../python-modules/aiodns/default.nix | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index b2d725e8378c..9c626618ff0a 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,30 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, python, pycares, typing ? null +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycares +, pythonOlder +, typing }: buildPythonPackage rec { pname = "aiodns"; - version = "2.0.0"; - disabled = pythonOlder "3.5"; + version = "3.0.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d"; + src = fetchFromGitHub { + owner = "saghul"; + repo = pname; + rev = "aiodns-${version}"; + sha256 = "1i91a43gsq222r8212jn4m6bxc3fl04z1mf2h7s39nqywxkggvlp"; }; - propagatedBuildInputs = [ pycares ] - ++ lib.optional (pythonOlder "3.7") typing; + propagatedBuildInputs = [ + pycares + ] ++ lib.optional (pythonOlder "3.7") [ + typing + ]; - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # 'Could not contact DNS servers' + # Could not contact DNS servers doCheck = false; + pythonImportsCheck = [ "aiodns" ]; + meta = with lib; { + description = "Simple DNS resolver for asyncio"; homepage = "https://github.com/saghul/aiodns"; license = licenses.mit; - description = "Simple DNS resolver for asyncio"; + maintainers = with maintainers; [ fab ]; }; } From d93e538b5c17715397114834c800b23d99d2ac24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 31 May 2021 16:12:17 +0200 Subject: [PATCH 534/664] tarball: check systems based on the list of supported systems --- pkgs/top-level/make-tarball.nix | 3 ++- pkgs/top-level/release-small.nix | 2 +- pkgs/top-level/release.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index f65829e29cab..d0728c5d1b2c 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -4,6 +4,7 @@ { nixpkgs , officialRelease +, supportedSystems , pkgs ? import nixpkgs.outPath {} , nix ? pkgs.nix , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } @@ -66,7 +67,7 @@ releaseTools.sourceTarball { fi # Check that all-packages.nix evaluates on a number of platforms without any warnings. - for platform in i686-linux x86_64-linux x86_64-darwin; do + for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do header "checking Nixpkgs on $platform" nix-env -f . \ diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7f86b30aaf00..47c47e04e1cc 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -12,7 +12,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; { tarball = import ./make-tarball.nix { - inherit nixpkgs; + inherit nixpkgs supportedSystems; officialRelease = false; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0b18dd1ecf26..e62c3ecc19b9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -28,7 +28,7 @@ let supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; jobs = - { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; + { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; From 52248df095bd7731c3cc8c13c44740e01d4a5228 Mon Sep 17 00:00:00 2001 From: Tom Sydney Kerckhove Date: Mon, 26 Apr 2021 09:59:30 +0200 Subject: [PATCH 535/664] php.extensions.snuffleupagus: init at 0.7.0 --- .../php-packages/snuffleupagus/default.nix | 53 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/php-packages/snuffleupagus/default.nix diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix new file mode 100644 index 000000000000..222a243606f8 --- /dev/null +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -0,0 +1,53 @@ +{ buildPecl +, lib +, php +, fetchFromGitHub +, pcre' +, fetchpatch +}: + +buildPecl rec { + pname = "snuffleupagus"; + version = "0.7.0"; + src = fetchFromGitHub { + owner = "jvoisin"; + repo = pname; + rev = "v${version}"; + sha256 = "1la6wa9xznc110b7isiy502x71mkvhisq6m8llhczpq4rs4nbcw2"; + }; + + buildInputs = [ + pcre' + ]; + + internalDeps = with php.extensions; [ + session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + hash + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/jvoisin/snuffleupagus/commit/3c528d9d03cec872382a6f400b5701a8fbfd59b4.patch"; + sha256 = "0lnj4xcl867f477mha697d1py1nwxhl18dvvg40qgflpdbywlzns"; + stripLen = 1; + }) + ]; + + sourceRoot = "source/src"; + + configureFlags = [ + "--enable-snuffleupagus" + ]; + + postPhpize = '' + ./configure --enable-snuffleupagus + ''; + + meta = with lib; { + description = "Security module for php7 and php8 - Killing bugclasses and virtual-patching the rest!"; + license = licenses.lgpl3Only; + homepage = "https://github.com/jvoisin/snuffleupagus"; + maintainers = teams.php.members ++ [ maintainers.zupo ]; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3bbcb453a3c8..a33401e0b53d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -136,6 +136,8 @@ lib.makeScope pkgs.newScope (self: with self; { smbclient = callPackage ../development/php-packages/smbclient { }; + snuffleupagus = callPackage ../development/php-packages/snuffleupagus { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; swoole = callPackage ../development/php-packages/swoole { }; From 2e29e124387d3c77c92b621bdf7af9a5638b44a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 May 2021 16:13:15 +0200 Subject: [PATCH 536/664] python3Packages.typed-settings: init at 0.9.2 --- .../python-modules/typed-settings/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/typed-settings/default.nix diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix new file mode 100644 index 000000000000..c5c7e56bfbf0 --- /dev/null +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptoolsBuildHook +, attrs +, toml +, pytestCheckHook +, click +}: + +buildPythonPackage rec { + pname = "typed-settings"; + version = "0.9.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "203c1c6ec73dd1eb0fecd4981b31f8e05042f0dda16443190ac9ade1113ff53d"; + }; + + nativeBuildInputs = [ + setuptoolsBuildHook + pytestCheckHook + ]; + + propagatedBuildInputs = [ + attrs + toml + ]; + + checkInputs = [ + click + ]; + + meta = { + description = "Typed settings based on attrs classes"; + homepage = "https://gitlab.com/sscherfke/typed-settings"; + license = lib.licenses.mit; + maintainer = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1625f24c98e1..5be41683de84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8482,6 +8482,8 @@ in { typed-ast = callPackage ../development/python-modules/typed-ast { }; + typed-settings = callPackage ../development/python-modules/typed-settings { }; + typeguard = callPackage ../development/python-modules/typeguard { }; typer = callPackage ../development/python-modules/typer { }; From 285a29f23b612ef9916de89a6888bbcc1f516b63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 14:28:30 +0000 Subject: [PATCH 537/664] exploitdb: 2021-05-26 -> 2021-05-29 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 50cc54f9c30d..3c41ec3b8870 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-05-26"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-LYCUPIoqgU5IPtUew+orY1e2NfmefZFoWnvsZ9erohE="; + sha256 = "sha256-pZoK4cPQ7f2qPC0WiqF1dxwYTh+vQ1hIJ4Rf8R3MwRk="; }; installPhase = '' From e4427132775b9c7fce840e6230786407326686e4 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 31 May 2021 15:01:46 +0300 Subject: [PATCH 538/664] nextcloud-client: 3.2.1 -> 3.2.2 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 0b837c55398a..db01ec014ee6 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-I31w79GDZxSGlT6YPKSpq0aiyGnJiJBVdTyWI+DUoz4="; + sha256 = "sha256-UPWr5P6oEBtDK/Cuz8nZlHqKFyGEf44vbMfrphxNkMU="; }; patches = [ From 19120ab49753fb29feb5a49a20398f7d39a96ea4 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Mon, 31 May 2021 16:36:26 +0200 Subject: [PATCH 539/664] sane-airscan: 0.99.24 -> 0.99.26 --- pkgs/applications/graphics/sane/backends/airscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index d2ff4339890d..8d0e32e2b4e1 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -2,7 +2,7 @@ , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.24"; + version = "0.99.26"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-2zSLC9P7Q/GMefHvmrUz6nV2hgScb4BhPAkahNBouqk="; + sha256 = "08snfg5zx9924ryww0kxf1kgl085yw7fg6l4f1kzlhcmqf1958w5"; }; meta = with lib; { From 603f80066eacdbd666e04adf5239934b09be2c34 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 15 May 2021 17:41:16 +0000 Subject: [PATCH 540/664] bintools-wrapper: Add `sharedLibraryLoader` parameter This is used instead of `libc_lib` in case the shared library loader / "interpreter" is not provided by the libc derivation. --- .../bintools-wrapper/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index b2b47901981d..74681aaedcca 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -9,6 +9,7 @@ , lib , stdenvNoCC , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, sharedLibraryLoader ? if libc == null then null else lib.getLib libc , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" @@ -54,19 +55,19 @@ let # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. dynamicLinker = - /**/ if libc == null then null - else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" + /**/ if sharedLibraryLoader == null then null + else if targetPlatform.libc == "musl" then "${sharedLibraryLoader}/lib/ld-musl-*" 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 "${libc_lib}/libexec/ld.elf_so" - else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" - else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" - else if targetPlatform.system == "powerpc64le-linux" then "${libc_lib}/lib/ld64.so.2" + else if targetPlatform.libc == "nblibc" then "${sharedLibraryLoader}/libexec/ld.elf_so" + else if targetPlatform.system == "i686-linux" then "${sharedLibraryLoader}/lib/ld-linux.so.2" + else if targetPlatform.system == "x86_64-linux" then "${sharedLibraryLoader}/lib/ld-linux-x86-64.so.2" + else if targetPlatform.system == "powerpc64le-linux" then "${sharedLibraryLoader}/lib/ld64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" - else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" - else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" + else if (with targetPlatform; isAarch32 && isLinux) then "${sharedLibraryLoader}/lib/ld-linux*.so.3" + else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1" + else if targetPlatform.system == "powerpc-linux" then "${sharedLibraryLoader}/lib/ld.so.1" + else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" @@ -224,10 +225,10 @@ stdenv.mkDerivation { ## ## Dynamic linker support ## - + '' + + optionalString (sharedLibraryLoader != null) '' if [[ -z ''${dynamicLinker+x} ]]; then echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 - local dynamicLinker="${libc_lib}/lib/ld*.so.?" + local dynamicLinker="${sharedLibraryLoader}/lib/ld*.so.?" fi '' @@ -246,9 +247,9 @@ stdenv.mkDerivation { ${if targetPlatform.isDarwin then '' printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + '' else lib.optionalString (sharedLibraryLoader != null) '' + if [ -e ${sharedLibraryLoader}/lib/32/ld-linux.so.2 ]; then + echo ${sharedLibraryLoader}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi touch $out/nix-support/ld-set-dynamic-linker ''} From 7216862bb027ac70d54005635553bcb17cd48cc4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 15 May 2021 21:29:25 +0000 Subject: [PATCH 541/664] netbsdCross.ld_elf_so: use same stage's libc We need netbsdCross.ld_elf_so to be the dynamic linker in cross netbsd's bintools, but netbsdCross doesn't have a libc in stdenv. So instead, use netbsdCross.libc for netbsdCross.ld_elf_so. --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 7aad67e777ec..9e0b734c8174 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -753,11 +753,11 @@ in lib.makeScopeWithSplicing version = "9.1"; sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; - LIBC_PIC = "${stdenv.cc.libc}/lib/libc_pic.a"; + LIBC_PIC = "${self.libc}/lib/libc_pic.a"; # Hack to prevent a symlink being installed here for compatibility. SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - makeFlags = [ "CLIBOBJ=${stdenv.cc.libc}/lib" ]; + makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; extraPaths = with self; [ libc.src ] ++ libc.extraPaths; }; From 35a0e15ff658f4bdb38639e25149e98e006304f3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 15 May 2021 22:24:17 +0000 Subject: [PATCH 542/664] bintools: fix dynamic linker for NetBSD cross This will fail with an assertion error on native NetBSD, but it wouldn't have worked anyway. We can fix that later. --- pkgs/build-support/bintools-wrapper/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 74681aaedcca..bf81d00e5ea7 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -9,11 +9,22 @@ , lib , stdenvNoCC , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null -, sharedLibraryLoader ? if libc == null then null else lib.getLib libc +, netbsd ? null, netbsdCross ? null +, sharedLibraryLoader ? + if libc == null then + null + else if stdenvNoCC.targetPlatform.isNetBSD then + if libc != targetPackages.netbsdCross.headers then + targetPackages.netbsdCross.ld_elf_so + else + null + else + lib.getLib libc , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" , buildPackages ? {} +, targetPackages ? {} , useMacosReexportHack ? false # Darwin code signing support utilities From d4d1a000be22419dbe1f76f3f30bc3f52cb10d44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 May 2021 18:06:19 +0200 Subject: [PATCH 543/664] fix eval --- pkgs/development/python-modules/typed-settings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index c5c7e56bfbf0..9791c2b04688 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; license = lib.licenses.mit; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; } From b634f700cffa7bb48bc8c1187100bd02054e2661 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 31 May 2021 18:21:51 +0200 Subject: [PATCH 544/664] treefmt: 0.2.0 -> 0.2.2 --- pkgs/development/tools/treefmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 9b426882fe54..961b9625eded 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "10mv18hsyz5kd001i6cgk0xag4yk7rhxvs09acp2s68qni1v8vx2"; + sha256 = "13z7n0xg150815c77ysz4iqpk8rbgj4vmqy1y2262ryb88dwaw5n"; }; - cargoSha256 = "02455sk8n900j8qr79mrchk7m0gb4chhw0saa280p86vn56flvs0"; + cargoSha256 = "1jfrmafj1b28k6xjpj0qq1jpccll0adqxhjypphxhyfsfnra8g6f"; meta = { description = "one CLI to format the code tree"; From edf1e0008608ec6c7001b1e09ac285da5ce7b1b4 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Mon, 31 May 2021 20:17:25 +0300 Subject: [PATCH 545/664] quodlibet: 4.3.0 -> 4.4.0 --- pkgs/applications/audio/quodlibet/default.nix | 10 +++------- .../audio/quodlibet/quodlibet-feedparser6.patch | 12 ------------ 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 52e8b4f8183d..24f9f057b65a 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, +{ lib, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, @@ -9,15 +9,13 @@ let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "1q17ckblfa4fcs7wsjwsq1dj7360ymrdyjkyqmj864wzlqkw1rd2"; + sha256 = "sha256-oDMY0nZ+SVlVF2PQqH+tl3OHr3EmCP5XJxQXaiS782c="; }; - patches = [ ./quodlibet-feedparser6.patch ]; - nativeBuildInputs = [ wrapGAppsHook gettext ]; checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); @@ -50,8 +48,6 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' runHook preCheck - # newer gettext spews some warnings which fail the tests - substituteInPlace tests/test_po.py --replace "strict=True" "strict=False" # otherwise tests can't find the app icons; instead of creating index.theme from scratch # I re-used the one from hicolor-icon-theme which seems to work cp "${hicolor-icon-theme}/share/icons/hicolor/index.theme" quodlibet/images/hicolor diff --git a/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch b/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch deleted file mode 100644 index 41c6c75cea25..000000000000 --- a/pkgs/applications/audio/quodlibet/quodlibet-feedparser6.patch +++ /dev/null @@ -1,12 +0,0 @@ -Support feedparser 6, based on https://github.com/quodlibet/quodlibet/pull/3464 - ---- a/quodlibet/browsers/audiofeeds.py -+++ b/quodlibet/browsers/audiofeeds.py -@@ -137,7 +137,4 @@ class Feed(list): - def parse(self): - try: -- if not self._check_feed(): -- return False -- - doc = feedparser.parse(self.uri) - except Exception as e: From bafd47b37015aec26832a110dc255c4e2282ee93 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Mon, 31 May 2021 20:31:25 +0200 Subject: [PATCH 546/664] usbutils: 012 -> 013 --- pkgs/os-specific/linux/usbutils/default.nix | 4 ++-- pkgs/os-specific/linux/usbutils/fix-paths.patch | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 9e298697d4b3..fba025b29d94 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { - name = "usbutils-012"; + name = "usbutils-013"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8"; + sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy"; }; patches = [ diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch index d75c68505efc..ef63a41e726c 100644 --- a/pkgs/os-specific/linux/usbutils/fix-paths.patch +++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch @@ -1,7 +1,7 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -51,11 +51,11 @@ - usbreset.c +@@ -61,7 +61,7 @@ EXTRA_DIST = \ + LICENSES/GPL-3.0-only.txt lsusb.py: $(srcdir)/lsusb.py.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ @@ -9,8 +9,3 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ From e118da1603b89ebecbd10a2eca26b2de8a9db274 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 31 May 2021 14:42:46 -0400 Subject: [PATCH 547/664] qt5.qtgamepad: actually build module This was missing from the `callPackage` list, which meant we were not building it at all. --- pkgs/development/libraries/qt-5/5.15/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 9712914c9ec2..5cfca8d80c71 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -186,6 +186,7 @@ let qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; From e84e4a5782623f142696a87f1f79983c0a5d41a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 19:00:09 +0000 Subject: [PATCH 548/664] groonga: 11.0.2 -> 11.0.3 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 07ea1960a7b9..5973a1a190c6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-3inLVkjjwphz00N0fWJqXvyzAjV9x72C3E33duLeVYw="; + sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU="; }; buildInputs = with lib; From 7c2adb1d5c1f0b05dc030365f9a811a6431af0e1 Mon Sep 17 00:00:00 2001 From: Damien Diederen Date: Mon, 31 May 2021 11:21:23 +0200 Subject: [PATCH 549/664] nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack The root filesystem resizing step, `resize2fs -M', does not provide any control over the amount of slack left in the result. It can produce an arbitrarily tight fit, depending on how well the payload aligns with ext4 data structures. This is problematic, as NixOS must create a few files and directories during its first boot, before the root is enlarged to match the size of the containing SD card. An overly tight fit can cause failures in the first stage: mkdir: can't create directory '/mnt-root/proc': No space left on device or in the second stage: install: cannot create directory '/var': No space left on device A previous version of `make-ext4-fs' (before PR #79368) was explicitly "reserving" 16 MiB of free space in the final filesystem. Manually calculating the size of an ext4 filesystem is a perilous endeavor, however, and the method it employed was apparently unreliable. Reverting is consequently not a good option. A solution would be to create some sort of "balloon" occupying inodes and blocks in the image prior to invoking `resize2fs -M', and to remove these temporary files/directories before the compression step. This changeset takes the simpler approach of simply dropping the resizing step. Note that this does *not* result in a larger image in general, as the current procedure does not truncate the `.img' file anyway. In fact, it has been observed to yield *smaller* compressed images---probably because of some "noise" left after resizing. E.g., before-vs-after: -r--r--r-- 2 root root 607M 1. Jan 1970 nixos-sd-image-21.11pre-git-x86_64-linux.img.zst -r--r--r-- 2 root root 606M 1. Jan 1970 nixos-sd-image-21.11pre-git-x86_64-linux.img.zst --- nixos/lib/make-ext4-fs.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 33dbc8f5ec46..416beeb32f2f 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -74,11 +74,9 @@ pkgs.stdenv.mkDerivation { return 1 fi - echo "Resizing to minimum allowed size" - resize2fs -M $img - - # And a final fsck, because of the previous truncating. - fsck.ext4 -n -f $img + # We may want to shrink the file system and resize the image to + # get rid of the unnecessary slack here--but see + # https://github.com/NixOS/nixpkgs/issues/125121 for caveats. if [ ${builtins.toString compressImage} ]; then echo "Compressing image" From acc178b2df441d5cf92c7cf023efeaf7d7c3e1f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 May 2021 21:45:46 +0200 Subject: [PATCH 550/664] poezio: fix build --- .../instant-messengers/poezio/default.nix | 77 +++++++++++++------ 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index df6e675fecb6..bd8c492ff28f 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,30 +1,59 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder -, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkg-config, setuptools }: +{ lib +, aiodns +, buildPythonApplication +, cffi +, fetchFromGitHub +, mpd2 +, pkg-config +, potr +, pyasn1 +, pyasn1-modules +, pyinotify +, pytestCheckHook +, pythonOlder +, setuptools +, slixmpp +, typing-extensions +}: + buildPythonApplication rec { - pname = "poezio"; - version = "0.13.1"; + pname = "poezio"; + version = "0.13.1"; + disabled = pythonOlder "3.4"; - disabled = pythonOlder "3.4"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "041y61pcbdb86s04qwp8s1g6bp84yskc7vdizwpi2hz18y01x5fy"; + }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "041y61pcbdb86s04qwp8s1g6bp84yskc7vdizwpi2hz18y01x5fy"; - }; + propagatedBuildInputs = [ + aiodns + cffi + mpd2 + potr + pyasn1 + pyasn1-modules + pyinotify + setuptools + slixmpp + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = with lib; { - description = "Free console XMPP client"; - homepage = "https://poez.io"; - license = licenses.mit; - maintainers = [ maintainers.lsix ]; - }; - } + meta = with lib; { + description = "Free console XMPP client"; + homepage = "https://poez.io"; + license = licenses.zlib; + maintainers = [ maintainers.lsix ]; + }; +} From 94321961dc6c9b33d7040faa5e9f06a3217c7b49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 19:59:05 +0000 Subject: [PATCH 551/664] grip: 4.2.0 -> 4.2.1 --- pkgs/applications/misc/grip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 5ebe7765e50c..c4b3c3b31ab1 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.2.0"; + name = "grip-4.2.1"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; + sha256 = "sha256-3bFJURPbq9rzLsJCppRjSARhcOJxC4eSfw5VxvZgQ3Q="; }; nativeBuildInputs = [ pkg-config ]; From 7cdccfafb72c9a2df0cbced0bfc501b32c092cb1 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 25 May 2021 04:08:04 +0800 Subject: [PATCH 552/664] rust-analyzer: 2021-05-17 -> 2021-05-31 --- .../tools/rust/rust-analyzer/default.nix | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a038e9d65d25..066ecefaa143 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake, fetchpatch +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake , libiconv , useMimalloc ? false , doCheck ? true @@ -6,32 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-05-17"; - cargoSha256 = "sha256-uSBukInJ3FEMmMpG9DN3XeXm+hzUFqCrZORb4NIEJhw="; + version = "2021-05-31"; + cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-BsabpY4LArfsDPAMsggxKu1+OQZmqRe//+a5uBcuFps="; + sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI="; }; - patches = [ - # Revert updates which require rust 1.52.0. - # We currently have rust 1.51.0 in nixpkgs. - # https://github.com/rust-analyzer/rust-analyzer/pull/8718 - (fetchpatch { - url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/607d8a2f61e56fabb7a3bc5132592917fcdca970.patch"; - sha256 = "sha256-g1yyq/XSwGxftnqSW1bR5UeMW4gW28f4JciGvwQ/n08="; - revert = true; - }) - (fetchpatch { - url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/6a16ec52aa0d91945577c99cdf421b303b59301e.patch"; - sha256 = "sha256-n7Ew/0fG8zPaMFCi8FVLjQZwJSaczI/QoehC6pDLrAk="; - revert = true; - }) - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; From cf7fde4b023856a266a5b668c9a4a907411b9b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 31 May 2021 19:42:36 +0200 Subject: [PATCH 553/664] lua5_4: 5.4.2 -> 5.4.3 --- pkgs/development/interpreters/lua-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 95b593fb5dbb..d2ba451b9e60 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -3,8 +3,8 @@ rec { lua5_4 = callPackage ./interpreter.nix { - sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; - hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; + sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; + hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; }; From 58d0e05f1e502f56fee0a44b451ebf826fe88833 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 31 May 2021 23:54:33 +0300 Subject: [PATCH 554/664] =?UTF-8?q?reproxy:=200.6.0=20=E2=86=92=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/reproxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index b9b4fde5bdd0..6c1be8f34c4c 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "reproxy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-8veGMiRT59oLcMUxERI+2uRQVvbiuXTbrBi1GqoPe0M="; + hash = "sha256-TwqfnOKWpFC3fnHNu3/F6KLHuzE7uF6WEgZOArntpWI="; }; postPatch = '' # Requires network access substituteInPlace app/main_test.go \ --replace "Test_Main" "Skip_Main" - + '' + lib.optionalString stdenv.isDarwin '' # Fails on Darwin. # https://github.com/umputun/reproxy/issues/77 substituteInPlace app/discovery/provider/file_test.go \ From 82bc990cdf8fc5d8247d5fce80c031d28323e933 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 21:50:33 +0000 Subject: [PATCH 555/664] kea: 1.9.7 -> 1.9.8 --- pkgs/tools/networking/kea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index dafc25b3a267..8daa2f10d7e1 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-3/A0cG9AiyiWMk0GUjeUAHm0uRw5Q9PsEA2S6WZ8clo="; + sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0="; }; patches = [ ./dont-create-var.patch ]; From 55aaec15f34bc6cfae4feb0a0f4ae72c9d99ae9f Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 30 May 2021 21:24:25 -0700 Subject: [PATCH 556/664] llvmPackages: Use at least LLVM 9 for RISC-V --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd6d3879d3f4..75d4357fbf99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11376,7 +11376,7 @@ in /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7) else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then 7 + else if platform.isLinux then (if platform.isRiscV then 9 else 7) else if platform.isWasm then 8 else 11; # latest # We take the "max of the mins". Why? Since those are lower bounds of the From 8f80568885d1b37cccbede85143c00711b19390c Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 30 May 2021 21:25:27 -0700 Subject: [PATCH 557/664] llvm{9,11}: Disable tests on RISC-V The test suite leads to nothing but tears, sorrow, and wasted build time. It probably should be disabled for all of them but doing only 9 (llvmPackages) and 11 (llvmPackages_latest, Rust) for now. Some of the failures have been fixed in LLVM main: - https://reviews.llvm.org/D97490 - https://reviews.llvm.org/D91043 --- pkgs/development/compilers/llvm/11/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/9/llvm/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 941a85e6ad0d..192cacd6510c 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation (rec { cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; - doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) && (!stdenv.hostPlatform.isRiscV); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index cf064b75b3f5..e763d3e1e7d0 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation (rec { cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; - doCheck = stdenv.isLinux && (!stdenv.isx86_32); + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isRiscV); checkTarget = "check-all"; From 6288319a3a4145a390fb3f0761328ec987ab76a5 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 27 Dec 2020 01:13:27 -0800 Subject: [PATCH 558/664] rust: Add support for riscv64 --- pkgs/development/compilers/rust/1_52.nix | 1 + pkgs/development/compilers/rust/default.nix | 1 + pkgs/development/compilers/rust/print-hashes.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/compilers/rust/1_52.nix b/pkgs/development/compilers/rust/1_52.nix index 775792d06f60..bfd6fc47ad20 100644 --- a/pkgs/development/compilers/rust/1_52.nix +++ b/pkgs/development/compilers/rust/1_52.nix @@ -47,6 +47,7 @@ import ./default.nix { x86_64-apple-darwin = "765212098a415996b767d1e372ce266caf94027402b269fec33291fffc085ca4"; aarch64-apple-darwin = "95d0410bbd20b05f8b7d5adf70e8737873995bc86611a90e643d7081ca35147f"; powerpc64le-unknown-linux-gnu = "7362f561104d7be4836507d3a53cd39444efcdf065813d559beb1f54ce9f7680"; + riscv64gc-unknown-linux-gnu = "9d0c2c4ab2397e78758de8b6b57051482bcf20b6748e0e16d9d5bd23ce73d72a"; }; selectRustPackage = pkgs: pkgs.rust_1_52; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index c90f689e21cc..fee21023c4c2 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -36,6 +36,7 @@ "armv7l" = "armv7"; "armv6l" = "arm"; "armv5tel" = "armv5te"; + "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index c24052fcc058..ebf8d900bb3b 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -18,6 +18,7 @@ PLATFORMS=( x86_64-apple-darwin aarch64-apple-darwin powerpc64le-unknown-linux-gnu + riscv64gc-unknown-linux-gnu ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} From ffb2c737e2a39f989c638ea3a81a4c8d106600cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 May 2021 23:49:52 +0200 Subject: [PATCH 559/664] gpg-tui: init at 0.1.5 --- pkgs/tools/security/gpg-tui/default.nix | 41 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/security/gpg-tui/default.nix diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix new file mode 100644 index 000000000000..58f15c1f9f78 --- /dev/null +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, gpgme +, libgpgerror +, libxcb +, python3 +}: + +rustPlatform.buildRustPackage rec { + pname = "gpg-tui"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "gpg-tui"; + rev = "v${version}"; + sha256 = "1hg8a1vxrkl2737dhb46ikzhnfz87zf9pvs370l9j8h7zz1mcq66"; + }; + + cargoSha256 = "00azv55r4ldpr6gfn77ny9rzm3yqlpimvgzx2cwkwnhgmfcq2l1j"; + + nativeBuildInputs = [ + gpgme # for gpgme-config + libgpgerror # for gpg-error-config + python3 + ]; + + buildInputs = [ + gpgme + libgpgerror + libxcb + ]; + + meta = with lib; { + description = "Terminal user interface for GnuPG"; + homepage = "https://github.com/orhun/gpg-tui"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dcf97a211de..ba699f29a6ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2720,6 +2720,8 @@ in Accelerate CoreGraphics CoreVideo; }; + gpg-tui = callPackage ../tools/security/gpg-tui { }; + goa = callPackage ../development/tools/goa { }; gohai = callPackage ../tools/system/gohai { }; From 632c8e1d54e299f656aa677f25552e1127f12849 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 30 May 2021 13:12:32 +0200 Subject: [PATCH 560/664] nixos/acme: don't use --reuse-key Reusing the same private/public key on renewal has two issues: - some providers don't accept to sign the same public key again (Buypass Go SSL) - keeping the same private key forever partly defeats the purpose of renewing the certificate often Therefore, let's remove this option. People wanting to keep the same key can set extraLegoRenewFlags to `[ --reuse-key ]` to keep the previous behavior. Alternatively, we could put this as an option whose default value is true. --- nixos/doc/manual/release-notes/rl-2105.xml | 10 ++++++++++ nixos/modules/security/acme.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 12a9ae2f44ea..489d74e1aef1 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -804,6 +804,16 @@ environment.systemPackages = [ the deprecated is used. + + + In the module, use of --reuse-key + parameter for Lego has been removed. It was introduced for HKPK, but this security + feature is now deprecated. It is a better security practice to rotate key pairs + instead of always keeping the same. If you need to keep this parameter, you can add + it back using extraLegoRenewFlags as an option for the + appropriate certificate. + + diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index eb3599b924d7..c0250171109f 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -152,7 +152,7 @@ let ); renewOpts = escapeShellArgs ( commonOpts - ++ [ "renew" "--reuse-key" ] + ++ [ "renew" ] ++ optionals data.ocspMustStaple [ "--must-staple" ] ++ data.extraLegoRenewFlags ); From 9b4ee111e66b406156755e7be65ac306d3ddade3 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 18:22:31 +0200 Subject: [PATCH 561/664] erlang-ls: 0.15.0 -> 0.16.0 --- .../beam-modules/erlang-ls/default.nix | 4 ++-- .../beam-modules/erlang-ls/rebar-deps.nix | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 45ca3704be03..e6f3e7fb9e96 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: let - version = "0.15.0"; + version = "0.16.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -12,7 +12,7 @@ in rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm"; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 6fe8b1ac5712..12cbb182ceb4 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -113,11 +113,11 @@ in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { }; ranch = builder { name = "ranch"; - version = "1.7.1"; + version = "2.0.0"; src = fetchHex { pkg = "ranch"; - version = "1.7.1"; - sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + version = "2.0.0"; + sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; }; beamDeps = [ ]; }; @@ -131,6 +131,17 @@ in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { }; beamDeps = [ ]; }; + erlfmt = builder { + name = "erlfmt"; + version = "git"; + src = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + beamDeps = [ ]; + }; ephemeral = builder { name = "ephemeral"; version = "2.0.4"; From de7e0f7dee2deeda620e0c940362e2e63ad5f6bf Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 31 May 2021 13:46:20 +0200 Subject: [PATCH 562/664] dbeaver: 21.0.5 -> 21.1.0 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3227598e8cf3..8de49c5f9507 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.0.5"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-WMXhGXGHNjMJqob6A5S4+t9MDdJydAjdoY0u7T3ANbw="; + sha256 = "sha256-MHfW6gZFB2osE+8Ek7I40fg2cdowph3hvKqkjG7+rY4="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-RspJTWVM0ZpAz4yDeKsG7wSHZ//bi3SSV5c0gbsqZKY="; + outputHash = "sha256-FdWQ+2U5bIXSASm3SaLjyQlaRc1AkYPpFJSP4PnCWJw="; }; nativeBuildInputs = [ From dd068ab0e09ffb311d1ab43a25f390497bd26810 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 1 Jun 2021 03:46:28 +0300 Subject: [PATCH 563/664] =?UTF-8?q?stagit:=200.9.5=20=E2=86=92=200.9.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/stagit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 85d64890180e..cfbca2025688 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.5"; + version = "0.9.6"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4"; + sha256 = "sha256-0vkdxtKZv7LyEHKGPrB4uOI2lD74+haelEanq2sOjkE="; }; makeFlags = [ "PREFIX=$(out)" ]; From 990431c1e3bcf38995fc32efa1831a7583485c8f Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 31 May 2021 18:28:16 -0700 Subject: [PATCH 564/664] imagemagick: Allow compilation without --with-gcc-arch The --with-gcc-arch flag is used to specify the value used for --march and --mtune [1], therefore it does not make sense to fail the evaluation simply because it's not enumerated by us. However, it's necessary to specify --without-gcc-arch, otherwise the config script will guess the values and lead to incompatible / non-determinstic artifacts. [1] https://github.com/ImageMagick/ImageMagick/blob/850d5a9fc5d8d6ae7534421737a1709efe164a77/m4/ax_gcc_archflag.m4 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 79fdacfaadb6..e8a882493688 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -11,7 +11,7 @@ let else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" - else throw "ImageMagick is not supported on this platform."; + else null; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] + ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index ed1e580cb167..27c3e31b28c7 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,7 +13,7 @@ let else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" - else throw "ImageMagick is not supported on this platform."; + else null; in stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] + ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" From 373eaadd9973a1cb1d67a1cbf08247a5c336ac01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 02:10:32 +0000 Subject: [PATCH 565/664] mackerel-agent: 0.71.1 -> 0.71.2 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 38c93248b5b6..988d502e1432 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.71.1"; + version = "0.71.2"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xEUIfmQX7I+I2wi53vc1JZYDweY9OAAUd2TZJ125+iw="; + sha256 = "sha256-O67xzL4avCOh2x6qJCScOWR2TS1hfP5S6jHHELNbZWQ="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; + vendorSha256 = "sha256-iFWQoAnB0R6XwjdPvOWJdNTmEZ961zE51vDrmZ7r4Jk="; subPackages = [ "." ]; From 1e00b867dc977af3b32200650e9906114dfd38e3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 31 May 2021 22:16:07 -0400 Subject: [PATCH 566/664] zabbix: 4.0.30 -> 4.0.31 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 64698415e503..f66acf0b192c 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,7 +5,7 @@ generic: { }; v40 = generic { - version = "4.0.30"; - sha256 = "17h831a1rw245kz37pw5haxq09k9m76bf0bz0jgg9s0q1j7hvywh"; + version = "4.0.31"; + sha256 = "1jfawwwqzd9bsywsn4qc7d1j2a4i8d92xg16k0f3y34pbmfm4603"; }; } From b35b51700ea279250d120197e6f595dc4ef4d722 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 31 May 2021 22:19:42 -0400 Subject: [PATCH 567/664] zabbix: 5.0.11 -> 5.0.12 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index f66acf0b192c..154bc235406e 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.11"; - sha256 = "0xrh0l8wr0q903a1swz9anvzkb5hlbl2win5xns55cmbw0ygbwfa"; + version = "5.0.12"; + sha256 = "1gxlsmvz3m3dm4qqgx5qg5zjs680salah17mdzm3m27w8srg13i5"; }; v40 = generic { From d823c2409411681584f5940f4a5f44b2b4fe51df Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 May 2021 22:26:54 -0700 Subject: [PATCH 568/664] nixos/release-notes: Initial grooming of release notes --- nixos/doc/manual/release-notes/rl-2105.xml | 73 +++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 489d74e1aef1..6873b080c722 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -5,6 +5,9 @@ xml:id="sec-release-21.05"> Release 21.05 (“Okapi”, 2021.05/??) + + Support is planned until the end of December 2021, handing over to 21.11. +
+ - Support is planned until the end of December 2021, handing over to 21.11. + Core version changes: + + + + gcc: 9.3.0 -> 10.3.0 + + + + + glibc: 2.30 -> 2.32 + + + + + default linux: 5.4 -> 5.10, all supported kernels available + + + + + mesa: 20.1.7 -> 21.0.1 + + + The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). + + Desktop Environments: + + + + + Gnome: 3.36 -> 3.40, see its release notes + + + + + Plasma5: 5.18.5 -> 5.21.3 + + + + + kdeApplications: 20.08.1 -> 20.12.3 + + + + + cinnamon: 4.6 -> 4.8.1 + + + + - GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. + + Programming Languages and Frameworks: + + + + + + Python optimizations were disabled again. Builds with optimizations enabled + are not reproducible. Optimizations can now be enabled with an option. + + + + + GNURadio 3.8 was @@ -193,6 +258,10 @@ + + GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. + + If you are using to assign From 8815e601ddf4bfcef85364c1cbba72a409d87a85 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 May 2021 18:49:13 -0700 Subject: [PATCH 569/664] nixos/release-notes: move non-highlights to other mentions --- nixos/doc/manual/release-notes/rl-2105.xml | 199 ++++++++++----------- 1 file changed, 99 insertions(+), 100 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 6873b080c722..bd6048fd8c80 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -50,8 +50,6 @@ - The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. - The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). Desktop Environments: @@ -94,103 +92,10 @@ + + The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). + - - - GNURadio 3.8 was - finally - packaged, along with a rewrite to the Nix expressions, allowing users to - override the features upstream supports selecting to compile or not to. - Additionally, the attribute gnuradio and gnuradio3_7 - now point to an externally wrapped by default derivations, that allow you to - also add `extraPythonPackages` to the Python interpreter used by GNURadio. - Missing environmental variables needed for operational GUI were also added - (#75478). - - - - - GNURadio has a - pkgs attribute set, and there's a gnuradio.callPackage - function that extends pkgs with a mkDerivation, and a - mkDerivationWith, like Qt5. Now all gnuradio.pkgs are - defined with gnuradio.callPackage and some packages that depend - on gnuradio are defined with this as well. - - - - - Privoxy has been updated - to version 3.0.32 (See announcement). - Compared to the previous release, Privoxy has gained support for HTTPS - inspection (still experimental), Brotli decompression, several new filters - and lots of bug fixes, including security ones. In addition, the package - is now built with compression and external filters support, which were - previously disabled. - - - Regarding the NixOS module, new options for HTTPS inspection have been added - and has been replaced by the new - - (See RFC 0042 - for the motivation). - - - - - Python optimizations were disabled again. Builds with optimizations enabled - are not reproducible. Optimizations can now be enabled with an option. - - - - - Kodi has been updated to version 19.1 "Matrix". See - the announcement for - further details. - - - - - The option has been removed as - it only supported a single setting which would always be the default. - Instead new RFC - 0042 compliant - and options have - been introduced. - - - - - Nginx has been updated to stable version 1.20.0. - Now nginx uses the zlib-ng library by default. - - - - - KDE Gear (formerly KDE Applications) is upgraded to 21.04, see its - release - notes for details. - - - The kdeApplications package set is now kdeGear, - in keeping with the new name. The old name remains for compatibility, but - it is deprecated. - - - - - Libreswan has been updated - to version 4.4. The package now includes example configurations and manual - pages by default. The NixOS module has been changed to use the upstream - systemd units and write the configuration in the /etc/ipsec.d/ - directory. In addition, two new options have been added to - specify connection policies - () - and disable send/receive redirects - (). - -
@@ -206,6 +111,20 @@ + + + GNURadio 3.8 was + finally + packaged, along with a rewrite to the Nix expressions, allowing users to + override the features upstream supports selecting to compile or not to. + Additionally, the attribute gnuradio and gnuradio3_7 + now point to an externally wrapped by default derivations, that allow you to + also add `extraPythonPackages` to the Python interpreter used by GNURadio. + Missing environmental variables needed for operational GUI were also added + (#75478). + + + Keycloak, @@ -669,7 +588,7 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e self: super: { - mpi = super.mpich; + mpi = super.mpich; } @@ -902,6 +821,85 @@ environment.systemPackages = [ for details. + + + + GNURadio has a + pkgs attribute set, and there's a gnuradio.callPackage + function that extends pkgs with a mkDerivation, and a + mkDerivationWith, like Qt5. Now all gnuradio.pkgs are + defined with gnuradio.callPackage and some packages that depend + on gnuradio are defined with this as well. + + + + + Privoxy has been updated + to version 3.0.32 (See announcement). + Compared to the previous release, Privoxy has gained support for HTTPS + inspection (still experimental), Brotli decompression, several new filters + and lots of bug fixes, including security ones. In addition, the package + is now built with compression and external filters support, which were + previously disabled. + + + Regarding the NixOS module, new options for HTTPS inspection have been added + and has been replaced by the new + + (See RFC 0042 + for the motivation). + + + + + Kodi has been updated to version 19.1 "Matrix". See + the announcement for + further details. + + + + + The option has been removed as + it only supported a single setting which would always be the default. + Instead new RFC + 0042 compliant + and options have + been introduced. + + + + + Nginx has been updated to stable version 1.20.0. + Now nginx uses the zlib-ng library by default. + + + + + KDE Gear (formerly KDE Applications) is upgraded to 21.04, see its + release + notes for details. + + + The kdeApplications package set is now kdeGear, + in keeping with the new name. The old name remains for compatibility, but + it is deprecated. + + + + + Libreswan has been updated + to version 4.4. The package now includes example configurations and manual + pages by default. The NixOS module has been changed to use the upstream + systemd units and write the configuration in the /etc/ipsec.d/ + directory. In addition, two new options have been added to + specify connection policies + () + and disable send/receive redirects + (). + + + The Mailman NixOS module (services.mailman) has a new @@ -1063,7 +1061,8 @@ environment.systemPackages = [ PulseAudio was upgraded to 14.0, with changes to the handling of default sinks. See its release notes. - + + GNOME users may wish to delete their ~/.config/pulse due to the changes to stream routing logic. See PulseAudio bug 832 From 13baa1551cf22e7b56d3038fe2b172c58844d138 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 02:32:35 +0000 Subject: [PATCH 570/664] liquidprompt: 2.0.2 -> 2.0.3 --- pkgs/shells/liquidprompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 5fa331b85401..c4a9fa141315 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FXBClOkGRUey/FnLw3g3uiHUJeNiB4tXqP4Na6CuwIM="; + sha256 = "sha256-BY0/lcBxcfIgKXbXZjiEgVdugmo8vD6UWGsjEVq6j6E="; }; installPhase = '' From 40b2ca35702182f5cd07f5577f00f7ed8334441e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 31 May 2021 14:48:15 -0700 Subject: [PATCH 571/664] nixos/doc/releases: update stable release info to 21.05 --- nixos/doc/manual/installation/upgrading.xml | 16 ++++++++-------- nixos/doc/manual/release-notes/rl-2105.xml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 15ba5db9a37b..960d4fa9a436 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -14,7 +14,7 @@ Stable channels, such as nixos-20.09. + xlink:href="https://nixos.org/channels/nixos-21.05">nixos-21.05. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from @@ -38,7 +38,7 @@ Small channels, such as nixos-20.09-small + xlink:href="https://nixos.org/channels/nixos-21.05-small">nixos-21.05-small or nixos-unstable-small. @@ -63,8 +63,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you - installed from a 20.09 ISO, you will be subscribed to the - nixos-20.09 channel. To see which NixOS channel you’re + installed from a 21.05 ISO, you will be subscribed to the + nixos-21.05 channel. To see which NixOS channel you’re subscribed to, run the following as root: # nix-channel --list | grep nixos @@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For - instance, to use the NixOS 20.09 stable channel: + instance, to use the NixOS 21.05 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-20.09 nixos +# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos +# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos And if you want to live on the bleeding edge: @@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. - = https://nixos.org/channels/nixos-20.09; + = https://nixos.org/channels/nixos-21.05; diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index bd6048fd8c80..d76d7446e6b2 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-21.05"> - Release 21.05 (“Okapi”, 2021.05/??) + Release 21.05 (“Okapi”, 2021.05/31) Support is planned until the end of December 2021, handing over to 21.11. From 761c513f79081265a58ce419cf424489655b03d9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 1 Jun 2021 04:20:00 +0000 Subject: [PATCH 572/664] wal-g: 0.2.21 -> 1.0 https://github.com/wal-g/wal-g/releases/tag/v1.0 --- pkgs/tools/backup/wal-g/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index ee882de07e2d..e9be1c83005e 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,24 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub, brotli }: +{ lib, buildGoModule, fetchFromGitHub, brotli, libsodium }: buildGoModule rec { pname = "wal-g"; - version = "0.2.21"; + version = "1.0"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "0pinvi2b3vi6lvw3im8w6vcjm1qg2kbf6ydf1h72xjz5933yrjy4"; + sha256 = "0al8xg57fh3zqwgmm6lkcnpnisividhqld9jry3sqk2k45856y8j"; }; - vendorSha256 = "0qzw0lr0x6kqlpa4kghrfl2271752sr7idk6n4hkhk6q0kghcsnk"; + vendorSha256 = "0n0ymgcgkjlp0indih8h55jjj6372rdfcq717kwln6sxm4r9mb17"; - buildInputs = [ brotli ]; + buildInputs = [ brotli libsodium ]; subPackages = [ "main/pg" ]; buildFlagsArray = [ - "-tags=brotli" + "-tags=brotli libsodium" "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; From bfaa9f175bdfd9a5106021ae1906a35f429e283f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 1 Jun 2021 06:24:20 +0200 Subject: [PATCH 573/664] radare2: 5.2.1 -> 5.3.0 --- .../tools/analysis/radare2/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0ffe937a93fb..f51f0f9368d1 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -20,7 +20,6 @@ , ruby , lua , capstone -, fetchpatch , useX11 ? false , rubyBindings ? false , pythonBindings ? false @@ -29,28 +28,15 @@ stdenv.mkDerivation rec { pname = "radare2"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc"; + sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng="; }; - patches = [ - # fix for CVE-2021-32613 - (fetchpatch { - url = "https://github.com/radareorg/radare2/commit/5e16e2d1c9fe245e4c17005d779fde91ec0b9c05.patch"; - sha256 = "sha256-zCFNn968buLuSqfUT5E+72qz0l1tA3fEUQIxJl2nd3I="; - }) - (fetchpatch { - name = "CVE-2021-32613.patch"; - url = "https://github.com/radareorg/radare2/commit/049de62730f4954ef9a642f2eeebbca30a8eccdc.patch"; - sha256 = "sha256-s8SWGuSQ6fxDCybtjO2ZW8w7H6mr+AuzVLL6dw+XKDw="; - }) - ]; - postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; From b48e56c74634757b4f85e06377dd4f89c85d9a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 31 May 2021 16:40:17 +0200 Subject: [PATCH 574/664] delve: disable source fortify at runtime --- pkgs/development/tools/delve/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 62e51597055c..2d2eecd54122 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "delve"; @@ -14,6 +14,16 @@ buildGoPackage rec { sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw="; }; + subPackages = [ "cmd/dlv" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + # fortify source breaks build since delve compiles with -O0 + wrapProgram $out/bin/dlv \ + --set "disableHardening" fortify + ''; + meta = with lib; { description = "debugger for the Go programming language"; homepage = "https://github.com/derekparker/delve"; From c9927ba895f17ae58dfe8dc736a9ba8508e623ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 1 Jun 2021 07:23:50 +0200 Subject: [PATCH 575/664] Update pkgs/development/tools/delve/default.nix Co-authored-by: Dmitry Kalinkin --- pkgs/development/tools/delve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 2d2eecd54122..9a0d19840e46 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { postInstall = '' # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/dlv \ - --set "disableHardening" fortify + --prefix disableHardening " " fortify ''; meta = with lib; { From d16a847645279d327d8f40d3019aeab56c22bd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 1 Jun 2021 08:03:37 +0200 Subject: [PATCH 576/664] grip: apply linting suggestions --- pkgs/applications/misc/grip/default.nix | 40 ++++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index c4b3c3b31ab1..a30778762b27 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libgnome, libgnomeui, vte -, curl, cdparanoia, libid3tag, ncurses, libtool }: +{ lib +, stdenv +, fetchurl +, gtk2 +, glib +, pkg-config +, libgnome +, libgnomeui +, vte +, curl +, cdparanoia +, libid3tag +, ncurses +, libtool +}: stdenv.mkDerivation rec { name = "grip-4.2.1"; @@ -9,19 +22,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-3bFJURPbq9rzLsJCppRjSARhcOJxC4eSfw5VxvZgQ3Q="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia - libid3tag ncurses libtool ]; - - hardeningDisable = [ "format" ]; - - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ + gtk2 + glib + libgnome + libgnomeui + vte + curl + cdparanoia + libid3tag + ncurses + ]; + enableParallelBuilding = true; meta = { description = "GTK-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ marcweber peti ]; platforms = lib.platforms.linux; From d386ff76a6f1b9d674282cc1a8bc47f3706f27f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 06:25:52 +0000 Subject: [PATCH 577/664] bupstash: 0.9.0 -> 0.9.1 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 4a8de070ced2..44d16549cdda 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uA5XEG9nvqsXg34bqw8k4Rjk5F9bPFSk1HQ4Bv6Ar+I="; + sha256 = "sha256-DzRGhdUxfBW6iazpCHlQ9J8IL10FVxhac8kx6yBSGNk="; }; - cargoSha256 = "sha256-4r+Ioh6Waoy/7LVF3CPz18c2bCRYym5T4za1GSKw7WQ="; + cargoSha256 = "sha256-IKk4VsO/oH4nC6F1W+JA3Agl7oXXNJ7zpP2PYpPLREU="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From 056277ec958e425b01a9f70cd90b00a0324ddfa3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 08:37:53 +0200 Subject: [PATCH 578/664] python3Packages.xknx: 0.18.2 -> 0.18.3 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index ca23184726c2..2d565c0eac48 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.2"; + version = "0.18.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-7jfZtncjcYaAS/7N06FWXh4qSTH6y+VdFx3kKyQxIbM="; + sha256 = "sha256-IXzmVAxxFOfU8ptixZLeyM64Fm1xSIlEDbR09f77JKM="; }; propagatedBuildInputs = [ From f777cb75fbc46fcdb2291a542f734d3d956d41a6 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Tue, 1 Jun 2021 15:04:12 +0800 Subject: [PATCH 579/664] zsh-completions: 0.32.0 -> 0.33.0 --- pkgs/shells/zsh/zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 07e538610ba3..249826a2a25f 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-completions"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = pname; rev = version; - sha256 = "12l9wrx0aysyj62kgp5limglz0nq73w8c415wcshxnxmhyk6sw6d"; + sha256 = "0vs14n29wvkai84fvz3dz2kqznwsq2i5fzbwpv8nsfk1126ql13i"; }; installPhase= '' From 7c6cfaa13c9b680767e346ca9745cb18ab4e5b59 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 1 Jun 2021 09:08:30 +0200 Subject: [PATCH 580/664] metals: 0.10.3 -> 0.10.4 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 88bbfda5c73f..b85ca99a9e60 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.3"; + version = "0.10.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4"; + outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q"; }; nativeBuildInputs = [ makeWrapper ]; From 7ee8945a120da5b10fa0eac9fc59b92531ac8552 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 1 Jun 2021 09:20:16 +0200 Subject: [PATCH 581/664] nginx: fix link to discussion explaining why "with" is not used This is because we are in a huge "rec" that takes precedence for symbols in its scope, despite the more nested "with". --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 252d2a1019f8..fc44785e57a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19279,7 +19279,7 @@ in zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! - # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 + # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; # Use latest boringssl to allow http3 support openssl = boringssl; @@ -19289,7 +19289,7 @@ in zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! - # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 + # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; }; @@ -19297,7 +19297,7 @@ in zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! - # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 + # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; }; From 1c265e6678ad32333b5a0d935d8b8a26e70c83e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 09:29:56 +0200 Subject: [PATCH 582/664] python3Packages.alarmdecoder: 1.13.10 -> 1.13.11 --- pkgs/development/python-modules/alarmdecoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index ee07588b325d..3aed60a0403d 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "alarmdecoder"; - version = "1.13.10"; + version = "1.13.11"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nutechsoftware"; repo = "alarmdecoder"; rev = version; - sha256 = "05581j78181p6mwbfpbkp5irnrzsvps1lslgqrh7xbdcmz5b2nxd"; + sha256 = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w="; }; propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; From d37dcf5a0438eb58d69c49bb2dc2dc375462d461 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 09:39:26 +0200 Subject: [PATCH 583/664] python3Packages.alarmdecoder: enable tests --- .../python-modules/alarmdecoder/default.nix | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index 3aed60a0403d..23b4173f8da8 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb -, pyopenssl, nose, isPy3k, pythonOlder, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pyftdi +, pyopenssl +, pyserial +, pytestCheckHook +, pythonOlder +, pyusb +}: buildPythonPackage rec { pname = "alarmdecoder"; @@ -13,16 +22,30 @@ buildPythonPackage rec { sha256 = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w="; }; - propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; + propagatedBuildInputs = [ + pyftdi + pyopenssl + pyserial + pyusb + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + disabledTests = [ + # Socket issue, https://github.com/nutechsoftware/alarmdecoder/issues/45 + "test_ssl" + "test_ssl_exception" + ]; - doCheck = !isPy3k; - checkInputs = [ nose mock ]; pythonImportsCheck = [ "alarmdecoder" ]; meta = with lib; { + description = "Python interface for the Alarm Decoder (AD2USB, AD2SERIAL and AD2PI) devices"; homepage = "https://github.com/nutechsoftware/alarmdecoder"; - description = - "Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } From 44bbfafcf4589624d87b16ae070e0cee22207ce0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 09:41:08 +0200 Subject: [PATCH 584/664] python3Packages.adext: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/adext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index 12c86bfc8f5f..df8bc1bd889c 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "adext"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1yz1rpfvhbf7kfjck5vadbj9rd3bkx5248whaa3impdrjh7vs03x"; + sha256 = "sha256-Y9AvLgclNZdFnZJDoH6/pf8AqHr3WmwysgpJvWKicHo="; }; nativeBuildInputs = [ From 8d7c94db8a053e00e8feeb64c8584c609f5a5b59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 09:46:46 +0200 Subject: [PATCH 585/664] python3Packages.adext: enable tests --- .../python-modules/adext/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index df8bc1bd889c..7b10b0de1b62 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools-scm , alarmdecoder +, pytestCheckHook }: buildPythonPackage rec { pname = "adext"; version = "0.4.2"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-Y9AvLgclNZdFnZJDoH6/pf8AqHr3WmwysgpJvWKicHo="; + src = fetchFromGitHub { + owner = "ajschmidt8"; + repo = pname; + rev = "v${version}"; + sha256 = "0h5k9kzms2f0r48pdhsgv8pimk0vsxw8vs0k6880mank8ij914wr"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; @@ -22,8 +27,10 @@ buildPythonPackage rec { alarmdecoder ]; - # Tests are not published yet - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "adext" ]; meta = with lib; { From dbda1f0ced4a050a346aed86835b3c87c2858c35 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 1 Jun 2021 15:28:55 +0800 Subject: [PATCH 586/664] onlyoffice-bin: 6.1.0 -> 6.2.0 and fix runHook typo --- pkgs/applications/office/onlyoffice-bin/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 987c2c3cb281..daa71bff0612 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -72,11 +72,11 @@ let in stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "6.1.0"; - minor = "90"; + version = "6.2.0"; + minor = null; src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_${version}-${minor}_amd64.deb"; - sha256 = "sha256-TUaECChM3GxtB54/zNIKjRIocnAxpBVK7XsX3z7aq8o="; + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + sha256 = "sha256-nKmWxaVVul/rGDIh3u9zCpKu7U0nmrntFFf96xQyzdg="; }; nativeBuildInputs = [ @@ -153,7 +153,7 @@ in stdenv.mkDerivation rec { substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" - runHook preInstall + runHook postInstall ''; preFixup = '' @@ -163,6 +163,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; homepage = "https://www.onlyoffice.com/"; + downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; + changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; platforms = [ "x86_64-linux" ]; license = licenses.agpl3Plus; maintainers = with maintainers; [ nh2 gtrunsec ]; From c89224c2d351fa860fe7703aba498b6f64e28f41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 08:00:51 +0000 Subject: [PATCH 587/664] deno: 1.10.2 -> 1.10.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 80e68003b4e5..08c69dde3999 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uePCEYcYahsxcgA+GDcloqqo+dr7Y2N/9nps6Y79D58="; + sha256 = "sha256-25FfxGtPZ+KQCmXur6pwrb1l/xjCWgw69CMLPihnhAU="; }; - cargoSha256 = "sha256-6fm1RWuTVWCE6nKgkC/SRQYRXGf9SGv7kAXWNqsdQS8="; + cargoSha256 = "sha256-CopfdjafWAhpbrdYSHJjKHKCLw94TSaiSAH4CVFOHi8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From acf2a84d49f0e1da442be78864ac85f2b29328f9 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Sun, 30 May 2021 10:26:09 +0000 Subject: [PATCH 588/664] ustreamer: init 3.27 --- pkgs/applications/video/ustreamer/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/video/ustreamer/default.nix diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix new file mode 100644 index 000000000000..933747f39897 --- /dev/null +++ b/pkgs/applications/video/ustreamer/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, libbsd, libevent, libjpeg }: + +stdenv.mkDerivation rec { + pname = "ustreamer"; + version = "3.27"; + + src = fetchFromGitHub { + owner = "pikvm"; + repo = "ustreamer"; + rev = "v${version}"; + sha256 = "1max2171abdpix0wq7mdkji5lvkfzisj166qfgmqkkwc2nh721iw"; + }; + + buildInputs = [ libbsd libevent libjpeg ]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp ustreamer $out/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/pikvm/ustreamer"; + description = "Lightweight and fast MJPG-HTTP streamer"; + longDescription = '' + µStreamer is a lightweight and very quick server to stream MJPG video from + any V4L2 device to the net. All new browsers have native support of this + video format, as well as most video players such as mplayer, VLC etc. + µStreamer is a part of the Pi-KVM project designed to stream VGA and HDMI + screencast hardware data with the highest resolution and FPS possible. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tfc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f060afa922b..9ad89fc4809d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9361,6 +9361,8 @@ in usbmuxd = callPackage ../tools/misc/usbmuxd {}; + ustreamer = callPackage ../applications/video/ustreamer { }; + usync = callPackage ../applications/misc/usync { }; uwc = callPackage ../tools/text/uwc { }; From 0ed5166d3ff5abe448e42c3d048d3708eb5b1448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 12:07:11 +0200 Subject: [PATCH 589/664] python3Packages.aioswitcher: 1.2.2 -> 1.2.3 --- .../python-modules/aioswitcher/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 115da7dfca40..1ab0db664f54 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -3,7 +3,7 @@ , asynctest , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytest-asyncio , pytest-sugar @@ -12,19 +12,23 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "0wvca1jbyj4bwrpkpklbxnkvdp9zs7mrvg5b9vkx2hpyr81vyxam"; + sha256 = "sha256-Qp5iVk71JxhPVrytWuXkzpqPNPmMQubO0t9sgeQfO8c="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ asynctest From 79a477b1c6ba341d49560c8c664e8f21aeb67097 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 1 Jun 2021 13:28:49 +0300 Subject: [PATCH 590/664] unit: 1.22.0 -> 1.24.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index e6863479f54a..e8d51f9efffb 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.22.0"; + version = "1.24.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-M5Q8sxI1nZi8+ixO1PHuQpQ81EwyLAsnBI5PTtm+bKA="; + sha256 = "0214dvwz31hxjxnqk3fkqhn2xznaqdrb96m5s2k8ll8rldmk1gd6"; }; nativeBuildInputs = [ which ]; From 25edb8c2cae8917b072201298af59145a64c73b8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 24 May 2021 19:44:44 +0700 Subject: [PATCH 591/664] coqPackages.zorns-lemma: init --- .../coq-modules/zorns-lemma/default.nix | 38 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/coq-modules/zorns-lemma/default.nix diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix new file mode 100644 index 000000000000..84c3fd805197 --- /dev/null +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -0,0 +1,38 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation { + pname = "zorns-lemma"; + + releaseRev = v: "v${v}"; + + release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k="; + release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4="; + release."8.9.0".sha256 = "sha256-lEh978cXehglFX9D92RVltEuvN8umfPo/hvmFZm2NGo="; + release."8.8.0".sha256 = "sha256-ikXGzABu8VW7O0xNtCNvIq29c+mlDUm4k/ygVcsgDOI="; + release."8.7.0".sha256 = "sha256-jozvkkKLFBllN6K4oeYD0lNG+MdnOuKrDUPDocHUG6c="; + release."8.6.0".sha256 = "sha256-jozvkkKLFBllN6K4oeYD0lNG+MdnOuKrDUPDocHUG6c="; + release."8.5.0".sha256 = "sha256-mH/v02ObMjbVPYx2H+Jhz+Xp0XRKN67iMAdA1VNFzso="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "8.11.0"; } + { case = "8.10"; out = "8.10.0"; } + { case = "8.9"; out = "8.9.0"; } + { case = "8.8"; out = "8.8.0"; } + { case = "8.7"; out = "8.7.0"; } + { case = "8.6"; out = "8.6.0"; } + { case = "8.5"; out = "8.5.0"; } + ] null; + + meta = { + description = "Development of basic set theory"; + longDescription = '' + This Coq library develops some basic set theory. The main + purpose the author had in writing it was as support for the + Topology library. + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index e89f1a57c90e..3825828286e2 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -81,6 +81,7 @@ let { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; } { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; } ] {}); + zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; From fb4061c6f1bf8b53bb86de625cc68bdce079bd03 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 9 May 2021 23:03:43 +0700 Subject: [PATCH 592/664] coqPackages.topology: init --- .../coq-modules/topology/default.nix | 38 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/coq-modules/topology/default.nix diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix new file mode 100644 index 000000000000..b4367f0a8fcc --- /dev/null +++ b/pkgs/development/coq-modules/topology/default.nix @@ -0,0 +1,38 @@ +{ lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: +with lib; + +mkCoqDerivation rec { + pname = "topology"; + + releaseRev = v: "v${v}"; + + release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ="; + release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A="; + release."8.9.0".sha256 = "sha256-ZJh1BM34iZOQ75zqLIA+KtBjO2y33y0UpAw/ydCWQYc="; + release."8.8.0".sha256 = "sha256-Yfm3UymEP1e+BKMNPhdRFLdFhynMirtQ8E0HXnRiqHU="; + release."8.7.0".sha256 = "sha256-qcZQKvMRs5wWIAny8ciF9TrmEQfKKO9fWhwIRL+s7VA="; + release."8.6.0".sha256 = "sha256-eu/dBEFo3y6vnXlJljUD4hds6+qgAPQVvsuspyGHcj8="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.12"; out = "8.12.0"; } + { case = "8.11"; out = "8.12.0"; } + { case = "8.10"; out = "8.10.0"; } + { case = "8.9"; out = "8.9.0"; } + { case = "8.8"; out = "8.8.0"; } + { case = "8.7"; out = "8.7.0"; } + { case = "8.6"; out = "8.6.0"; } + ] null; + + propagatedBuildInputs = optional (versions.isLe "8.12" defaultVersion) zorns-lemma; + + meta = { + description = "General topology in Coq"; + longDescription = '' + This library develops some of the basic concepts and results of + general topology in Coq. + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 3825828286e2..c35f0b48b0f3 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -74,6 +74,7 @@ let stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; + topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; VST = callPackage ../development/coq-modules/VST (with lib.versions; From e7c043efba1101a99adac1a087e9ef84ad5e1d81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 10:43:20 +0000 Subject: [PATCH 593/664] go-task: 3.4.2 -> 3.4.3 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index e97819c4343f..58a986e813e1 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-632ISkBIZJBJpybuiuRHOV3CAJg1rSe3hK+W7hmW2cM="; + sha256 = "sha256-hI6x3DOB7pP+umnEFqL0sIx+6qN74sooLdkR2pC74D8="; }; - vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU="; + vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; doCheck = false; From 9fe0b7655021ca6003f0214833802d93a9015fbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 10:56:47 +0000 Subject: [PATCH 594/664] gotty: 1.2.0 -> 1.3.0 --- pkgs/servers/gotty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 58335c79fe95..d1e87412f7c8 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gotty"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sorenisanerd"; repo = "gotty"; rev = "v${version}"; - sha256 = "06ngxnblwkmiln9bxikg9q2wdlh45481pnz87bpsw2r7hc69bv9n"; + sha256 = "sha256-KkFnZ0j6rrzX2M+C0nVdSdta34B9rvL7cC0TOL38lGQ="; }; - vendorSha256 = "0mzf5209r3fzqf9q98j3b2cdzvfa3kg62xn0spx5zr6nabmhaa79"; + vendorSha256 = "sha256-6SgF61LW5F/61cB2Yd4cyu3fmFhDooSTw9+NnIAo7lc="; # upstream did not update the tests, so they are broken now # https://github.com/sorenisanerd/gotty/issues/13 From 9cca8ce4468487962ecd28f3ad8d937857636963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Tue, 1 Jun 2021 13:14:28 +0200 Subject: [PATCH 595/664] doc: fix incorrect use of cargoDeps Thanks to @bjornfor for reporting this error! --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 008909e5c76a..5ff7a5edefd5 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -373,7 +373,7 @@ hashes need to be specified since they are not available through the lock file. For example: ``` -cargoDeps = { +cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; From 021e7611a234d4d31066373d03606ad88e4b4d94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 13:24:42 +0200 Subject: [PATCH 596/664] python3Packages.aenum: 3.0.0 -> 3.1.0 --- .../python-modules/aenum/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index b5fb2999c961..35ccf68808c3 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,27 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pyparsing +, python +}: buildPythonPackage rec { pname = "aenum"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656"; + sha256 = "sha256-h/Dp70+ChXirBq8w5NeUQEO/Ts0/S3vRy+N+IXPN6Uo="; }; - # For Python 3, locale has to be set to en_US.UTF-8 for - # tests to pass - checkInputs = if isPy3k then [ glibcLocales ] else []; + checkInputs = [ + pyparsing + ] ; # py2 likes to reorder tests doCheck = isPy3k; + checkPhase = '' - runHook preCheck - ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""} - PYTHONPATH=`pwd` ${python.interpreter} aenum/test.py - runHook postCheck + runHook preCheck + ${python.interpreter} aenum/test.py + runHook postCheck ''; + pythonImportsCheck = [ "aenum" ]; + meta = with lib; { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; maintainers = with maintainers; [ vrthra ]; From 43ced2ab6fc5d05656c27d8f7080a6bb513755ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 11:45:21 +0000 Subject: [PATCH 597/664] httpx: 1.0.8 -> 1.0.9 --- pkgs/tools/security/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index f16a4f90fbdc..18f87f8c1e14 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-MOe/2TMUFJXdQlwkSIFEAVvOu5DbaCfTro1/WEzQkRw="; + sha256 = "sha256-WUaDL1bMZ7rjlwyaqZraIKSrxj68PZiuIpgZN8l8nIo="; }; vendorSha256 = "sha256-yk94jD8gwgmEroxg7vzfaISVakMv3+tUoq+Auas751w="; From 6bcd4fe4effb0c8984feaf57b85a581376489618 Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Tue, 1 Jun 2021 09:59:58 +0200 Subject: [PATCH 598/664] gnome-flashback: add module support to gnome-panel for installing applets Co-authored-by: Jan Tojnar --- .../services/x11/desktop-managers/gnome.nix | 12 +++++ .../gnome/misc/gnome-flashback/default.nix | 44 ++++++++++++++----- .../gnome/misc/gnome-panel/default.nix | 7 +++ .../misc/gnome-panel/modulesdir-env-var.patch | 31 +++++++++++++ 4 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c5e6caeea902..1b534096f5ba 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -261,6 +261,17 @@ in default = []; description = "Other GNOME Flashback sessions to enable."; }; + + panelModulePackages = mkOption { + default = [ pkgs.gnome.gnome-applets ]; + type = types.listOf types.path; + description = '' + 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. + ''; + example = literalExample "[ pkgs.gnome.gnome-applets ]"; + }; }; }; @@ -323,6 +334,7 @@ in (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand enableGnomePanel; + inherit (cfg.flashback) panelModulePackages; } ) flashbackWms; diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 2e8662ede0c7..3df9d7450cd7 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -23,10 +23,10 @@ , pam , wrapGAppsHook , writeTextFile -, writeShellScriptBin , xkeyboard_config , xorg , runCommand +, buildEnv }: let pname = "gnome-flashback"; @@ -126,7 +126,7 @@ let versionPolicy = "odd-unstable"; }; - mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }: + mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel, panelModulePackages }: let wmApplication = writeTextFile { name = "gnome-flashback-${wmName}-wm"; @@ -155,15 +155,39 @@ let ''; }; - executable = writeShellScriptBin "gnome-flashback-${wmName}" '' - if [ -z $XDG_CURRENT_DESKTOP ]; then - export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME" - fi + # gnome-panel will only look for applets in a single directory so symlink them into here. + panelModulesEnv = buildEnv { + name = "gnome-panel-modules-env"; + # We always want to find the built-in panel applets. + paths = [ gnome-panel gnome-flashback ] ++ panelModulePackages; + pathsToLink = [ "/lib/gnome-panel/modules" ]; + }; - export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS + executable = stdenv.mkDerivation { + name = "gnome-flashback-${wmName}"; + nativeBuildInputs = [ glib wrapGAppsHook ]; + buildInputs = [ gnome-flashback ] ++ lib.optionals enableGnomePanel ([ gnome-panel ] ++ panelModulePackages); - exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@" - ''; + # We want to use the wrapGAppsHook mechanism to wrap gnome-session + # with the environment that gnome-flashback and gnome-panel need to + # run, including the configured applet packages. This is only possible + # in the fixup phase, so turn everything else off. + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + dontWrapGApps = true; # We want to do the wrapping ourselves. + + # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session. + preFixup = '' + makeWrapper ${gnome-session}/bin/gnome-session $out \ + --add-flags "--session=gnome-flashback-${wmName}" \ + --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \ + --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \ + "''${gappsWrapperArgs[@]}" \ + ${lib.optionalString enableGnomePanel "--set NIX_GNOME_PANEL_MODULESDIR '${panelModulesEnv}/lib/gnome-panel/modules'"} + ''; + }; in writeTextFile @@ -174,7 +198,7 @@ let [Desktop Entry] Name=GNOME Flashback (${wmLabel}) Comment=This session logs you into GNOME Flashback with ${wmLabel} - Exec=${executable}/bin/gnome-flashback-${wmName} + Exec=${executable} TryExec=${wmCommand} Type=Application DesktopNames=GNOME-Flashback;GNOME; diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 4e42f91e1e3c..8ab1a87d01ce 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; + patches = [ + # Load modules from path in `NIX_GNOME_PANEL_MODULESDIR` environment variable + # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel + # load modules from other packages as well. + ./modulesdir-env-var.patch + ]; + # make .desktop Exec absolute postPatch = '' patch -p0 < Date: Wed, 5 May 2021 10:40:08 +0200 Subject: [PATCH 599/664] build-support/docker: pass tlsVerify to support http registries --- pkgs/build-support/docker/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 54eb13d38ff3..292ab00cfd1e 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -86,6 +86,8 @@ rec { , finalImageName ? imageName # This used to set a tag to the pulled image , finalImageTag ? "latest" + # This is used to disable TLS certificate verification, allowing access to http registries on (hopefully) trusted networks + , tlsVerify ? true , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar" }: @@ -105,7 +107,13 @@ rec { sourceURL = "docker://${imageName}@${imageDigest}"; destNameTag = "${finalImageName}:${finalImageTag}"; } '' - skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" + skopeo \ + --src-tls-verify=${lib.boolToString tlsVerify} \ + --insecure-policy \ + --tmpdir=$TMPDIR \ + --override-os ${os} \ + --override-arch ${arch} \ + copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. From 19b20ae7b2ebbe4dcf76df122d0d2ed4aa0fc458 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 12:37:00 +0000 Subject: [PATCH 600/664] krapslog: 0.1.3 -> 0.2.0 --- pkgs/tools/misc/krapslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index a5cbbc87770c..c6f1cf8f8169 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-BaR72djkvaMmdBqbykezLkY81Y7iajhNPcFGYq/qv7Y="; + sha256 = "sha256-Ab5bY5r0tYx3JxYRRq7i9O7WFvdi6cRMSuru/pK50y8="; }; - cargoSha256 = "sha256-rcLsqMegCos+v0OkdRvH9xoopE7R/njEUVteMY/6mj8="; + cargoSha256 = "sha256-k7jsWMFU/8XogREic4GB+qYocFtiTvSzvBAcORUFe0o="; buildInputs = lib.optional stdenv.isDarwin libiconv; From ff55c41facaa6812f9cc879a49f6929321881d4f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Jun 2021 14:42:21 +0200 Subject: [PATCH 601/664] dockerTools: Fix passthru image tag It should match the actual image tag. This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901 --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5bbf1b63f2b0..89510cd6330c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -536,7 +536,7 @@ rec { passthru.layer = layer; passthru.imageTag = if tag != null - then lib.toLower tag + then tag else lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); # Docker can't be made to run darwin binaries From bfb256b591b90af3aaf1295f69091e1b41dc6586 Mon Sep 17 00:00:00 2001 From: andreoss Date: Mon, 31 May 2021 23:23:54 -0400 Subject: [PATCH 602/664] bibletime: 2.11.2 -> 3.0 --- pkgs/applications/misc/bibletime/default.nix | 35 +++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index eb909155e4e1..aae4a960a371 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,36 +1,47 @@ { lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core -, qtbase, qttools, qtsvg, qtwebkit -}: +, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45 +, docbook_xsl_ns }: mkDerivation rec { - version = "2.11.2"; + version = "3.0"; pname = "bibletime"; src = fetchurl { - url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; - sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; + url = + "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "08i6nb9a7z0jpsq76q0kr62hw6ph9chqjpjcvkimbcj4mmifzgnn"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; buildInputs = [ - sword boost clucene_core - qtbase qttools qtsvg qtwebkit - ]; + sword + boost + clucene_core + qtbase + qttools + qtsvg + perlPackages.Po4a + ]; - preConfigure = '' + preConfigure = '' export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" "-DCMAKE_BUILD_TYPE=Debug" ]; + cmakeFlags = [ + "-DBUILD_HOWTO_PDF=OFF" + "-DBUILD_HANDBOOK_PDF=OFF" + "-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" + "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" + ]; meta = { description = "A Qt4 Bible study tool"; homepage = "http://www.bibletime.info/"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.piotr ]; }; } From 11c0fbf043091d1a9b972857df5289c138ef2bc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 11:40:48 +0000 Subject: [PATCH 603/664] jackett: 0.18.98 -> 0.18.100 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ed8ff19ab759..d48043964978 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.98"; + version = "0.18.100"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-zWbeS+pRkpLTKC50yHM1TgTzIVslVdsD4lH6sTzFI4k="; + sha256 = "sha256-qgIC1PCCEMmt83xqedwmiUttA85zE/frn/Qxo5Y1yoM="; }; nativeBuildInputs = [ makeWrapper ]; From 268ce1c375265cecdc8278b35071650353460f3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 13:13:58 +0000 Subject: [PATCH 604/664] alsaTools: 1.2.2 -> 1.2.5 --- pkgs/os-specific/linux/alsa-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index c4fdbacf95ba..897d8dd6c02b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alsa-tools"; - version = "1.2.2"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; - sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; + sha256 = "sha256-NacQJ6AfTX3kci4iNSDpQN5os8VwtsZxaRVnrij5iT4="; }; nativeBuildInputs = [ pkg-config ]; From 0dcb2da70547d85175df951d3d443e8640a1c244 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 1 Jun 2021 01:55:15 -0300 Subject: [PATCH 605/664] wio: unstable-2020-11-02 -> 0.0.0+unstable=2021-06-01 wio was forked to a brand new repository. --- .../window-managers/wio/default.nix | 31 ++- .../window-managers/wio/wlroots-0.13.patch | 254 ------------------ 2 files changed, 17 insertions(+), 268 deletions(-) delete mode 100644 pkgs/applications/window-managers/wio/wlroots-0.13.patch diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index 72fa23de9dd4..485fd0b8a623 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchgit +{ lib +, stdenv +, fetchFromBitbucket , meson , ninja , pkg-config @@ -17,28 +19,29 @@ stdenv.mkDerivation rec { pname = "wio"; - version = "unstable-2020-11-02"; + version = "0.0.0+unstable=2021-06-01"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/wio"; - rev = "31b742e473b15a2087be740d1de28bc2afd47a4d"; - sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l"; + src = fetchFromBitbucket { + owner = "anderson_torres"; + repo = pname; + rev = "ad57eb45ba0459cd0b16ba486cb6e01626079c29"; + sha256 = "sha256-mCggAscQ+Ej3SNwhA6QxecV1nH6Rw8RDf8yAsbadqjE="; }; - patches = [ - # To fix the build with wlroots 0.13: - ./wlroots-0.13.patch + nativeBuildInputs = [ + meson + ninja + pkg-config + makeWrapper ]; - - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; buildInputs = [ cairo libxkbcommon + mesa # for libEGL udev wayland wayland-protocols wlroots - mesa # for libEGL xwayland ]; @@ -48,15 +51,15 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://wio-project.org/"; description = "That Plan 9 feel, for Wayland"; longDescription = '' Wio is a Wayland compositor for Linux and FreeBSD which has a similar look and feel to plan9's rio. ''; - homepage = "https://wio-project.org/"; license = licenses.mit; - platforms = with platforms; linux; maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; passthru.providedSessions = [ "wio" ]; diff --git a/pkgs/applications/window-managers/wio/wlroots-0.13.patch b/pkgs/applications/window-managers/wio/wlroots-0.13.patch deleted file mode 100644 index 989e812bb535..000000000000 --- a/pkgs/applications/window-managers/wio/wlroots-0.13.patch +++ /dev/null @@ -1,254 +0,0 @@ -commit 8a3f903b20d646ebb2472c4f094ca1bf225a96c7 -Author: Michael Weiss -Date: Fri May 14 19:19:05 2021 +0200 - - Fix the build with wlroots 0.13 - -diff --git a/main.c b/main.c -index 5d7dcda..870fdb0 100644 ---- a/main.c -+++ b/main.c -@@ -1,6 +1,7 @@ - #define _POSIX_C_SOURCE 200809L - #include - #include -+#include - #include - #include - #include -@@ -49,7 +50,7 @@ static void gen_menu_textures(struct wio_server *server) { - cairo_surface_flush(surf); - unsigned char *data = cairo_image_surface_get_data(surf); - server->menu.inactive_textures[i] = wlr_texture_from_pixels(renderer, -- WL_SHM_FORMAT_ARGB8888, -+ DRM_FORMAT_ARGB8888, - cairo_image_surface_get_stride(surf), - extents.width + 2, extents.height + 2, data); - } -@@ -66,7 +67,7 @@ static void gen_menu_textures(struct wio_server *server) { - cairo_surface_flush(surf); - unsigned char *data = cairo_image_surface_get_data(surf); - server->menu.active_textures[i] = wlr_texture_from_pixels(renderer, -- WL_SHM_FORMAT_ARGB8888, -+ DRM_FORMAT_ARGB8888, - cairo_image_surface_get_stride(surf), - extents.width + 2, extents.height + 2, data); - } -@@ -152,7 +153,7 @@ int main(int argc, char **argv) { - } - - server.wl_display = wl_display_create(); -- server.backend = wlr_backend_autocreate(server.wl_display, NULL); -+ server.backend = wlr_backend_autocreate(server.wl_display); - server.renderer = wlr_backend_get_renderer(server.backend); - wlr_renderer_init_wl_display(server.renderer, server.wl_display); - -diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml -index 90b8bc8..d62fd51 100644 ---- a/protocols/wlr-layer-shell-unstable-v1.xml -+++ b/protocols/wlr-layer-shell-unstable-v1.xml -@@ -25,7 +25,7 @@ - THIS SOFTWARE. - - -- -+ - - Clients can use this interface to assign the surface_layer role to - wl_surfaces. Such surfaces are assigned to a "layer" of the output and -@@ -47,6 +47,12 @@ - or manipulate a buffer prior to the first layer_surface.configure call - must also be treated as errors. - -+ After creating a layer_surface object and setting it up, the client -+ must perform an initial commit without any buffer attached. -+ The compositor will reply with a layer_surface.configure event. -+ The client must acknowledge it and is then allowed to attach a buffer -+ to map the surface. -+ - You may pass NULL for output to allow the compositor to decide which - output to use. Generally this will be the one that the user most - recently interacted with. -@@ -82,17 +88,35 @@ - - - -+ -+ -+ -+ -+ -+ This request indicates that the client will not use the layer_shell -+ object any more. Objects that have been created through this instance -+ are not affected. -+ -+ - - -- -+ - - An interface that may be implemented by a wl_surface, for surfaces that - are designed to be rendered as a layer of a stacked desktop-like - environment. - -- Layer surface state (size, anchor, exclusive zone, margin, interactivity) -- is double-buffered, and will be applied at the time wl_surface.commit of -- the corresponding wl_surface is called. -+ Layer surface state (layer, size, anchor, exclusive zone, -+ margin, interactivity) is double-buffered, and will be applied at the -+ time wl_surface.commit of the corresponding wl_surface is called. -+ -+ Attaching a null buffer to a layer surface unmaps it. -+ -+ Unmapping a layer_surface means that the surface cannot be shown by the -+ compositor until it is explicitly mapped again. The layer_surface -+ returns to the state it had right after layer_shell.get_layer_surface. -+ The client can re-map the surface by performing a commit without any -+ buffer attached, waiting for a configure event and handling it as usual. - - - -@@ -127,14 +151,19 @@ - - - -- Requests that the compositor avoids occluding an area of the surface -- with other surfaces. The compositor's use of this information is -+ Requests that the compositor avoids occluding an area with other -+ surfaces. The compositor's use of this information is - implementation-dependent - do not assume that this region will not - actually be occluded. - -- A positive value is only meaningful if the surface is anchored to an -- edge, rather than a corner. The zone is the number of surface-local -- coordinates from the edge that is considered exclusive. -+ A positive value is only meaningful if the surface is anchored to one -+ edge or an edge and both perpendicular edges. If the surface is not -+ anchored, anchored to only two perpendicular edges (a corner), anchored -+ to only two parallel edges or anchored to all edges, a positive value -+ will be treated the same as zero. -+ -+ A positive zone is the distance from the edge in surface-local -+ coordinates to consider exclusive. - - Surfaces that do not wish to have an exclusive zone may instead specify - how they should interact with surfaces that do. If set to zero, the -@@ -174,21 +203,85 @@ - - - -+ -+ -+ Types of keyboard interaction possible for layer shell surfaces. The -+ rationale for this is twofold: (1) some applications are not interested -+ in keyboard events and not allowing them to be focused can improve the -+ desktop experience; (2) some applications will want to take exclusive -+ keyboard focus. -+ -+ -+ -+ -+ This value indicates that this surface is not interested in keyboard -+ events and the compositor should never assign it the keyboard focus. -+ -+ This is the default value, set for newly created layer shell surfaces. -+ -+ This is useful for e.g. desktop widgets that display information or -+ only have interaction with non-keyboard input devices. -+ -+ -+ -+ -+ Request exclusive keyboard focus if this surface is above the shell surface layer. -+ -+ For the top and overlay layers, the seat will always give -+ exclusive keyboard focus to the top-most layer which has keyboard -+ interactivity set to exclusive. If this layer contains multiple -+ surfaces with keyboard interactivity set to exclusive, the compositor -+ determines the one receiving keyboard events in an implementation- -+ defined manner. In this case, no guarantee is made when this surface -+ will receive keyboard focus (if ever). -+ -+ For the bottom and background layers, the compositor is allowed to use -+ normal focus semantics. -+ -+ This setting is mainly intended for applications that need to ensure -+ they receive all keyboard events, such as a lock screen or a password -+ prompt. -+ -+ -+ -+ -+ This requests the compositor to allow this surface to be focused and -+ unfocused by the user in an implementation-defined manner. The user -+ should be able to unfocus this surface even regardless of the layer -+ it is on. -+ -+ Typically, the compositor will want to use its normal mechanism to -+ manage keyboard focus between layer shell surfaces with this setting -+ and regular toplevels on the desktop layer (e.g. click to focus). -+ Nevertheless, it is possible for a compositor to require a special -+ interaction to focus or unfocus layer shell surfaces (e.g. requiring -+ a click even if focus follows the mouse normally, or providing a -+ keybinding to switch focus between layers). -+ -+ This setting is mainly intended for desktop shell components (e.g. -+ panels) that allow keyboard interaction. Using this option can allow -+ implementing a desktop shell that can be fully usable without the -+ mouse. -+ -+ -+ -+ - - -- Set to 1 to request that the seat send keyboard events to this layer -- surface. For layers below the shell surface layer, the seat will use -- normal focus semantics. For layers above the shell surface layers, the -- seat will always give exclusive keyboard focus to the top-most layer -- which has keyboard interactivity set to true. -+ Set how keyboard events are delivered to this surface. By default, -+ layer shell surfaces do not receive keyboard events; this request can -+ be used to change this. -+ -+ This setting is inherited by child surfaces set by the get_popup -+ request. - - Layer surfaces receive pointer, touch, and tablet events normally. If - you do not want to receive them, set the input region on your surface - to an empty region. - -- Events is double-buffered, see wl_surface.commit. -+ Keyboard interactivity is double-buffered, see wl_surface.commit. - -- -+ - - - -@@ -273,6 +366,7 @@ - - - -+ - - - -@@ -281,5 +375,16 @@ - - - -+ -+ -+ -+ -+ -+ Change the layer that the surface is rendered on. -+ -+ Layer is double-buffered, see wl_surface.commit. -+ -+ -+ - - From 89c5e61ef35452c1ae8190f7bf5b762a3d924fde Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Fri, 21 May 2021 21:58:15 +0000 Subject: [PATCH 606/664] radarr: 3.1.1.4954 -> 3.2.0.5048 --- pkgs/servers/radarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index fb5792c6e42b..1a2bd47d44ec 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-5W4X1E7794hFVPo4+s826CNIrw6Z/n0cDjj6pmsj2Dk="; - arm64-linux_hash = "sha256-gqCgToAVIS+IEulFY4mo2Mtcb3nyFpzDBqVEewREQcs="; - x64-osx_hash = "sha256-MFpIzSYAvAWVHMdEd+aP67s3po+yb3qWzSd/Ko++5Jc="; + x64-linux_hash = "sha256-uuD22/K8jxGzqkuHsG6NyhxNo/7ZJyTXkEuCKhP8lMM="; + arm64-linux_hash = "sha256-bADOyqMtoiisugHF78BNYlUr6rHEODEw05ZkA4IMVgc="; + x64-osx_hash = "sha256-ZjJY4KgoLS9OcuE/SDFcPeFdIj/MkCCn+egK6fBGVmc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.1.1.4954"; + version = "3.2.0.5048"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From 29452a8b8b1dfdd9bbdd151bf5168c118cd6a6bf Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Sun, 30 May 2021 11:18:19 +0200 Subject: [PATCH 607/664] radarr: 3.2.0.5048 -> 3.2.1.5070 --- pkgs/servers/radarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 1a2bd47d44ec..f56766d9b638 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-uuD22/K8jxGzqkuHsG6NyhxNo/7ZJyTXkEuCKhP8lMM="; - arm64-linux_hash = "sha256-bADOyqMtoiisugHF78BNYlUr6rHEODEw05ZkA4IMVgc="; - x64-osx_hash = "sha256-ZjJY4KgoLS9OcuE/SDFcPeFdIj/MkCCn+egK6fBGVmc="; + x64-linux_hash = "sha256-/9W8VwA3d7R2pYH45QvGC1q9f9M9C867nKuhSlU6zsg="; + arm64-linux_hash = "sha256-QjIg+XY5vTmYH+wYqU3VZ5MfxSAcUcGVvapyrlMDbLI="; + x64-osx_hash = "sha256-K17tzGdLKpHkkLSOT3a4FXXfeGz6LJ6cxd20IuJ2zVs="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.2.0.5048"; + version = "3.2.1.5070"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From 8217ea50000728c55fe8b21454ca2572743d8302 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 1 Jun 2021 15:45:47 +0200 Subject: [PATCH 608/664] changelog: fix typo --- nixos/doc/manual/release-notes/rl-2105.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index d76d7446e6b2..b0e4f923f066 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -795,7 +795,7 @@ environment.systemPackages = [ In the module, use of --reuse-key - parameter for Lego has been removed. It was introduced for HKPK, but this security + parameter for Lego has been removed. It was introduced for HKPK, but this security feature is now deprecated. It is a better security practice to rotate key pairs instead of always keeping the same. If you need to keep this parameter, you can add it back using extraLegoRenewFlags as an option for the From 794d931156345b787f92051386bf5533b9088e1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 16:30:48 +0200 Subject: [PATCH 609/664] python3Packages.mechanicalsoup: 1.0.0 -> 1.1.0 --- .../python-modules/MechanicalSoup/default.nix | 33 ------------ .../python-modules/mechanicalsoup/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 55 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/MechanicalSoup/default.nix create mode 100644 pkgs/development/python-modules/mechanicalsoup/default.nix diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix deleted file mode 100644 index e4ce48158f64..000000000000 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six, lxml -, pytestrunner, requests-mock, pytestcov, pytest -}: - -buildPythonPackage rec { - pname = "MechanicalSoup"; - version = "1.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "37d3b15c1957917d3ae171561e77f4dd4c08c35eb4500b8781f6e7e1bb6c4d07"; - }; - - checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; - - propagatedBuildInputs = [ lxml requests beautifulsoup4 six ]; - - # Requires network - doCheck = false; - - postPatch = '' - # Is in setup_requires but not used in setup.py... - substituteInPlace setup.py --replace "'pytest-runner'" "" - ''; - - meta = with lib; { - description = "A Python library for automating interaction with websites"; - homepage = "https://github.com/hickford/MechanicalSoup"; - license = licenses.mit; - maintainers = [ maintainers.jgillich ]; - }; -} diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix new file mode 100644 index 000000000000..3bf1acb182c6 --- /dev/null +++ b/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -0,0 +1,53 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, lxml +, pytest-httpbin +, pytest-mock +, pytestCheckHook +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "mechanicalsoup"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "MechanicalSoup"; + repo = "MechanicalSoup"; + rev = "v${version}"; + sha256 = "1mly0ivai3rx64frk7a7ra6abhdxm9x3l6s6x7sgrl9qx1z8zsp3"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + requests + ]; + + checkInputs = [ + pytest-httpbin + pytest-mock + pytestCheckHook + requests-mock + ]; + + postPatch = '' + # Is in setup_requires but not used in setup.py + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + substituteInPlace setup.cfg \ + --replace " --cov --cov-config .coveragerc --flake8" "" + ''; + + pythonImportsCheck = [ "mechanicalsoup" ]; + + meta = with lib; { + description = "Python library for automating interaction with websites"; + homepage = "https://github.com/hickford/MechanicalSoup"; + license = licenses.mit; + maintainers = with maintainers; [ jgillich fab ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 09773441e335..a4dba6a38772 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,4 +36,5 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + mechanicalsoup = MechanicalSoup; # added 2021-06-01 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03ffc1a6bda4..880544401109 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4213,7 +4213,7 @@ in { mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; - MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; + mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { }; mechanize = callPackage ../development/python-modules/mechanize { }; From 504c577315bcc4dcf7b6da2863143a5578fb78ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 1 Jun 2021 17:20:23 +0200 Subject: [PATCH 610/664] s2n-tls: split dev output to reduce Nix closure --- pkgs/development/libraries/aws-c-io/default.nix | 2 +- pkgs/development/libraries/s2n-tls/default.nix | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 39230cc088d6..80112926ca61 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n-tls]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index b54fd0b74a71..5bae8df59e6a 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -13,12 +13,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). + outputs = [ "out" "dev"]; + + buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). + + postInstall = '' + substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + ''; + meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; homepage = "https://github.com/aws/s2n-tls"; From 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 1 Jun 2021 17:54:10 +0200 Subject: [PATCH 611/664] warzone2100: fix build I'm not sure how the build broke[1] or how it worked before, but the problem is zip is being used in place of p7zip, which obviously fail as the flags have different meanings. [1]: https://hydra.nixos.org/build/143354937 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index c0707ed5e864..7f2ad875d8cf 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , ninja -, zip +, p7zip , pkg-config , asciidoctor , gettext @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { pkg-config cmake ninja - zip + p7zip asciidoctor gettext shaderc From 01e24bd0ddf5d8dffd5238e9720a118447721991 Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Tue, 1 Jun 2021 15:59:57 +0000 Subject: [PATCH 612/664] add himalaya Vim plugin (#124512) Co-authored-by: Sandro --- pkgs/misc/vim-plugins/overrides.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bafc7147efde..8618d2c506f5 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -21,6 +21,7 @@ , direnv , fzf , gnome +, himalaya , khard , languagetool , llvmPackages @@ -286,6 +287,21 @@ self: super: { }; }); + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + inherit (himalaya) src version; + configurePhase = "cd vim/"; + dependencies = with self; [ himalaya ]; + preFixup = '' + substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ + --replace 'if !executable("himalaya")' 'if v:false' + ''; + postFixup = '' + mkdir -p $out/bin + ln -s ${himalaya}/bin/himalaya $out/bin/himalaya + ''; + }; + LanguageClient-neovim = let version = "0.1.161"; From 0e4294fd3e6e2dd203dc3659ac203ba5492efa57 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 1 Jun 2021 19:04:22 +0300 Subject: [PATCH 613/664] gpxlab: fix localization (#124012) Co-authored-by: Guillaume Girol --- pkgs/applications/misc/gpxlab/default.nix | 19 ++++++++++++------- .../misc/gpxlab/fix-qttranslations-path.patch | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 3b432ff66b12..c8d6eb3b84c7 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, substituteAll +, qmake, qttools, qttranslations +}: mkDerivation rec { pname = "gpxlab"; @@ -11,8 +13,13 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qttools qttranslations ]; + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + + nativeBuildInputs = [ qmake qttools ]; preConfigure = '' lrelease GPXLab/locale/*.ts @@ -24,8 +31,6 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BourgeoisLab/GPXLab"; description = "Program to show and manipulate GPS tracks"; @@ -33,8 +38,8 @@ mkDerivation rec { GPXLab is an application to display and manage GPS tracks previously recorded with a GPS tracker. ''; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch new file mode 100644 index 000000000000..8dcba75d764f --- /dev/null +++ b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch @@ -0,0 +1,17 @@ +diff --git i/GPXLab/main.cpp w/GPXLab/main.cpp +index b12d2dd..58d37c5 100644 +--- i/GPXLab/main.cpp ++++ w/GPXLab/main.cpp +@@ -19,10 +19,10 @@ int main(int argc, char *argv[]) + app.installTranslator(&gpxlab); + + QTranslator qt; +-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN32) + qt.load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR); + #else +- qt.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qt.load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + #endif + app.installTranslator(&qt); + From 9d753df87bc9710a5d495178a0555ad0d8ca3f06 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 May 2021 17:28:25 -0700 Subject: [PATCH 614/664] kalk: init at 0.5.4 --- pkgs/tools/misc/kalk/default.nix | 38 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/kalk/default.nix diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalk/default.nix new file mode 100644 index 000000000000..64fabd805a6d --- /dev/null +++ b/pkgs/tools/misc/kalk/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, m4 +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "kalk"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "PaddiM8"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lHHnNiNy8L8GdjOj5EqtticnksPrCwhFoFatFrWEQJ4="; + }; + + cargoSha256 = "sha256-Qtip9CeurTM4aY67F5tSM3fis6W/dlnaIVMQ29UoBzc="; + + nativeBuildInputs = [ m4 ]; + + outputs = [ "out" "lib" ]; + + postInstall = '' + moveToOutput "lib" "$lib" + ''; + + meta = with lib; { + homepage = "https://kalk.strct.net"; + changelog = "https://github.com/PaddiM8/kalk/releases/tag/v${version}"; + description = "A command line calculator"; + longDescription = '' + A command line calculator that supports math-like syntax with user-defined + variables, functions, derivation, integration, and complex numbers + ''; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07af5632d9a7..79da06464374 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2830,6 +2830,8 @@ in kaldi = callPackage ../tools/audio/kaldi { }; + kalk = callPackage ../tools/misc/kalk { }; + kisslicer = callPackage ../tools/misc/kisslicer { }; klaus = with python3Packages; toPythonApplication klaus; From eefa2ee38e604acdbaabd5de870a81928bc24d80 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 2 Jun 2021 00:31:31 +0800 Subject: [PATCH 615/664] editline: 1.17.0 -> 1.17.1 and add patch to fix Home and End key in tmux (#124853) Co-authored-by: Sandro --- .../libraries/editline/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 82f65082b946..2b2ffbea31e2 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, nix-update-script, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6"; + sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; }; patches = [ (fetchpatch { - name = "fix-for-multiline-as-one-line.patch"; - url = "https://github.com/troglobit/editline/commit/ceee039cfc819c8e09eebbfca192091b0cf8df75.patch"; - sha256 = "149fmfva05ghzwkd0bq1sahdbkys3qyyky28ssqb5jq7q9hw3ddm"; + name = "fix-for-home-end-in-tmux.patch"; + url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; + sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; }) ]; @@ -22,11 +22,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { - homepage = "https://troglobit.com/editline.html"; + homepage = "https://troglobit.com/projects/editline/"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill oxalica ]; platforms = platforms.all; }; } From f9c85326cab17af956d1b002273ff1c18f0a94c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 11:58:26 +0000 Subject: [PATCH 616/664] innernet: 1.3.0 -> 1.3.1 --- pkgs/tools/networking/innernet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index f260f1be5e04..7bedbb3a6dc5 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WqUkl9NZMMQJknASadLJz3CslrplGuXLrlv6fiwWFoI="; + sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY="; }; - cargoSha256 = "sha256-mexiI9EHL2L4RNXCk133vriI5IGpdxLVy6xnBIqEH30="; + cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU="; nativeBuildInputs = with llvmPackages; [ llvm From 1508c220f98d3166c8b4fda94a409e1c3a11cf79 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Jun 2021 16:47:35 +0200 Subject: [PATCH 617/664] ddclient: 3.9.0 -> 3.9.1 --- pkgs/tools/networking/ddclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index f62eba66f99b..77aad6fa7b31 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz"; - sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw"; + sha256 = "0w14qnn72j333i3j7flxkw6bzcg4n31d8jfnvhmwa7s9rharx5p4"; }; # perl packages by default get devdoc which isn't present From 886bb2388a120a927052846ae1868883be95e316 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 2 Jun 2021 01:21:11 +0800 Subject: [PATCH 618/664] papirus-icon-theme: 20210501 -> 20210601 --- pkgs/data/icons/papirus-icon-theme/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index bd9ab1bb77b3..e7543aff6668 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210501"; + version = "20210601"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-3KH0oLeCev7WuoIOh4KBTiHTn2/aQlVrW5dpO+LSRT4="; + sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds="; }; - nativeBuildInputs = [ - gtk3 - ]; + nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ pantheon.elementary-icon-theme From 4f0cf23ea3067493b93cc422d52f9bc10abc1e04 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 1 Jun 2021 10:23:54 -0700 Subject: [PATCH 619/664] gnomeExtensions: allowAliases should default to true if unset Make this use of config.allowAliases consistent with every other use in the tree. Signed-off-by: Anders Kaseorg --- pkgs/desktops/gnome/extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 1ca9a57eb990..0e1167561ebe 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -62,7 +62,7 @@ in rec { gnomeExtensions = lib.recurseIntoAttrs ( (mapReadableNames (produceExtensionsList "40")) // (callPackage ./manuallyPackaged.nix {}) - // lib.optionalAttrs (config.allowAliases or false) { + // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 From 7ed1077157d9726980bbffd19890a2ecf21af3f2 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Tue, 1 Jun 2021 13:48:12 -0400 Subject: [PATCH 620/664] Update pulumi to 3.3.1 --- pkgs/tools/admin/pulumi/data.nix | 106 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 26 ++++---- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 7642acb25eba..2955be2d7937 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.3.0"; + version = "3.3.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-linux-x64.tar.gz"; - sha256 = "0kcq7zwgbp465lx7p80l5xc50xdmydq32djzis0973hxlkgliiq6"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-linux-x64.tar.gz"; + sha256 = "1mqvx5g1pfc5fi4xmdp8fva1pzfxqm062mzl972fc3yrzfl7792f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-linux-amd64.tar.gz"; - sha256 = "0vws9mll2k42qx04idyf13vai018552wyrvr1jxjf4fl93yrayz7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; + sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-linux-amd64.tar.gz"; - sha256 = "0mz9zxlx4vc26g0khvdlg5kzc74shdc4lca8h1l9sxqwgkmyga7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-linux-amd64.tar.gz"; + sha256 = "0i2bwxx49nqca3kykxbjfbbmgyr3qdlw3q4wp384ai5r9psk4iac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-linux-amd64.tar.gz"; - sha256 = "0xs7i9l871x5kr22jg7jjw0rgyvs4j4hazr4n9375xgzc8ysrk09"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0s8z4h0m3ipkxrbw6h8i8ciam3cgmacw3rvc63qydy5gqv9x6h6w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0bfs64za4i5bmk3r8qyhgh0x58cdrn88gv0i3vm4prry53zgy3ny"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; + sha256 = "14s6jyackhp324gdlvvqnyi8s7hj0fb92ilrpd460p05p653zb4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-linux-amd64.tar.gz"; - sha256 = "0s1z33iqf0nvrgpq6rqnm79sr8bnnkfspq8qnfynybcn80drn7vd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-linux-amd64.tar.gz"; - sha256 = "0gk60n5s9hjfsaz09aknivqpz1cw41vs6j84fdb3chkip8xzwdr7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1r9cgwb0d332hrx33i40vphimhwcnqw5gkzbin7rmxlmasrkgwwy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,24 +41,24 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-linux-amd64.tar.gz"; - sha256 = "1rsqkp76sck0162hz3s5yljs79gis886k1v99k77hr1gbk08rx71"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-linux-amd64.tar.gz"; + sha256 = "1pagydam6xypb1gbk710v3qid2bn77df9lzqfxk5l2pbbs65cvyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-linux-amd64.tar.gz"; - sha256 = "0g5x5wycgbn0iwp9y4fp0aqf36pfa3210n1rmiavx1a2g2zj9zvx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-linux-amd64.tar.gz"; + sha256 = "08kxd1x8kx2zdwylhprkb6hs02z3b4jmjphail1s395gzq1271bc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-linux-amd64.tar.gz"; - sha256 = "1j8232vw457fl0jhy08abs5hcx8nd2lll3zg9bp3s352wz2r5xl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-linux-amd64.tar.gz"; + sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-linux-amd64.tar.gz"; sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-linux-amd64.tar.gz"; - sha256 = "010j0xmrb5msva2mcmrpr0h8dhpk7x6bswbsbkkdjrf88baryyq0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0l1pr8yfq901wr8ngan1hrwhb4lvcxa92sg38gqixzma0x6xhgwb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz"; @@ -81,12 +81,12 @@ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-linux-amd64.tar.gz"; - sha256 = "16z2jcixwqasj0rdj83gvsjb51xw5k6kj474sfdx8n0150hplma9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0s1fkj1s5qni84lz0gr1d10xyxp87877jana67lxbarskvzpys8r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-linux-amd64.tar.gz"; - sha256 = "1lc1i4irkrlv1cxy6xzl1fw8205rvhrdp2if09w4givq351lrmbm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; + sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-linux-amd64.tar.gz"; @@ -99,32 +99,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-darwin-x64.tar.gz"; - sha256 = "1znjqjwasnw9wjdkrwss9shxvizsn5pav1a8rd8c1c6kcgpi01r7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-darwin-x64.tar.gz"; + sha256 = "0ri2wq45qm8fabdfsyr1vipnf6ybshxhqr3zrjs8qq1pyf92m5ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-darwin-amd64.tar.gz"; - sha256 = "11cpidiasmsy6d29ycpzwkn0vfac9cd1ng410ljhjw8bmmrgfg6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-darwin-amd64.tar.gz"; - sha256 = "195wrwyw25kaixv277ww38mbw19rq6f56m40f3p0rgicjn2dsgyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "1rnb9q8w88jhp9mm3g31dnd4dis3j52pl97cd0yqg046f6jm048q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0kvr057hdwcxf7gj788sv6ysz25ap3z0akqhhb20mlzv3shwiiji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1qjz33npwc7wdq3vrvfxhd4g1pwgl3p7cz5fkwyqs4zp24dcx1ga"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0q4lb32j1bm34sag39w9s6415fni169800k1qyym193s13c4gk89"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1bb78g8k6gnhyxxvcjspnhbw2fig58flr14zi5i1cbd89xkz0m3i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "167hg0j3rzxv9bsadhzgv5sz2jhqxdfn0sx35ws8v8b1rblmxywc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "12r9k2ywxi8myvd80gmk1hvhgjmr5js6i5n6jghsyh083kh5wam7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "18qisw7m1kih27vl2099rzw44h8qyr2f3dnxby03z95f1nwyz1f1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,24 +135,24 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "121yaplx4nnq9is30iczbqibj1069jh9bqzgbriscd07kifyrpbw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "07fdrg3wd3wlsvh37gbxli0xcxd2c7g61ynrxzi0q8dg7687gjpq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-darwin-amd64.tar.gz"; - sha256 = "06nkd2pd4hwahbyh8ygn54xq5hdpbphfkkfhrg4jwgmfgacnz5x9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "107b6nlcc99lfysh5v3wz4vz751cdz12k0lm8jh39ikmdck5fphs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1i3zmflwjjfc13j7w9acavgrbblm9fri041z6qpb3ikcq5s9lqcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-darwin-amd64.tar.gz"; sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1ix5x92h7i6dlzcpnm819vf4nx1q3p88ky01mfs000xh9pl324ch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0ic8cnrv8z1qwnlqk3dc3xrczx4ncxwdsdh1shk655hcsfdrcldq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz"; @@ -175,12 +175,12 @@ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-darwin-amd64.tar.gz"; - sha256 = "00b6i6dai21b8biqdw5ybj2dk7267i99bji2siicvj0nvi3s2wzx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1x5fm72v9h3lrqcyyq2xm14bc14rsqhjmc4mwa2wgbk4pvjgawyv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-darwin-amd64.tar.gz"; - sha256 = "1ja36fh8760sw8sb3wzp5kbv71wv1544ir74ffkw6l0v4q29bwlq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index cc7f381ee0f4..ed4fbd79ed81 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.3.0" +VERSION="3.3.1" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=2.1.0" - "aws=4.5.1" - "cloudflare=3.0.0" - "consul=3.1.0" - "datadog=3.2.0" - "digitalocean=4.2.0" + "auth0=2.2.0" + "aws=4.6.0" + "cloudflare=3.1.0" + "consul=3.2.0" + "datadog=3.3.0" + "digitalocean=4.3.1" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.4.0" - "github=4.0.2" - "gitlab=4.0.0" + "gcp=5.6.0" + "github=4.1.0" + "gitlab=4.1.0" "hcloud=1.0.0" - "kubernetes=3.2.0" + "kubernetes=3.3.0" "linode=3.1.0" "mailgun=3.1.0" "mysql=3.0.0" "openstack=3.2.0" "packet=3.2.2" - "postgresql=3.0.1" - "random=4.1.1" + "postgresql=3.1.0" + "random=4.2.0" "vault=4.1.0" "vsphere=3.1.0" ) From 0b2d60dbf2f2950cc60a5aa8e133915f26dc7d1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 18:21:24 +0000 Subject: [PATCH 621/664] libsForQt5.drumstick: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/drumstick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index d835606b7c86..3f3350073be3 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ytus/kgL2Bs0vRQGROoJO9eO6lajOSaQLVjwsF4YypY="; + sha256 = "sha256-UxXUEkO5qXPIjw99BdkAspikR9Nlu32clf28cTyf+W4="; }; patches = [ From f2e4cb7f20bc3919fec844741120d85aad2cab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 1 Jun 2021 08:26:42 +0200 Subject: [PATCH 622/664] nixos/containerd: improve zfs support --- nixos/modules/virtualisation/containerd.nix | 45 +++++++++++++++++---- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index b554bc6ea245..c7ceb816a311 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -1,10 +1,20 @@ { pkgs, lib, config, ... }: let cfg = config.virtualisation.containerd; - containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { nativeBuildInputs = [pkgs.containerd]; } '' - containerd -c ${cfg.configFile} config dump >/dev/null - ln -s ${cfg.configFile} $out + + configFile = if cfg.configFile == null then + settingsFormat.generate "containerd.toml" cfg.settings + else + cfg.configFile; + + containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { + nativeBuildInputs = [ pkgs.containerd ]; + } '' + containerd -c ${configFile} config dump >/dev/null + ln -s ${configFile} $out ''; + + settingsFormat = pkgs.formats.toml {}; in { @@ -13,10 +23,21 @@ in configFile = lib.mkOption { default = null; - description = "path to containerd config file"; + description = '' + Path to containerd config file. + Setting this option will override any configuration applied by the settings option. + ''; type = nullOr path; }; + settings = lib.mkOption { + type = settingsFormat.type; + default = {}; + description = '' + Verbatim lines to add to containerd.toml + ''; + }; + args = lib.mkOption { default = {}; description = "extra args to append to the containerd cmdline"; @@ -25,9 +46,19 @@ in }; config = lib.mkIf cfg.enable { - virtualisation.containerd.args.config = lib.mkIf (cfg.configFile != null) (toString containerdConfigChecked); + warnings = lib.optional (cfg.configFile != null) '' + `virtualisation.containerd.configFile` is deprecated. use `virtualisation.containerd.settings` instead. + ''; - environment.systemPackages = [pkgs.containerd]; + virtualisation.containerd = { + args.config = toString containerdConfigChecked; + settings = { + plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs"; + plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin"; + }; + }; + + environment.systemPackages = [ pkgs.containerd ]; systemd.services.containerd = { description = "containerd - container runtime"; @@ -37,7 +68,7 @@ in containerd runc iptables - ]; + ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { ExecStart = ''${pkgs.containerd}/bin/containerd ${lib.concatStringsSep " " (lib.cli.toGNUCommandLine {} cfg.args)}''; Delegate = "yes"; From cdad975ce0b8927131197fb70e7760040de78fc4 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Tue, 1 Jun 2021 20:11:23 +0100 Subject: [PATCH 623/664] remove solson as maintainer I don't actively use either of these packages. I kept myself in the maintainers list because I expect to maintain new packages in the future. --- pkgs/development/libraries/drumstick/default.nix | 2 +- pkgs/development/tools/cue/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index d835606b7c86..7ef025f22f7a 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - maintainers = with maintainers; [ solson ]; + maintainers = []; description = "MIDI libraries for Qt5/C++"; homepage = "http://drumstick.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 08dada094ff4..5170297a4330 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "A data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - maintainers = with lib.maintainers; [ solson ]; + maintainers = []; license = lib.licenses.asl20; }; } From b80463f8d574bb4efff0392c94d63021c63916b9 Mon Sep 17 00:00:00 2001 From: cwyc <16950437+cwyc@users.noreply.github.com> Date: Sat, 29 May 2021 15:52:57 -0400 Subject: [PATCH 624/664] antimony: add desktop item --- .../graphics/antimony/default.nix | 26 ++++++++++++++++++- .../graphics/antimony/mimetype.xml | 7 +++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/antimony/mimetype.xml diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index d92ad9998f2c..8b482626c91a 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, libpng, python3 , libGLU, libGL, qtbase, wrapQtAppsHook, ncurses , cmake, flex, lemon +, makeDesktopItem, copyDesktopItems }: let @@ -27,12 +28,35 @@ in sed -i "s,python3,${python3.executable}," CMakeLists.txt ''; + postInstall = lib.optionalString stdenv.isLinux '' + install -Dm644 $src/deploy/icon.svg $out/share/icons/hicolor/scalable/apps/antimony.svg + install -Dm644 ${./mimetype.xml} $out/share/mime/packages/antimony.xml + ''; + buildInputs = [ libpng python3 python3.pkgs.boost libGLU libGL qtbase ncurses ]; - nativeBuildInputs = [ cmake flex lemon wrapQtAppsHook ]; + nativeBuildInputs = [ cmake flex lemon wrapQtAppsHook copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "antimony"; + desktopName = "Antimony"; + comment="Tree-based Modeler"; + genericName = "CAD Application"; + exec = "antimony %f"; + icon = "antimony"; + terminal = "false"; + categories = "Graphics;Science;Engineering"; + mimeType = "application/x-extension-sb;application/x-antimony;"; + extraEntries = '' + StartupWMClass=antimony + Version=1.0 + ''; + }) + ]; cmakeFlags= [ "-DGITREV=${gitRev}" diff --git a/pkgs/applications/graphics/antimony/mimetype.xml b/pkgs/applications/graphics/antimony/mimetype.xml new file mode 100644 index 000000000000..c6960fba9abc --- /dev/null +++ b/pkgs/applications/graphics/antimony/mimetype.xml @@ -0,0 +1,7 @@ + + + + Antimony model + + + From 57baa7efb78d8eda38ca8955bea1f14e144353b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 1 Jun 2021 21:44:31 +0200 Subject: [PATCH 625/664] jetbrains: updates jetbrains.clion: 2021.1.1 -> 2021.1.2 jetbrains.datagrip: 2021.1.1 -> 2021.1.2 jetbrains.goland: 2021.1.1 -> 2021.1.2 jetbrains.idea-community: 2021.1.1 -> 2021.1.2 jetbrains.idea-ultimate: 2021.1.1 -> 2021.1.2 jetbrains.rider: 2021.1.2 -> 2021.1.3 jetbrains.webstorm: 2021.1.1 -> 2021.1.2 --- .../editors/jetbrains/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 32159e3ebd2c..e72d2df43a93 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0xzlkf3gq6fcb0q9mcj8k39880l8h21pb1lz0xl2dqj8cfwpws9h"; /* updated by script */ + sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0smg0qbk3mnm2543w0nlvnyvbwmprf0p3z2spwrmcmfagv50crrx"; /* updated by script */ + sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "02fyrq4px9w34amincgjgm6maxpxn445j5h4nfbskx7z428ynx25"; /* updated by script */ + sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1say19p7kgx4b2ccs9bv61phllzhl8gmrd1fp1a5cnagya7vl1c5"; /* updated by script */ + sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "19zi4njz79z8gi458kz1m0sia79y3rhbayix4rmh93mwfc0npkii"; /* updated by script */ + sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -359,12 +359,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1a28pi18j0cb2wxhw1vnfg9gqsgf2kyfg0hl4xgqp50gzv7i3aam"; /* updated by script */ + sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -385,12 +385,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1hici40qsxj2fw29g68i6hr1vhr0h7xrlhkialy74ah53wi7myz1"; /* updated by script */ + sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 29043644b0119bd3c5e695fb90ea5e52b4656045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Jun 2021 22:39:59 +0200 Subject: [PATCH 626/664] qutebrowser: 2.2.2 -> 2.2.3 https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.3 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 15e759c8b625..1f03184eeed4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.2.2"; + version = "2.2.3"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "11vjp20gzmdjj09b7wxzn7ar6viih0bk76y618yqsyqqkffylmbq"; + sha256 = "sha256-BoP168jxj94nvkrcgC83fPw/TPRsI2PbCooqzWNF62I="; }; # Needs tox From 43d59e94dca3d49d73112d4697c7d5033263f021 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 1 Jun 2021 16:59:39 -0500 Subject: [PATCH 627/664] poetry2nix: 1.16.1 -> 1.17.0 --- .../tools/poetry2nix/poetry2nix/default.nix | 11 +- .../{fetch-wheel.sh => fetch-from-pypi.sh} | 4 +- .../poetry2nix/fetch_from_legacy.py | 72 +++++ .../tools/poetry2nix/poetry2nix/lib.nix | 57 ++-- .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 14 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 277 ++++++++++++++++-- .../tools/poetry2nix/poetry2nix/pep508.nix | 2 +- 7 files changed, 376 insertions(+), 61 deletions(-) rename pkgs/development/tools/poetry2nix/poetry2nix/{fetch-wheel.sh => fetch-from-pypi.sh} (86%) create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 62063ff09947..9b55b72c2fa0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.16.1"; + version = "1.17.0"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -163,7 +163,7 @@ lib.makeScope pkgs.newScope (self: { compatible = partitions.right; incompatible = partitions.wrong; - # Create an overriden version of pythonPackages + # Create an overridden version of pythonPackages # # We need to avoid mixing multiple versions of pythonPackages in the same # closure as python can only ever have one version of a dependency @@ -229,7 +229,12 @@ lib.makeScope pkgs.newScope (self: { inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; }; - storePackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs); + requiredPythonModules = python.pkgs.requiredPythonModules; + /* Include all the nested dependencies which are required for each package. + This guarantees that using the "poetryPackages" attribute will return + complete list of dependencies for the poetry project to be portable. + */ + storePackages = requiredPythonModules (builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs)); in { python = py; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh similarity index 86% rename from pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh rename to pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh index 97f54b23416d..e56dee6849b2 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh @@ -9,12 +9,12 @@ curl="curl \ --cookie-jar cookies \ --insecure \ --speed-time 5 \ - -# \ + --progress-bar \ --fail \ $curlOpts \ $NIX_CURL_FLAGS" -echo "Trying to fetch wheel with predicted URL: $predictedURL" +echo "Trying to fetch with predicted URL: $predictedURL" $curl $predictedURL --output $out && exit 0 diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py new file mode 100644 index 000000000000..5931d4c92708 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py @@ -0,0 +1,72 @@ +# Some repositories (such as Devpi) expose the Pypi legacy API +# (https://warehouse.pypa.io/api-reference/legacy.html). +# +# Note it is not possible to use pip +# https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12 + +import sys +from urllib.parse import urlparse +from html.parser import HTMLParser +import urllib.request +import shutil +import ssl +import os + + +# Parse the legacy index page to extract the href and package names +class Pep503(HTMLParser): + def __init__(self): + super().__init__() + self.sources = {} + self.url = None + self.name = None + + def handle_data(self, data): + if self.url is not None: + self.name = data + + def handle_starttag(self, tag, attrs): + if tag == "a": + for name, value in attrs: + if name == "href": + self.url = value + + def handle_endtag(self, tag): + if self.url is not None: + self.sources[self.name] = self.url + self.url = None + + +url = sys.argv[1] +package_name = sys.argv[2] +index_url = url + "/" + package_name +package_filename = sys.argv[3] + +print("Reading index %s" % index_url) + +response = urllib.request.urlopen( + index_url, + context=ssl.CERT_NONE) +index = response.read() + +parser = Pep503() +parser.feed(str(index)) +if package_filename not in parser.sources: + print("The file %s has not be found in the index %s" % ( + package_filename, index_url)) + exit(1) + +package_file = open(package_filename, "wb") +# Sometimes the href is a relative path +if urlparse(parser.sources[package_filename]).netloc == '': + package_url = index_url + "/" + parser.sources[package_filename] +else: + package_url = parser.sources[package_filename] +print("Downloading %s" % package_url) + +response = urllib.request.urlopen( + package_url, + context=ssl.CERT_NONE) + +with response as r: + shutil.copyfileobj(r, package_file) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 6af37b395e0c..cb1cd8af1316 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -93,17 +93,19 @@ let ); - # Fetch the wheels from the PyPI index. - # We need to first get the proper URL to the wheel. + # Fetch from the PyPI index. + # At first we try to fetch the predicated URL but if that fails we + # will use the Pypi API to determine the correct URL. # Args: # pname: package name # file: filename including extension + # version: the version string of the dependency # hash: SRI hash # kind: Language implementation and version tag - fetchWheelFromPypi = lib.makeOverridable ( - { pname, file, hash, kind, curlOpts ? "" }: + fetchFromPypi = lib.makeOverridable ( + { pname, file, version, hash, kind, curlOpts ? "" }: let - version = builtins.elemAt (builtins.split "-" file) 2; + predictedURL = predictURLFromPypi { inherit pname file hash kind; }; in (pkgs.stdenvNoCC.mkDerivation { name = file; @@ -111,7 +113,7 @@ let pkgs.curl pkgs.jq ]; - isWheel = true; + isWheel = lib.strings.hasSuffix "whl" file; system = "builtin"; preferLocalBuild = true; @@ -119,36 +121,35 @@ let "NIX_CURL_FLAGS" ]; - predictedURL = predictURLFromPypi { inherit pname file hash kind; }; - inherit pname file version curlOpts; + inherit pname file version curlOpts predictedURL; - builder = ./fetch-wheel.sh; + builder = ./fetch-from-pypi.sh; outputHashMode = "flat"; outputHashAlgo = "sha256"; outputHash = hash; + + passthru = { + urls = [ predictedURL ]; # retain compatibility with nixpkgs' fetchurl + }; }) ); - # Fetch the artifacts from the PyPI index. Since we get all - # info we need from the lock file we don't use nixpkgs' fetchPyPi - # as it modifies casing while not providing anything we don't already - # have. - # - # Args: - # pname: package name - # file: filename including extension - # hash: SRI hash - # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention - fetchFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } - else - pkgs.fetchurl { - url = predictURLFromPypi { inherit pname file hash kind; }; - inherit hash; - } + fetchFromLegacy = lib.makeOverridable ( + { python, pname, url, file, hash }: + pkgs.runCommand file + { + nativeBuildInputs = [ python ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = hash; + } '' + python ${./fetch_from_legacy.py} ${url} ${pname} ${file} + mv ${file} $out + '' ); + getBuildSystemPkgs = { pythonPackages , pyProject @@ -215,7 +216,7 @@ in { inherit fetchFromPypi - fetchWheelFromPypi + fetchFromLegacy getManyLinuxDeps isCompatible readTOML diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index bb7b4e39b037..b403e9941f34 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -28,7 +28,7 @@ pythonPackages.callPackage }@args: let inherit (pkgs) stdenv; - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; + inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromLegacy fetchFromPypi moduleName; inherit (import ./pep425.nix { inherit lib poetryLib python; @@ -37,7 +37,7 @@ pythonPackages.callPackage ; fileCandidates = let - supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); + supportedRegex = ("^.*(" + builtins.concatStringsSep "|" supportedExtensions + ")"); matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; hasSupportedExtension = fname: builtins.match supportedRegex fname != null; isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; @@ -48,6 +48,7 @@ pythonPackages.callPackage isGit = isSource && source.type == "git"; isUrl = isSource && source.type == "url"; isLocal = isSource && source.type == "directory"; + isLegacy = isSource && source.type == "legacy"; localDepPath = toPath source.url; buildSystemPkgs = @@ -171,10 +172,19 @@ pythonPackages.callPackage } else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) + else if isLegacy then + fetchFromLegacy + { + pname = name; + inherit python; + inherit (fileInfo) file hash; + inherit (source) url; + } else fetchFromPypi { pname = name; inherit (fileInfo) file hash kind; + inherit version; }; } ) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index f217aefc2d26..ea0045c11474 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -8,7 +8,13 @@ self: super: { automat = super.automat.overridePythonAttrs ( old: rec { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.m2r ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.m2r ]; + } + ); + + aiohttp-swagger3 = super.aiohttp-swagger3.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -21,7 +27,7 @@ self: super: # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies # in a correct manner. - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pycrypto self.paramiko self.jinja2 @@ -170,7 +176,7 @@ self: super: dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; } ); @@ -178,7 +184,7 @@ self: super: super.django.overridePythonAttrs ( old: { propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) - ++ [ pkgs.gettext ]; + ++ [ pkgs.gettext self.pytest-runner ]; } ) ); @@ -193,6 +199,36 @@ self: super: } ); + django-cors-headers = super.django-cors-headers.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + django-hijack = super.django-hijack.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + django-prometheus = super.django-prometheus.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + django-rosetta = super.django-rosetta.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + django-stubs-ext = super.django-stubs-ext.overridePythonAttrs ( + old: { + prePatch = (old.prePatch or "") + "touch ../LICENSE.txt"; + } + ); + dlib = super.dlib.overridePythonAttrs ( old: { # Parallel building enabled @@ -227,6 +263,16 @@ self: super: ''; }; + # remove eth-hash dependency because eth-hash also depends on eth-utils causing a cycle. + eth-utils = super.eth-utils.overridePythonAttrs (old: { + propagatedBuildInputs = + builtins.filter (i: i.pname != "eth-hash") old.propagatedBuildInputs; + preConfigure = '' + ${old.preConfigure or ""} + sed -i '/eth-hash/d' setup.py + ''; + }); + faker = super.faker.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -244,6 +290,10 @@ self: super: } ); + fastecdsa = super.fastecdsa.overridePythonAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.gmp.dev ]; + }); + fastparquet = super.fastparquet.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -313,11 +363,11 @@ self: super: nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.hdf5 self.pkg-config self.cython ] + ++ [ pkgs.hdf5 self.pkgconfig self.cython ] ++ lib.optional mpiSupport mpi ; propagatedBuildInputs = - old.propagatedBuildInputs + (old.propagatedBuildInputs or [ ]) ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ] ; preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; @@ -333,9 +383,25 @@ self: super: ) else old ); + hid = super.hid.overridePythonAttrs ( + old: { + postPatch = '' + found= + for name in libhidapi-hidraw libhidapi-libusb libhidapi-iohidmanager libhidapi; do + full_path=${pkgs.hidapi.out}/lib/$name${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} + if test -f $full_path; then + found=t + sed -i -e "s|'$name\..*'|'$full_path'|" hid/__init__.py + fi + done + test -n "$found" || { echo "ERROR: No known libraries found in ${pkgs.hidapi.out}/lib, please update/fix this build expression."; exit 1; } + ''; + } + ); + horovod = super.horovod.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; } ); @@ -399,7 +465,10 @@ self: super: # importlib-metadata has an incomplete dependency specification importlib-metadata = super.importlib-metadata.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ lib.optional self.python.isPy2 self.pathlib2; + + # disable the removal of pyproject.toml, required because of setuptools_scm + dontPreferSetupPy = true; } ); @@ -411,7 +480,7 @@ self: super: isort = super.isort.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; } ); @@ -453,7 +522,7 @@ self: super: ); jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; }); @@ -487,7 +556,7 @@ self: super: lap = super.lap.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.numpy ]; } @@ -512,7 +581,7 @@ self: super: # Set directory containing llvm-config binary preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm.dev}/bin/llvm-config + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; @@ -523,7 +592,7 @@ self: super: lockfile = super.lockfile.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pbr ]; } ); @@ -570,7 +639,7 @@ self: super: EOF ''; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.libpng pkgs.freetype ] @@ -650,7 +719,7 @@ self: super: }; in { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; enableParallelBuilding = true; preBuild = '' ln -sf ${cfg} mpi.cfg @@ -670,8 +739,15 @@ self: super: } ); + mypy = super.mypy.overridePythonAttrs ( + old: { + MYPY_USE_MYPYC = pkgs.stdenv.buildPlatform.is64bit; + } + ); + mysqlclient = super.mysqlclient.overridePythonAttrs ( old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; } ); @@ -682,7 +758,7 @@ self: super: self.cython ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.zlib pkgs.netcdf pkgs.hdf5 @@ -769,7 +845,7 @@ self: super: in { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; } @@ -777,7 +853,7 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkg-config ] ++ (old.nativeBuildInputs or [ ]); + nativeBuildInputs = [ pkgs.pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]); buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]); } ); @@ -924,7 +1000,7 @@ self: super: pkgs.pkg-config ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cairo pkgs.xlibsWrapper ]; @@ -1028,6 +1104,16 @@ self: super: } ); + pyproject-flake8 = super.pyproject-flake8.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; + } + ); + + pytezos = super.pytezos.override (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libsodium ]; + }); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ @@ -1214,6 +1300,12 @@ self: super: } ); + python-snappy = super.python-snappy.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.snappy ]; + } + ); + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -1228,10 +1320,20 @@ self: super: } ); + pyusb = super.pyusb.overridePythonAttrs ( + old: { + postPatch = '' + libusb=${pkgs.libusb1.out}/lib/libusb-1.0${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} + test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py + ''; + } + ); + pyzmq = super.pyzmq.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.zeromq ]; } ); @@ -1298,7 +1400,7 @@ self: super: old: if old.format != "wheel" then { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; @@ -1329,6 +1431,17 @@ self: super: } ); + secp256k1 = super.secp256k1.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig pkgs.autoconf pkgs.automake pkgs.libtool ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; + doCheck = false; + # Local setuptools versions like "x.y.post0" confuse an internal check + postPatch = '' + substituteInPlace setup.py \ + --replace 'setuptools_version.' '"${self.setuptools.version}".' + ''; + }); + shapely = super.shapely.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos self.cython ]; @@ -1387,6 +1500,14 @@ self: super: } ); + # The tokenizers build requires a complex rust setup (cf. nixpkgs override) + # + # Instead of providing a full source build, we use a wheel to keep + # the complexity manageable for now. + tokenizers = super.tokenizers.override { + preferWheel = true; + }; + torch = lib.makeOverridable ({ enableCuda ? false , cudatoolkit ? pkgs.cudatoolkit_10_1 @@ -1415,11 +1536,34 @@ self: super: propagatedBuildInputs = [ self.numpy self.future + self.typing-extensions ]; }) ) { }; + torchvision = lib.makeOverridable + ({ enableCuda ? false + , cudatoolkit ? pkgs.cudatoolkit_10_1 + , pkg ? super.torchvision + }: pkg.overrideAttrs (old: { + + # without that autoPatchelfHook will fail because cudatoolkit is not in LD_LIBRARY_PATH + autoPatchelfIgnoreMissingDeps = true; + buildInputs = (old.buildInputs or [ ]) + ++ [ self.torch ] + ++ lib.optionals enableCuda [ + cudatoolkit + ]; + preConfigure = + if (enableCuda) then '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib:${lib.makeLibraryPath [ cudatoolkit "${cudatoolkit}" ]}" + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib" + ''; + })) + { }; + typeguard = super.typeguard.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py \ @@ -1427,12 +1571,18 @@ self: super: ''; }); + typed_ast = super.typed-ast.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + self.pytest-runner + ]; + }); + # nix uses a dash, poetry uses an underscore typing_extensions = super.typing_extensions or self.typing-extensions; urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.urwid ]; } @@ -1476,6 +1626,7 @@ self: super: weasyprint = super.weasyprint.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.weasyprint) patches; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1524,7 +1675,7 @@ self: super: ) else super.zipp ).overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.toml ]; } @@ -1551,9 +1702,38 @@ self: super: } ); + psutil = super.psutil.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ + lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.IOKit; + } + ); + + sentencepiece = super.sentencepiece.overridePythonAttrs ( + old: { + dontUseCmakeConfigure = true; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.pkg-config + pkgs.cmake + pkgs.gperftools + ]; + buildInputs = (old.buildInputs or [ ]) ++ [ + pkgs.sentencepiece + ]; + } + ); + + sentence-transformers = super.sentence-transformers.overridePythonAttrs ( + old: { + buildInputs = + (old.buildInputs or [ ]) + ++ [ self.typing-extensions ]; + } + ); + supervisor = super.supervisor.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.meld3 self.setuptools ]; @@ -1562,7 +1742,7 @@ self: super: cytoolz = super.cytoolz.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.toolz ]; } ); @@ -1607,5 +1787,52 @@ self: super: } ); + wxpython = super.wxpython.overridePythonAttrs (old: + let + localPython = self.python.withPackages (ps: with ps; [ + setuptools + numpy + six + ]); + in + { + DOXYGEN = "${pkgs.doxygen}/bin/doxygen"; + + nativeBuildInputs = with pkgs; [ + which + doxygen + gtk3 + pkg-config + autoPatchelfHook + ] ++ (old.nativeBuildInputs or [ ]); + + buildInputs = with pkgs; [ + gtk3 + webkitgtk + ncurses + SDL2 + xorg.libXinerama + xorg.libSM + xorg.libXxf86vm + xorg.libXtst + xorg.xorgproto + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libGLU + libGL + libglvnd + mesa + ] ++ old.buildInputs; + + buildPhase = '' + ${localPython.interpreter} build.py -v build_wx + ${localPython.interpreter} build.py -v dox etg --nodoc sip + ${localPython.interpreter} build.py -v build_py + ''; + + installPhase = '' + ${localPython.interpreter} setup.py install --skip-build --prefix=$out + ''; + }); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index dc9cd2936d06..a5ec51a1345b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -129,7 +129,7 @@ let if exprs.type == "expr" then ( let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mVal = ''[a-zA-Z0-9\'"_\. \-]+''; mOp = "in|[!=<>]+"; e = stripStr exprs.value; m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); From 7ec26084b82f08811e4bb54cf7920bcfc3903383 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 08:44:01 +0000 Subject: [PATCH 628/664] erlang: 24.0.1 -> 24.0.2 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 84575e92cded..a4fe839bff4c 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.1"; - sha256 = "z01gaKNkKsIPKdPKhX6IUUY9uBSuyA33E4aVM0MdXsg="; + version = "24.0.2"; + sha256 = "gAiQc+AVj5xjwAnn9mF4xprjZOft1JvfEFVJMG5isxg="; } From cdb7efa0f986e6a28c6c5933655642c5818a5fdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 00:22:28 +0200 Subject: [PATCH 629/664] wpscan: 3.7.5 -> 3.8.17 --- pkgs/tools/security/wpscan/Gemfile.lock | 72 ++++++++------- pkgs/tools/security/wpscan/gemset.nix | 113 +++++++++++++----------- 2 files changed, 100 insertions(+), 85 deletions(-) diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index f3ece99b3656..96857239bda0 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,53 +1,57 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.1) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - cms_scanner (0.7.1) + cms_scanner (0.13.4) + ethon (~> 0.14.0) get_process_mem (~> 0.2.5) - nokogiri (~> 1.10.4) - opt_parse_validator (~> 1.8.1) - public_suffix (>= 3.0, < 4.1) - ruby-progressbar (~> 1.10.0) + nokogiri (~> 1.11.0) + opt_parse_validator (~> 1.9.4) + public_suffix (~> 4.0.3) + ruby-progressbar (>= 1.10, < 1.12) sys-proctable (~> 1.2.2) - typhoeus (~> 1.3.0) + typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.5) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.11.3) - get_process_mem (0.2.5) + concurrent-ruby (1.1.8) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.1) + get_process_mem (0.2.7) ffi (~> 1.0) - i18n (1.7.0) + i18n (1.8.10) concurrent-ruby (~> 1.0) - mini_portile2 (2.4.0) - minitest (5.13.0) - nokogiri (1.10.7) - mini_portile2 (~> 2.4.0) - opt_parse_validator (1.8.1) - activesupport (> 4.2, < 6.1.0) + mini_portile2 (2.5.3) + minitest (5.14.4) + nokogiri (1.11.6) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + opt_parse_validator (1.9.4) + activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.8) - public_suffix (4.0.1) - ruby-progressbar (1.10.1) - sys-proctable (1.2.2) + public_suffix (4.0.6) + racc (1.5.2) + ruby-progressbar (1.11.0) + sys-proctable (1.2.6) ffi - thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.5) - thread_safe (~> 0.1) - wpscan (3.7.5) - cms_scanner (~> 0.7.1) - xmlrpc (0.3.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + webrick (1.7.0) + wpscan (3.8.17) + cms_scanner (~> 0.13.3) + xmlrpc (0.3.2) + webrick yajl-ruby (1.4.1) - zeitwerk (2.2.2) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 5c0691fda1bc..c3d79ea77fbc 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s"; + sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; type = "gem"; }; - version = "6.0.1"; + version = "6.1.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -22,25 +22,25 @@ version = "2.7.0"; }; cms_scanner = { - dependencies = ["get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; + dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xmsigczibihlziisdgabsaz9lm2v31snlkc8kmza73pv8a61r4"; + sha256 = "1xzkbk6a93sdhshzlkx1dcpln3fcw2apccb7g6jha0g1im7yhgcj"; type = "gem"; }; - version = "0.7.1"; + version = "0.13.4"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.8"; }; ethon = { dependencies = ["ffi"]; @@ -48,20 +48,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; + sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi"; type = "gem"; }; - version = "1.11.3"; + version = "1.15.1"; }; get_process_mem = { dependencies = ["ffi"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh"; + sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa"; type = "gem"; }; - version = "0.2.5"; + version = "0.2.7"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -80,41 +80,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.10"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.3"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.4"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; type = "gem"; }; - version = "1.10.7"; + version = "1.11.6"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -122,30 +122,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19rm44ww3zfb440kqpdprwb7y2d0gcm4znhv4kfs8dkhz8k1k5vy"; + sha256 = "1n297vrxq7r1fsh0x8yf1nhgdawmcl0sq04l468gwrd4y754rjyx"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.4"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.6"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; sys-proctable = { dependencies = ["ffi"]; @@ -153,20 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndk34ipd4v96v5cbvj0kbkhnssi4nqrzd7sifyg3bavi1jrw3w8"; + sha256 = "17zzb1slwhq0j42qh8ywnh4c5ww2wwskl9362ayxf0am86b02zsb"; type = "gem"; }; - version = "1.2.2"; - }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; + version = "1.2.6"; }; typhoeus = { dependencies = ["ethon"]; @@ -174,21 +174,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.5"; + version = "2.0.4"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; wpscan = { dependencies = ["cms_scanner"]; @@ -196,20 +206,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vn6i48msxhj8g769vn2s3siv98cnqchblw69ldk1mr85lw4jci6"; + sha256 = "0jdn2v5cmxlzq9nkzh5lqnqr0mbiyn87g6bfc0074m19m38g19r9"; type = "gem"; }; - version = "3.7.5"; + version = "3.8.17"; }; xmlrpc = { + dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683"; + sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.2"; }; yajl-ruby = { groups = ["default"]; @@ -226,9 +237,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.2.2"; + version = "2.4.2"; }; } From d9d422285c2183b68a49c01eda179bd48526e6f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Jun 2021 22:20:16 +0000 Subject: [PATCH 630/664] fzf: 0.27.1 -> 0.27.2 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index bcf53611b22c..3ef5a643259c 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-TMzyUhgOfcWXKhxy+2SeBy0mws/M+4YoitlPpYt6k9g="; + sha256 = "sha256-JWTyZRZrW1mFy91D+eZL6iYV0CcNxJUT4JA0hrBKZZU="; }; vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; From dbb7e6bc8a6d35f8da7e74e5c47dce18a51955af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Jun 2021 01:17:41 +0200 Subject: [PATCH 631/664] botamusique: unstable-2021-05-19 -> unstable-2021-06-01 --- pkgs/tools/audio/botamusique/node-packages.nix | 2 +- pkgs/tools/audio/botamusique/src.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix index 8857e1e76f96..c9bdb6f00971 100644 --- a/pkgs/tools/audio/botamusique/node-packages.nix +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -4527,7 +4527,7 @@ let name = "botamusique"; packageName = "botamusique"; version = "0.0.0"; - src = ../../../../../../../../../tmp/tmp.hWY9btrx5g; + src = ../../../../../../../../../tmp/tmp.UAoivnXH3n; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json index c7e619474609..d1337f5ae68a 100644 --- a/pkgs/tools/audio/botamusique/src.json +++ b/pkgs/tools/audio/botamusique/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/azlux/botamusique", - "rev": "33a9e75ba9d0a382f7a76d23a0ceb626924a8b49", - "date": "2021-05-19T22:37:39+08:00", - "path": "/nix/store/dqc2vjd43cixm49w8g66wvi9zmdfwsdd-botamusique", - "sha256": "18lbgslx9vdwd5nrbkqfjvzaikp2swvv375v9gql7cg8p46w7i11", + "rev": "ba02cdebf2e175dc371995361eafcb88ad2c1b52", + "date": "2021-06-01T23:39:44+02:00", + "path": "/nix/store/dp5vnj7zqv1sp1ab5xycvvqdpia9xb71-botamusique", + "sha256": "01d51y6h38hs4ynjgz050ryy14sp5y2c3n7f80mcv0a4ls8413qp", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false From f42ea75dec8fff9becbdf2094044485ec103dcd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Jun 2021 02:07:11 +0200 Subject: [PATCH 632/664] firefox-esr: 78.10.1esr -> 78.11.0esr https://www.mozilla.org/en-US/firefox/78.11.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-24/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b4d87b859ae6..1362844c37b5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.10.1esr"; + ffversion = "78.11.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1"; + sha512 = "d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4"; }; meta = { From 2489d71bd9f40a125bb2ba1d49d702b22f47b43a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Jun 2021 11:16:47 +1000 Subject: [PATCH 633/664] crun: 0.19.1 -> 0.20 https://github.com/containers/crun/releases/tag/0.20 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index a6bf559a41a7..2e7700d855c9 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.19.1"; + version = "0.20"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-v5uESTEspIc8rhZXrQqLEVMDvvPcfHuFoj6lI4M5z70="; + sha256 = "sha256-NlpgdRizQFt5T3CRxt0DVXTVPUbge9uPc9B7LuR3o1k="; fetchSubmodules = true; }; From 8d41f2c92b64fbcecc65b6b9a4aef7d2d78c8ac1 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 2 Jun 2021 01:33:24 +0000 Subject: [PATCH 634/664] procs: 0.11.4 -> 0.11.8 Signed-off-by: Arthur Gautier --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index c8d11474d5b6..e86bfb31101a 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.4"; + version = "0.11.8"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng="; + sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs="; }; - cargoSha256 = "sha256-JTjkMXwLLh/kjqAFmi2c59F8POAqn5t/kTJfJkR2BL4="; + cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA="; nativeBuildInputs = [ installShellFiles ]; From e910a281c6d1e6c0e91dc87ccaba5a79d71ad56c Mon Sep 17 00:00:00 2001 From: Greizgh Date: Tue, 1 Jun 2021 22:07:44 +0200 Subject: [PATCH 635/664] sqlx-cli: 0.5.2 -> 0.5.5 --- pkgs/development/tools/rust/sqlx-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index d13481804c47..c183ddb760fe 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.2"; + version = "0.5.5"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "0jz0gddw1xp51rnap0dsyq4886x2glmr087r1lf3fxlnv6anaqn9"; + sha256 = "1051vldajdbkcxvrw2cig201c4nm68cvvnr2yia9f2ysmr68x5rh"; }; - cargoSha256 = "046blw366d6zjpq944g9n4cdhhv2w97qfi1ynljc9bnz03d8v39c"; + cargoSha256 = "1ry893gjrwb670v80ff61yb00jvf49yp6194gqrjvnyarjc6bbb1"; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; From 805e9ce9ea37953e319251fb2f814d9ee8f250b3 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 31 May 2021 23:01:49 -0700 Subject: [PATCH 636/664] platforms: Build flat kernel image for RISC-V Newer bootloaders for RISC-V (i.e., OpenSBI + U-Boot) support flat and compressed kernel images but not vmlinux. Therefore, let's build "Image" like what we do with aarch64. Also copy DTBs while we are at it. --- lib/systems/platforms.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 445144439caf..73a61d6d9845 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -481,9 +481,10 @@ rec { riscv-multiplatform = { linux-kernel = { name = "riscv-multiplatform"; - target = "vmlinux"; + target = "Image"; autoModules = true; baseConfig = "defconfig"; + DTB = true; extraConfig = '' FTRACE n SERIAL_OF_PLATFORM y From e2aee93caf067159c18634466c46913b28ec6394 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 31 May 2021 23:24:02 -0700 Subject: [PATCH 637/664] platforms: Enable ftrace support for RISC-V Support has landed in mainline for a while. --- lib/systems/platforms.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 73a61d6d9845..92285346f754 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -486,7 +486,6 @@ rec { baseConfig = "defconfig"; DTB = true; extraConfig = '' - FTRACE n SERIAL_OF_PLATFORM y ''; }; From fa44962db910f362c0df0da5b8103d87e2d8ce92 Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Tue, 1 Jun 2021 20:14:20 -0700 Subject: [PATCH 638/664] jdk8: fix sprintf patch This fixes a recent commit via #123708 The patch itself had an additional '%s' in the sprintf which is unsafe depending on the surrounding memory. --- pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch index 0664e745f57f..3780e95ea5b6 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch +++ b/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch @@ -24,7 +24,7 @@ index c477851c1b..ff5e28d95b 100644 sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1, mtInternal); - sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch); -+ sprintf(ld_library_path, "%s%s", v); ++ sprintf(ld_library_path, "%s", v); Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal); } From a08f23039cf98d5b8648e2c3d6b872b348bac9d9 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 2 Jun 2021 00:48:03 -0600 Subject: [PATCH 639/664] matterbridge: 1.12.1 -> 1.12.2 --- pkgs/servers/matterbridge/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index d6865df66cdb..a3e898e048ab 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "matterbridge"; - version = "1.22.1"; + version = "1.22.2"; + + src = fetchFromGitHub { + owner = "42wim"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-H6Cy6yvX57QLNfZPeansZv6IJ4uQVqr0h24QsAlrLx8="; + }; vendorSha256 = null; - doCheck = false; - - src = fetchurl { - url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "sha256-yV805OWFNOxKIGd6t2kRcUzdB8xYWYHFK+W2u/QPTXg="; - }; - meta = with lib; { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; From 9e3118de6b335a7396f26dba2551d2258e849fb4 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Apr 2021 18:50:47 +0200 Subject: [PATCH 640/664] obs-websocket: init at 4.9.0 --- .../obs-studio/plugins/obs-websocket.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-websocket.nix diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix new file mode 100644 index 000000000000..eb95353e8d6c --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, qtbase +, obs-studio +, asio_1_10 +, websocketpp +}: + +stdenv.mkDerivation rec { + pname = "obs-websocket"; + version = "4.9.0"; + + src = fetchFromGitHub { + owner = "Palakis"; + repo = "obs-websocket"; + rev = version; + sha256 = "1dxih5czcfs1vczbq48784jvmgs8awbsrwk8mdfi4pg8n577cr1w"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio asio_1_10 websocketpp ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + ]; + + meta = with lib; { + description = "Remote-control OBS Studio through WebSockets"; + homepage = "https://github.com/Palakis/obs-websocket"; + maintainers = with maintainers; [ erdnaxe ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 0d2757302c75375dffe4dfec347d014559f7fcff Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 27 May 2021 06:49:11 -0700 Subject: [PATCH 641/664] .github/workflows/nixos-manual.yml: add permisssions so action runs don't require approval --- .github/workflows/nixos-manual.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index 80ffc9c12be4..2a1c1c29738e 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -1,7 +1,9 @@ name: NixOS manual checks +permissions: read-all + on: - pull_request: + pull_request_target: branches-ignore: - 'release-**' paths: @@ -14,6 +16,9 @@ jobs: if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge - uses: cachix/install-nix-action@v12 - name: Check DocBook files generated from Markdown are consistent run: | From 7a4de9a9839617f62874df57f31bc77d708604bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 1 Jun 2021 13:14:15 +0200 Subject: [PATCH 642/664] nixos/containers: add storage.conf --- nixos/modules/virtualisation/containers.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 45d4f877ae5b..22f417e155a8 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -65,6 +65,12 @@ in ''; }; + storage.settings = mkOption { + type = toml.type; + default = {}; + description = "storage.conf configuration"; + }; + registries = { search = mkOption { type = types.listOf types.str; @@ -129,6 +135,9 @@ in environment.etc."containers/containers.conf".source = toml.generate "containers.conf" cfg.containersConf.settings; + environment.etc."containers/storage.conf".source = + toml.generate "storage.conf" cfg.storage.settings; + environment.etc."containers/registries.conf".source = toml.generate "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; From 6e53f5e0da98cba5b8bb245b508a00ad6908db8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:26:28 +0200 Subject: [PATCH 643/664] python3Packages.pyiqvia: 0.3.3 -> 1.0.0 --- pkgs/development/python-modules/pyiqvia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index d2775d6e3b9e..34bc7bb5eb66 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "0.3.3"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-XYWoHKa/yq7MtGVM6eVgLtR2E3VmqsjX3TNcQcd7dEQ="; + sha256 = "sha256-6BbJgRpn2hivm4N3Zpll9NACMSNlIhxj8CF2iVduIro="; }; nativeBuildInputs = [ poetry-core ]; From 9f9de0069cf323533375286468e44f134c117234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Jun 2021 11:51:02 +0200 Subject: [PATCH 644/664] python3Packages.adblock: fix build on Darwin --- pkgs/development/python-modules/adblock/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 8fc697828f0a..59d1f2e4e7a8 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -8,6 +8,7 @@ , openssl , publicsuffix-list , isPy27 +, libiconv , CoreFoundation , Security }: @@ -37,7 +38,7 @@ buildPythonPackage rec { ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; @@ -49,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Brave's adblocking library, which is written in Rust"; homepage = "https://github.com/ArniDagur/python-adblock/"; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ petabyteboy dotlambda ]; license = with licenses; [ asl20 mit ]; }; } From 1c1c7685d97440593afb9e7aa2c46ce6a746ac35 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 13:25:56 +0900 Subject: [PATCH 645/664] stdenv.darwin: nixpkgs-fmt --- pkgs/stdenv/darwin/default.nix | 766 +++++++++++++++++++-------------- 1 file changed, 441 insertions(+), 325 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index efa19d2783e7..4ff512386e82 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,33 +1,38 @@ { lib -, localSystem, crossSystem, config, overlays, crossOverlays ? [] -# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools -, bootstrapFiles ? - if localSystem.isAarch64 then +, localSystem +, crossSystem +, config +, overlays +, crossOverlays ? [ ] + # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools +, bootstrapFiles ? if localSystem.isAarch64 then let fetch = { file, sha256, executable ? true }: import { url = "http://tarballs.nixos.org/stdenv-darwin/aarch64/20acd4c4f14040485f40e55c0a76c186aa8ca4f3/${file}"; inherit (localSystem) system; inherit sha256 executable; - }; in { - sh = fetch { file = "sh"; sha256 = "17m3xrlbl99j3vm7rzz3ghb47094dyddrbvs2a6jalczvmx7spnj"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "1khs8s5klf76plhlvlc1ma838r8pc1qigk9f5bdycwgbn0nx240q"; }; - mkdir = fetch { file = "mkdir"; sha256 = "1m9nk90paazl93v43myv2ay68c1arz39pqr7lk5ddbgb177hgg8a"; }; - cpio = fetch { file = "cpio"; sha256 = "17pxq61yjjvyd738fy9f392hc9cfzkl612sdr9rxr3v0dgvm8y09"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1v2332k33akm6mrm4bj749rxnnmc2pkbgcslmd0bbkf76bz2ildy"; executable = false; }; - } + }; in + { + sh = fetch { file = "sh"; sha256 = "17m3xrlbl99j3vm7rzz3ghb47094dyddrbvs2a6jalczvmx7spnj"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "1khs8s5klf76plhlvlc1ma838r8pc1qigk9f5bdycwgbn0nx240q"; }; + mkdir = fetch { file = "mkdir"; sha256 = "1m9nk90paazl93v43myv2ay68c1arz39pqr7lk5ddbgb177hgg8a"; }; + cpio = fetch { file = "cpio"; sha256 = "17pxq61yjjvyd738fy9f392hc9cfzkl612sdr9rxr3v0dgvm8y09"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1v2332k33akm6mrm4bj749rxnnmc2pkbgcslmd0bbkf76bz2ildy"; executable = false; }; + } else let fetch = { file, sha256, executable ? true }: import { url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/5ab5783e4f46c373c6de84deac9ad59b608bb2e6/${file}"; inherit (localSystem) system; inherit sha256 executable; - }; in { - sh = fetch { file = "sh"; sha256 = "sha256-nbb4XEk3go7ttiWrQyKQMLzPr+qUnwnHkWMtVCZsMCs="; }; - bzip2 = fetch { file = "bzip2"; sha256 = "sha256-ybnA+JWrKhXSfn20+GVKXkHFTp2Zt79hat8hAVmsUOc="; }; - mkdir = fetch { file = "mkdir"; sha256 = "sha256-nmvMxmfcY41/60Z/E8L9u0vgePW5l30Dqw1z+Nr02Hk="; }; - cpio = fetch { file = "cpio"; sha256 = "sha256-cB36rN3NLj19Tk37Kc5bodMFMO+mCpEQkKKo0AEMkaU="; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kh2vKmjCr/HvR06czZbxUxV5KDRxSF27M6nN3cyofRI="; executable = false; }; - } + }; in + { + sh = fetch { file = "sh"; sha256 = "sha256-nbb4XEk3go7ttiWrQyKQMLzPr+qUnwnHkWMtVCZsMCs="; }; + bzip2 = fetch { file = "bzip2"; sha256 = "sha256-ybnA+JWrKhXSfn20+GVKXkHFTp2Zt79hat8hAVmsUOc="; }; + mkdir = fetch { file = "mkdir"; sha256 = "sha256-nmvMxmfcY41/60Z/E8L9u0vgePW5l30Dqw1z+Nr02Hk="; }; + cpio = fetch { file = "cpio"; sha256 = "sha256-cB36rN3NLj19Tk37Kc5bodMFMO+mCpEQkKKo0AEMkaU="; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kh2vKmjCr/HvR06czZbxUxV5KDRxSF27M6nN3cyofRI="; executable = false; }; + } }: assert crossSystem == localSystem; @@ -51,7 +56,8 @@ let "/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up ]; -in rec { +in +rec { commonPreHook = '' export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} @@ -67,9 +73,9 @@ in rec { bootstrapTools = derivation ({ inherit system; - name = "bootstrap-tools"; + name = "bootstrap-tools"; builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles - args = if localSystem.isAarch64 then [ ./unpack-bootstrap-tools-aarch64.sh ] else [ ./unpack-bootstrap-tools.sh ]; + args = if localSystem.isAarch64 then [ ./unpack-bootstrap-tools-aarch64.sh ] else [ ./unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) mkdir bzip2 cpio tarball; @@ -80,13 +86,14 @@ in rec { outputHashMode = "recursive"; }); - stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash", - overrides ? (self: super: {}), - extraPreHook ? "", - extraNativeBuildInputs, - extraBuildInputs, - libcxx, - allowedRequisites ? null}: + stageFun = step: last: { shell ? "${bootstrapTools}/bin/bash" + , overrides ? (self: super: { }) + , extraPreHook ? "" + , extraNativeBuildInputs + , extraBuildInputs + , libcxx + , allowedRequisites ? null + }: let name = "bootstrap-stage${toString step}"; @@ -110,17 +117,19 @@ in rec { inherit lib shell; inherit (last) stdenvNoCC; - nativeTools = false; - nativeLibc = false; + nativeTools = false; + nativeLibc = false; inherit buildPackages libcxx; inherit (last.pkgs) coreutils gnugrep; - bintools = last.pkgs.darwin.binutils; - libc = last.pkgs.darwin.Libsystem; - isClang = true; - cc = last.pkgs."${finalLlvmPackages}".clang-unwrapped; - }; in args // (overrides args)); + bintools = last.pkgs.darwin.binutils; + libc = last.pkgs.darwin.Libsystem; + isClang = true; + cc = last.pkgs."${finalLlvmPackages}".clang-unwrapped; + }; in args // (overrides args) + ); - cc = if last == null then "/dev/null" else mkCC ({ cc, ... }: { + cc = if last == null then "/dev/null" else + mkCC ({ cc, ... }: { extraPackages = [ last.pkgs."${finalLlvmPackages}".libcxxabi last.pkgs."${finalLlvmPackages}".compiler-rt @@ -128,7 +137,8 @@ in rec { extraBuildCommands = mkExtraBuildCommands cc; }); - ccNoLibcxx = if last == null then "/dev/null" else mkCC ({ cc, ... }: { + ccNoLibcxx = if last == null then "/dev/null" else + mkCC ({ cc, ... }: { libcxx = null; extraPackages = [ last.pkgs."${finalLlvmPackages}".compiler-rt @@ -146,13 +156,16 @@ in rec { inherit config shell extraBuildInputs; extraNativeBuildInputs = extraNativeBuildInputs ++ lib.optionals doUpdateAutoTools [ - last.pkgs.updateAutotoolsGnuConfigScriptsHook last.pkgs.gnu-config + last.pkgs.updateAutotoolsGnuConfigScriptsHook + last.pkgs.gnu-config ]; allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ - cc.expand-response-params cc.bintools + cc.expand-response-params + cc.bintools ] ++ lib.optionals doUpdateAutoTools [ - last.pkgs.updateAutotoolsGnuConfigScriptsHook last.pkgs.gnu-config + last.pkgs.updateAutotoolsGnuConfigScriptsHook + last.pkgs.gnu-config ] ++ lib.optionals doSign [ last.pkgs.darwin.postLinkSignHook last.pkgs.darwin.sigtool @@ -173,7 +186,7 @@ in rec { ${commonPreHook} ${extraPreHook} ''; - initialPath = [ bootstrapTools ]; + initialPath = [ bootstrapTools ]; fetchurlBoot = import ../../build-support/fetchurl { inherit lib; @@ -185,13 +198,14 @@ in rec { __stdenvImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps; - overrides = self: super: (overrides self super) // { + overrides = self: super: (overrides self super) // { inherit ccNoLibcxx; fetchurl = thisStdenv.fetchurlBoot; }; }; - in { + in + { inherit config overlays; stdenv = thisStdenv; }; @@ -289,11 +303,11 @@ in rec { inherit lib; inherit (self) stdenvNoCC; - nativeTools = false; - nativeLibc = false; + nativeTools = false; + nativeLibc = false; inherit (self) buildPackages coreutils gnugrep; - libc = selfDarwin.Libsystem; - bintools = selfDarwin.binutils-unwrapped; + libc = selfDarwin.Libsystem; + bintools = selfDarwin.binutils-unwrapped; inherit (selfDarwin) postLinkSignHook signingUtils; }; } // lib.optionalAttrs (! useAppleSDKLibs) { @@ -374,317 +388,419 @@ in rec { }; }; - extraNativeBuildInputs = []; - extraBuildInputs = []; + extraNativeBuildInputs = [ ]; + extraBuildInputs = [ ]; libcxx = null; }; - stage1 = prevStage: let - persistent = self: super: with prevStage; { - cmake = super.cmakeMinimal; + stage1 = prevStage: + let + persistent = self: super: with prevStage; { + cmake = super.cmakeMinimal; - inherit pbzx cpio; + inherit pbzx cpio; - python3 = super.python3Minimal; + python3 = super.python3Minimal; - ninja = super.ninja.override { buildDocs = false; }; + ninja = super.ninja.override { buildDocs = false; }; - "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (let - tools = super."${finalLlvmPackages}".tools.extend (_: _: { - inherit (pkgs."${finalLlvmPackages}") clang-unwrapped; - }); - libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { - inherit (pkgs."${finalLlvmPackages}") compiler-rt libcxx libcxxabi; - }); - in { inherit tools libraries; } // tools // libraries); + "${finalLlvmPackages}" = super."${finalLlvmPackages}" // ( + let + tools = super."${finalLlvmPackages}".tools.extend (_: _: { + inherit (pkgs."${finalLlvmPackages}") clang-unwrapped; + }); + libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { + inherit (pkgs."${finalLlvmPackages}") compiler-rt libcxx libcxxabi; + }); + in + { inherit tools libraries; } // tools // libraries + ); - darwin = super.darwin.overrideScope (selfDarwin: _: { - inherit (darwin) rewrite-tbd binutils-unwrapped; + darwin = super.darwin.overrideScope (selfDarwin: _: { + inherit (darwin) rewrite-tbd binutils-unwrapped; - signingUtils = darwin.signingUtils.override { - inherit (selfDarwin) sigtool; - }; - - binutils = darwin.binutils.override { - coreutils = self.coreutils; - libc = selfDarwin.Libsystem; - inherit (selfDarwin) postLinkSignHook signingUtils; - }; - }); - }; - in with prevStage; stageFun 1 prevStage { - extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; - extraNativeBuildInputs = []; - extraBuildInputs = [ pkgs.darwin.CF ]; - libcxx = pkgs."${finalLlvmPackages}".libcxx; - - allowedRequisites = - [ bootstrapTools ] ++ - (with pkgs; [ coreutils gnugrep ]) ++ - (with pkgs."${finalLlvmPackages}"; [ libcxx libcxxabi compiler-rt clang-unwrapped ]) ++ - (with pkgs.darwin; [ Libsystem CF ] ++ lib.optional useAppleSDKLibs objc4); - - overrides = persistent; - }; - - stage2 = prevStage: let - persistent = self: super: with prevStage; { - inherit - zlib patchutils m4 scons flex perl bison unifdef unzip openssl python3 - libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff - openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz - findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils - libssh2 nghttp2 libkrb5 ninja brotli; - - "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (let - tools = super."${finalLlvmPackages}".tools.extend (_: _: { - inherit (pkgs."${finalLlvmPackages}") clang-unwrapped; - }); - libraries = super."${finalLlvmPackages}".libraries.extend (_: libSuper: { - inherit (pkgs."${finalLlvmPackages}") compiler-rt; - libcxx = libSuper.libcxx.override { - stdenv = overrideCC self.stdenv self.ccNoLibcxx; + signingUtils = darwin.signingUtils.override { + inherit (selfDarwin) sigtool; }; - libcxxabi = libSuper.libcxxabi.override ({ - stdenv = overrideCC self.stdenv self.ccNoLibcxx; - } // lib.optionalAttrs (finalLlvmVersion == "7") { - # TODO: the bootstrapping of llvm packages isn't consistent. - # `standalone` may be redundant if darwin behaves like useLLVM (or - # has useLLVM = true). - standalone = true; - }); - }); - in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin.overrideScope (_: _: { - inherit (darwin) - binutils dyld Libsystem xnu configd ICU libdispatch libclosure - launchd CF objc4 darwin-stubs sigtool postLinkSignHook signingUtils; - }); + binutils = darwin.binutils.override { + coreutils = self.coreutils; + libc = selfDarwin.Libsystem; + inherit (selfDarwin) postLinkSignHook signingUtils; + }; + }); + }; + in + with prevStage; stageFun 1 prevStage { + extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; + extraNativeBuildInputs = [ ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs."${finalLlvmPackages}".libcxx; + + allowedRequisites = + [ bootstrapTools ] ++ + (with pkgs; [ coreutils gnugrep ]) ++ + (with pkgs."${finalLlvmPackages}"; [ libcxx libcxxabi compiler-rt clang-unwrapped ]) ++ + (with pkgs.darwin; [ Libsystem CF ] ++ lib.optional useAppleSDKLibs objc4); + + overrides = persistent; }; - in with prevStage; stageFun 2 prevStage { - extraPreHook = '' - export PATH_LOCALE=${pkgs.darwin.locale}/share/locale - ''; - extraNativeBuildInputs = [ pkgs.xz ]; - extraBuildInputs = [ pkgs.darwin.CF ]; - libcxx = pkgs."${finalLlvmPackages}".libcxx; + stage2 = prevStage: + let + persistent = self: super: with prevStage; { + inherit + zlib patchutils m4 scons flex perl bison unifdef unzip openssl python3 + libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff + openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz + findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils + libssh2 nghttp2 libkrb5 ninja brotli; - allowedRequisites = - [ bootstrapTools ] ++ - (with pkgs; [ - xz.bin xz.out zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib coreutils gnugrep pcre.out gmp libiconv brotli.lib - ] ++ lib.optional haveKRB5 libkrb5) ++ - (with pkgs."${finalLlvmPackages}"; [ - libcxx libcxxabi compiler-rt clang-unwrapped - ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF ICU locale ] ++ lib.optional useAppleSDKLibs objc4); + "${finalLlvmPackages}" = super."${finalLlvmPackages}" // ( + let + tools = super."${finalLlvmPackages}".tools.extend (_: _: { + inherit (pkgs."${finalLlvmPackages}") clang-unwrapped; + }); + libraries = super."${finalLlvmPackages}".libraries.extend (_: libSuper: { + inherit (pkgs."${finalLlvmPackages}") compiler-rt; + libcxx = libSuper.libcxx.override { + stdenv = overrideCC self.stdenv self.ccNoLibcxx; + }; + libcxxabi = libSuper.libcxxabi.override ({ + stdenv = overrideCC self.stdenv self.ccNoLibcxx; + } // lib.optionalAttrs (finalLlvmVersion == "7") { + # TODO: the bootstrapping of llvm packages isn't consistent. + # `standalone` may be redundant if darwin behaves like useLLVM (or + # has useLLVM = true). + standalone = true; + }); + }); + in + { inherit tools libraries; } // tools // libraries + ); - overrides = persistent; - }; - - stage3 = prevStage: let - persistent = self: super: with prevStage; { - inherit - patchutils m4 scons flex perl bison unifdef unzip openssl python3 - gettext sharutils libarchive pkg-config groff bash subversion - openssh sqlite sed serf openldap db cyrus-sasl expat apr-util - findfreetype libssh curl cmake autoconf automake libtool cpio - libssh2 nghttp2 libkrb5 ninja; - - # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. - libxml2 = super.libxml2.override { pythonSupport = false; }; - - "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (let - libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { - inherit (pkgs."${finalLlvmPackages}") libcxx libcxxabi; + darwin = super.darwin.overrideScope (_: _: { + inherit (darwin) + binutils dyld Libsystem xnu configd ICU libdispatch libclosure + launchd CF objc4 darwin-stubs sigtool postLinkSignHook signingUtils; }); - in { inherit libraries; } // libraries); + }; + in + with prevStage; stageFun 2 prevStage { + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; - darwin = super.darwin.overrideScope (_: _: { - inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd libiconv - locale darwin-stubs sigtool; - }); + extraNativeBuildInputs = [ pkgs.xz ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs."${finalLlvmPackages}".libcxx; + + allowedRequisites = + [ bootstrapTools ] ++ + (with pkgs; [ + xz.bin + xz.out + zlib + libxml2.out + curl.out + openssl.out + libssh2.out + nghttp2.lib + coreutils + gnugrep + pcre.out + gmp + libiconv + brotli.lib + ] ++ lib.optional haveKRB5 libkrb5) ++ + (with pkgs."${finalLlvmPackages}"; [ + libcxx + libcxxabi + compiler-rt + clang-unwrapped + ]) ++ + (with pkgs.darwin; [ dyld Libsystem CF ICU locale ] ++ lib.optional useAppleSDKLibs objc4); + + overrides = persistent; }; - in with prevStage; stageFun 3 prevStage { - shell = "${pkgs.bash}/bin/bash"; - # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun - # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting - # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and - # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. - extraNativeBuildInputs = with pkgs; [ xz ]; - extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; - libcxx = pkgs."${finalLlvmPackages}".libcxx; + stage3 = prevStage: + let + persistent = self: super: with prevStage; { + inherit + patchutils m4 scons flex perl bison unifdef unzip openssl python3 + gettext sharutils libarchive pkg-config groff bash subversion + openssh sqlite sed serf openldap db cyrus-sasl expat apr-util + findfreetype libssh curl cmake autoconf automake libtool cpio + libssh2 nghttp2 libkrb5 ninja; - extraPreHook = '' - export PATH=${pkgs.bash}/bin:$PATH - export PATH_LOCALE=${pkgs.darwin.locale}/share/locale - ''; + # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. + libxml2 = super.libxml2.override { pythonSupport = false; }; - allowedRequisites = - [ bootstrapTools ] ++ - (with pkgs; [ - xz.bin xz.out bash zlib libxml2.out curl.out openssl.out libssh2.out - nghttp2.lib coreutils gnugrep pcre.out gmp libiconv brotli.lib - ] ++ lib.optional haveKRB5 libkrb5) ++ - (with pkgs."${finalLlvmPackages}"; [ - libcxx libcxx.dev libcxxabi libcxxabi.dev compiler-rt clang-unwrapped - ]) ++ - (with pkgs.darwin; [ dyld ICU Libsystem locale ] ++ lib.optional useAppleSDKLibs objc4); + "${finalLlvmPackages}" = super."${finalLlvmPackages}" // ( + let + libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { + inherit (pkgs."${finalLlvmPackages}") libcxx libcxxabi; + }); + in + { inherit libraries; } // libraries + ); - overrides = persistent; - }; - - stage4 = prevStage: let - persistent = self: super: with prevStage; { - inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash python3 - ncurses libffi zlib gmp pcre gnugrep cmake - coreutils findutils diffutils patchutils ninja libxml2; - - # Hack to make sure we don't link ncurses in bootstrap tools. The proper - # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, - # quite a sledgehammer just to get the C runtime. - gettext = super.gettext.overrideAttrs (drv: { - configureFlags = drv.configureFlags ++ [ - "--disable-curses" - ]; - }); - - "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (let - tools = super."${finalLlvmPackages}".tools.extend (llvmSelf: _: { - clang-unwrapped-all-outputs = pkgs."${finalLlvmPackages}".clang-unwrapped-all-outputs.override { llvm = llvmSelf.llvm; }; - libllvm = pkgs."${finalLlvmPackages}".libllvm.override { inherit libxml2; }; + darwin = super.darwin.overrideScope (_: _: { + inherit (darwin) + dyld Libsystem xnu configd libdispatch libclosure launchd libiconv + locale darwin-stubs sigtool; }); - libraries = super."${finalLlvmPackages}".libraries.extend (llvmSelf: _: { - inherit (pkgs."${finalLlvmPackages}") libcxx libcxxabi compiler-rt; - }); - in { inherit tools libraries; } // tools // libraries); + }; + in + with prevStage; stageFun 3 prevStage { + shell = "${pkgs.bash}/bin/bash"; - darwin = super.darwin.overrideScope (_: superDarwin: { - inherit (darwin) dyld Libsystem libiconv locale darwin-stubs; + # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun + # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting + # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and + # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. + extraNativeBuildInputs = with pkgs; [ xz ]; + extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; + libcxx = pkgs."${finalLlvmPackages}".libcxx; - # See useAppleSDKLibs in darwin-packages.nix - CF = if useAppleSDKLibs then super.darwin.CF else superDarwin.CF.override { - inherit libxml2; - python3 = prevStage.python3; - }; - }); + extraPreHook = '' + export PATH=${pkgs.bash}/bin:$PATH + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + + allowedRequisites = + [ bootstrapTools ] ++ + (with pkgs; [ + xz.bin + xz.out + bash + zlib + libxml2.out + curl.out + openssl.out + libssh2.out + nghttp2.lib + coreutils + gnugrep + pcre.out + gmp + libiconv + brotli.lib + ] ++ lib.optional haveKRB5 libkrb5) ++ + (with pkgs."${finalLlvmPackages}"; [ + libcxx + libcxx.dev + libcxxabi + libcxxabi.dev + compiler-rt + clang-unwrapped + ]) ++ + (with pkgs.darwin; [ dyld ICU Libsystem locale ] ++ lib.optional useAppleSDKLibs objc4); + + overrides = persistent; }; - in with prevStage; stageFun 4 prevStage { - shell = "${pkgs.bash}/bin/bash"; - extraNativeBuildInputs = with pkgs; [ xz ]; - extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; - libcxx = pkgs."${finalLlvmPackages}".libcxx; - extraPreHook = '' - export PATH_LOCALE=${pkgs.darwin.locale}/share/locale - ''; - overrides = persistent; - }; + stage4 = prevStage: + let + persistent = self: super: with prevStage; { + inherit + gnumake gzip gnused bzip2 gawk ed xz patch bash python3 + ncurses libffi zlib gmp pcre gnugrep cmake + coreutils findutils diffutils patchutils ninja libxml2; - stdenvDarwin = prevStage: let - doSign = localSystem.isAarch64; - pkgs = prevStage; - persistent = self: super: with prevStage; { - inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash - ncurses libffi zlib gmp pcre gnugrep - coreutils findutils diffutils patchutils pbzx; + # Hack to make sure we don't link ncurses in bootstrap tools. The proper + # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, + # quite a sledgehammer just to get the C runtime. + gettext = super.gettext.overrideAttrs (drv: { + configureFlags = drv.configureFlags ++ [ + "--disable-curses" + ]; + }); - darwin = super.darwin.overrideScope (_: _: { - inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd; + "${finalLlvmPackages}" = super."${finalLlvmPackages}" // ( + let + tools = super."${finalLlvmPackages}".tools.extend (llvmSelf: _: { + clang-unwrapped-all-outputs = pkgs."${finalLlvmPackages}".clang-unwrapped-all-outputs.override { llvm = llvmSelf.llvm; }; + libllvm = pkgs."${finalLlvmPackages}".libllvm.override { inherit libxml2; }; + }); + libraries = super."${finalLlvmPackages}".libraries.extend (llvmSelf: _: { + inherit (pkgs."${finalLlvmPackages}") libcxx libcxxabi compiler-rt; + }); + in + { inherit tools libraries; } // tools // libraries + ); + + darwin = super.darwin.overrideScope (_: superDarwin: { + inherit (darwin) dyld Libsystem libiconv locale darwin-stubs; + + # See useAppleSDKLibs in darwin-packages.nix + CF = if useAppleSDKLibs then super.darwin.CF else + superDarwin.CF.override { + inherit libxml2; + python3 = prevStage.python3; + }; + }); + }; + in + with prevStage; stageFun 4 prevStage { + shell = "${pkgs.bash}/bin/bash"; + extraNativeBuildInputs = with pkgs; [ xz ]; + extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ]; + libcxx = pkgs."${finalLlvmPackages}".libcxx; + + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + overrides = persistent; + }; + + stdenvDarwin = prevStage: + let + doSign = localSystem.isAarch64; + pkgs = prevStage; + persistent = self: super: with prevStage; { + inherit + gnumake gzip gnused bzip2 gawk ed xz patch bash + ncurses libffi zlib gmp pcre gnugrep + coreutils findutils diffutils patchutils pbzx; + + darwin = super.darwin.overrideScope (_: _: { + inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd; + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { + inherit (darwin) binutils binutils-unwrapped cctools; + }); } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - inherit (darwin) binutils binutils-unwrapped cctools; - }); - } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - inherit llvm; + inherit llvm; - # Need to get rid of these when cross-compiling. - "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (let - tools = super."${finalLlvmPackages}".tools.extend (_: super: { - inherit (pkgs."${finalLlvmPackages}") llvm clang-unwrapped; + # Need to get rid of these when cross-compiling. + "${finalLlvmPackages}" = super."${finalLlvmPackages}" // ( + let + tools = super."${finalLlvmPackages}".tools.extend (_: super: { + inherit (pkgs."${finalLlvmPackages}") llvm clang-unwrapped; + }); + libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { + inherit (pkgs."${finalLlvmPackages}") compiler-rt libcxx libcxxabi; + }); + in + { inherit tools libraries; } // tools // libraries + ); + + inherit binutils binutils-unwrapped; + }; + in + import ../generic rec { + name = "stdenv-darwin"; + + inherit config; + inherit (pkgs.stdenv) fetchurlBoot; + + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + + preHook = commonPreHook + '' + export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + + __stdenvImpureHostDeps = commonImpureHostDeps; + __extraImpureHostDeps = commonImpureHostDeps; + + initialPath = import ../common-path.nix { inherit pkgs; }; + shell = "${pkgs.bash}/bin/bash"; + + cc = pkgs."${finalLlvmPackages}".libcxxClang; + + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + pkgs.updateAutotoolsGnuConfigScriptsHook + ]; + + extraBuildInputs = [ pkgs.darwin.CF ]; + + extraAttrs = { + libc = pkgs.darwin.Libsystem; + shellPackage = pkgs.bash; + inherit bootstrapTools; + }; + + allowedRequisites = (with pkgs; [ + xz.out + xz.bin + gmp.out + gnumake + findutils + bzip2.out + bzip2.bin + zlib.out + zlib.dev + libffi.out + coreutils + ed + diffutils + gnutar + gzip + ncurses.out + ncurses.dev + ncurses.man + gnused + bash + gawk + gnugrep + patch + pcre.out + gettext + binutils.bintools + darwin.binutils + darwin.binutils.bintools + curl.out + openssl.out + libssh2.out + nghttp2.lib + brotli.lib + cc.expand-response-params + libxml2.out + ] ++ lib.optional haveKRB5 libkrb5 + ++ lib.optionals localSystem.isAarch64 [ + pkgs.updateAutotoolsGnuConfigScriptsHook + pkgs.gnu-config + ]) + ++ (with pkgs."${finalLlvmPackages}"; [ + libcxx + libcxx.dev + libcxxabi + libcxxabi.dev + llvm + llvm.lib + compiler-rt + compiler-rt.dev + clang-unwrapped + libclang.dev + libclang.lib + ]) + ++ (with pkgs.darwin; [ + dyld + Libsystem + CF + cctools + ICU + libiconv + locale + libtapi + ] ++ lib.optional useAppleSDKLibs objc4 + ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]); + + overrides = lib.composeExtensions persistent (self: super: { + darwin = super.darwin.overrideScope (_: superDarwin: { + inherit (prevStage.darwin) CF darwin-stubs; + xnu = superDarwin.xnu.override { inherit (prevStage) python3; }; }); - libraries = super."${finalLlvmPackages}".libraries.extend (_: _: { - inherit (pkgs."${finalLlvmPackages}") compiler-rt libcxx libcxxabi; - }); - in { inherit tools libraries; } // tools // libraries); - - inherit binutils binutils-unwrapped; - }; - in import ../generic rec { - name = "stdenv-darwin"; - - inherit config; - inherit (pkgs.stdenv) fetchurlBoot; - - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; - - preHook = commonPreHook + '' - export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks - export PATH_LOCALE=${pkgs.darwin.locale}/share/locale - ''; - - __stdenvImpureHostDeps = commonImpureHostDeps; - __extraImpureHostDeps = commonImpureHostDeps; - - initialPath = import ../common-path.nix { inherit pkgs; }; - shell = "${pkgs.bash}/bin/bash"; - - cc = pkgs."${finalLlvmPackages}".libcxxClang; - - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - pkgs.updateAutotoolsGnuConfigScriptsHook - ]; - - extraBuildInputs = [ pkgs.darwin.CF ]; - - extraAttrs = { - libc = pkgs.darwin.Libsystem; - shellPackage = pkgs.bash; - inherit bootstrapTools; - }; - - allowedRequisites = (with pkgs; [ - xz.out xz.bin gmp.out gnumake findutils bzip2.out - bzip2.bin - zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar - gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk - gnugrep patch pcre.out gettext - binutils.bintools darwin.binutils darwin.binutils.bintools - curl.out openssl.out libssh2.out nghttp2.lib brotli.lib - cc.expand-response-params libxml2.out - ] ++ lib.optional haveKRB5 libkrb5 - ++ lib.optionals localSystem.isAarch64 [ - pkgs.updateAutotoolsGnuConfigScriptsHook pkgs.gnu-config - ]) - ++ (with pkgs."${finalLlvmPackages}"; [ - libcxx libcxx.dev libcxxabi libcxxabi.dev - llvm llvm.lib compiler-rt compiler-rt.dev - clang-unwrapped libclang.dev libclang.lib - ]) - ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale libtapi - ] ++ lib.optional useAppleSDKLibs objc4 - ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]); - - overrides = lib.composeExtensions persistent (self: super: { - darwin = super.darwin.overrideScope (_: superDarwin: { - inherit (prevStage.darwin) CF darwin-stubs; - xnu = superDarwin.xnu.override { inherit (prevStage) python3; }; + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { + clang = cc; + llvmPackages = super.llvmPackages // { clang = cc; }; + inherit cc; }); - } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - clang = cc; - llvmPackages = super.llvmPackages // { clang = cc; }; - inherit cc; - }); - }; + }; stagesDarwin = [ ({}: stage0) From cf6496e72bb1c698c3a1516ab6b4ed0cde516cbc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Jun 2021 12:09:52 +0200 Subject: [PATCH 646/664] chromiumDev: 92.0.4515.20 -> 92.0.4515.40 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 995e4c9be61e..51674fd79416 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "92.0.4515.20", - "sha256": "0xmpmjpxr4bgy62d71ky9asxwbgnx60mrp9f1dxm9nm92dv6w0ac", - "sha256bin64": "1la5mrh33izl7nf1rr899ljh448ckpqz2bp0vac83vb8952krm05", + "version": "92.0.4515.40", + "sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p", + "sha256bin64": "12kfzgg0fhlrvr3ci1gzsn5rzdwr4dc2k3sj45j4dn7wnrjlpmbx", "deps": { "gn": { "version": "2021-05-07", From fea2b25c74fb6323481575dd942b0e22482a5700 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 May 2021 23:10:02 +0200 Subject: [PATCH 647/664] yarn2nix: set `name` to `${pname}-${version}` by default --- pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index ad7e2738bf59..cd195cc4d603 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -62,7 +62,7 @@ in rec { ]; mkYarnModules = { - name, # safe name and version, e.g. testcompany-one-modules-1.0.0 + name ? "${pname}-${version}", # safe name and version, e.g. testcompany-one-modules-1.0.0 pname, # original name, e.g @testcompany/one version, packageJSON, From b06ea1146cd6ee8d344ba99f4dfe055cddb127e3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 May 2021 23:15:23 +0200 Subject: [PATCH 648/664] plausible: init at 1.3.0 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/plausible.nix | 270 + nixos/modules/services/web-apps/plausible.xml | 51 + nixos/tests/all-tests.nix | 1 + nixos/tests/plausible.nix | 46 + pkgs/servers/web-apps/plausible/default.nix | 85 + pkgs/servers/web-apps/plausible/package.json | 57 + pkgs/servers/web-apps/plausible/update.sh | 68 + pkgs/servers/web-apps/plausible/yarn.lock | 7732 +++++++++++++++ pkgs/servers/web-apps/plausible/yarn.nix | 8278 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 11 files changed, 16591 insertions(+) create mode 100644 nixos/modules/services/web-apps/plausible.nix create mode 100644 nixos/modules/services/web-apps/plausible.xml create mode 100644 nixos/tests/plausible.nix create mode 100644 pkgs/servers/web-apps/plausible/default.nix create mode 100644 pkgs/servers/web-apps/plausible/package.json create mode 100755 pkgs/servers/web-apps/plausible/update.sh create mode 100644 pkgs/servers/web-apps/plausible/yarn.lock create mode 100644 pkgs/servers/web-apps/plausible/yarn.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 75405b17444e..ebafb5ef5aab 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -947,6 +947,7 @@ ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix ./services/web-apps/plantuml-server.nix + ./services/web-apps/plausible.nix ./services/web-apps/pgpkeyserver-lite.nix ./services/web-apps/matomo.nix ./services/web-apps/moinmoin.nix diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix new file mode 100644 index 000000000000..429a4fa62059 --- /dev/null +++ b/nixos/modules/services/web-apps/plausible.nix @@ -0,0 +1,270 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.services.plausible; + + envSecrets = '' + export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})" + export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})" + export RELEASE_TMP=/var/lib/plausible/tmp + ${optionalString (cfg.mail.smtp.passwordFile != null) '' + export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})" + ''} + ''; +in { + options.services.plausible = { + enable = mkEnableOption "plausible"; + + adminUser = { + name = mkOption { + default = "admin"; + type = types.str; + description = '' + Name of the admin user that plausible will created on initial startup. + ''; + }; + + email = mkOption { + type = types.str; + example = "admin@localhost"; + description = '' + Email-address of the admin-user. + ''; + }; + + passwordFile = mkOption { + type = types.either types.str types.path; + description = '' + Path to the file which contains the password of the admin user. + ''; + }; + + activate = mkEnableOption "activating the freshly created admin-user"; + }; + + database = { + clickhouse = { + setup = mkEnableOption "creating a clickhouse instance" // { default = true; }; + url = mkOption { + default = "http://localhost:8123/default"; + type = types.str; + description = '' + The URL to be used to connect to postgres. The format + is described in + the elixir docs. + ''; + }; + }; + postgres = { + setup = mkEnableOption "creating a postgresql instance" // { default = true; }; + dbname = mkOption { + default = "plausible"; + type = types.str; + description = '' + Name of the database to use. + ''; + }; + socket = mkOption { + default = "/run/postgresql"; + type = types.str; + description = '' + Path to the UNIX domain-socket to communicate with postgres. + ''; + }; + }; + }; + + server = { + disableRegistration = mkOption { + default = true; + type = types.bool; + description = '' + 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 + how to generate one are documented in the + + framework docs. + ''; + }; + port = mkOption { + default = 8000; + type = types.port; + description = '' + Port where the service should be available. + ''; + }; + baseUrl = mkOption { + type = types.str; + description = '' + Public URL where plausible is available. + ''; + }; + }; + + mail = { + email = mkOption { + default = " hello@plausible.local"; + type = types.str; + description = '' + The email id to use for as from address of all communications + from Plausible. + ''; + }; + smtp = { + hostAddr = mkOption { + default = "localhost"; + type = types.str; + description = '' + The host address of your smtp server. + ''; + }; + hostPort = mkOption { + default = 25; + type = types.port; + description = '' + The port of your smtp server. + ''; + }; + user = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The username/email in case SMTP auth is enabled. + ''; + }; + passwordFile = mkOption { + default = null; + type = with types; nullOr (either str path); + description = '' + The path to the file with the password in case SMTP auth is enabled. + ''; + }; + enableSSL = mkEnableOption ""; + retries = mkOption { + type = types.ints.unsigned; + default = 2; + description = '' + Number of retries to make until mailer gives up. + ''; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; + message = '' + Unable to automatically activate the admin-user if no local DB-managed for + postgres (`services.plausible.database.postgres.setup') is enabled! + ''; + } + ]; + + services.postgresql = mkIf cfg.database.postgres.setup { + enable = true; + }; + + services.clickhouse = mkIf cfg.database.clickhouse.setup { + enable = true; + }; + + systemd.services = mkMerge [ + { + plausible = { + inherit (pkgs.plausible.meta) description; + documentation = [ "https://plausible.io/docs/self-hosting" ]; + wantedBy = [ "multi-user.target" ] + ++ optional cfg.database.clickhouse.setup "clickhouse.service" + ++ optional cfg.database.postgres.setup "postgresql.service"; + after = optional cfg.database.postgres.setup "plausible-postgres.service"; + + environment = { + # NixOS specific option to avoid that it's trying to write into its store-path. + # See also https://github.com/lau/tzdata#data-directory-and-releases + PLAUSIBLE_TZDATA = "/var/lib/plausible/elixir_tzdata"; + + # Configuration options from + # https://plausible.io/docs/self-hosting-configuration + PORT = toString cfg.server.port; + DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; + + ADMIN_USER_NAME = cfg.adminUser.name; + ADMIN_USER_EMAIL = cfg.adminUser.email; + + DATABASE_SOCKET_DIR = cfg.database.postgres.socket; + DATABASE_NAME = cfg.database.postgres.dbname; + CLICKHOUSE_DATABASE_URL = cfg.database.clickhouse.url; + + BASE_URL = cfg.server.baseUrl; + + MAILER_EMAIL = cfg.mail.email; + SMTP_HOST_ADDR = cfg.mail.smtp.hostAddr; + SMTP_HOST_PORT = toString cfg.mail.smtp.hostPort; + SMTP_RETRIES = toString cfg.mail.smtp.retries; + SMTP_HOST_SSL_ENABLED = boolToString cfg.mail.smtp.enableSSL; + ${if cfg.mail.smtp.user != null then "SMTP_USER_NAME" else null} = cfg.mail.smtp.user; + }; + + path = [ pkgs.plausible ] + ++ optional cfg.database.postgres.setup config.services.postgresql.package; + + serviceConfig = { + DynamicUser = true; + PrivateTmp = true; + WorkingDirectory = "/var/lib/plausible"; + StateDirectory = "plausible"; + ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" '' + ${envSecrets} + ${pkgs.plausible}/createdb.sh + ${pkgs.plausible}/migrate.sh + ${optionalString cfg.adminUser.activate '' + if ! ${pkgs.plausible}/init-admin.sh | grep 'already exists'; then + psql -d plausible <<< "UPDATE users SET email_verified=true;" + fi + ''} + ''} plausible-setup"; + ExecStart = "@${pkgs.writeShellScript "plausible" '' + ${envSecrets} + plausible start + ''} plausible"; + }; + }; + } + (mkIf cfg.database.postgres.setup { + # Unfortunately `plausible' requires super-user permissions in postgresql, so this + # has to be done imperatively here. + plausible-postgres = { + after = [ "postgresql.service" ]; + bindsTo = [ "postgresql.service" ]; + requiredBy = [ "plausible.service" ]; + partOf = [ "plausible.service" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ ! -e /var/lib/plausible/.db-setup ]; then + mkdir -p /var/lib/plausible/ + PSQL() { + /run/wrappers/bin/sudo -Hu postgres ${config.services.postgresql.package}/bin/psql --port=5432 "$@" + } + PSQL -tAc "CREATE EXTENSION IF NOT EXISTS citext;" + PSQL -tAc "CREATE ROLE plausible WITH LOGIN;" + PSQL -tAc "CREATE DATABASE plausible WITH OWNER plausible;" + PSQL -tAc "ALTER USER plausible WITH SUPERUSER;" + touch /var/lib/plausible/.db-setup + fi + ''; + }; + }) + ]; + }; + + meta.maintainers = with maintainers; [ ma27 ]; + meta.doc = ./plausible.xml; +} diff --git a/nixos/modules/services/web-apps/plausible.xml b/nixos/modules/services/web-apps/plausible.xml new file mode 100644 index 000000000000..d1bcc22b2314 --- /dev/null +++ b/nixos/modules/services/web-apps/plausible.xml @@ -0,0 +1,51 @@ + + Plausible + + Plausible is a privacy-friendly alternative to + Google analytics. + +
+ Basic Usage + + At first, a secret key is needed to be generated. This can be done with e.g. + $ openssl rand -base64 64 + + + After that, plausible can be deployed like this: +{ + services.plausible = { + enable = true; + adminUser = { + activate = true; + email = "admin@localhost"; + passwordFile = "/run/secrets/plausible-admin-pwd"; + }; + server = { + baseUrl = "http://analytics.example.org"; + secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; + }; + }; +} + + + + activate is used to skip the email verification of the admin-user that's + automatically created by plausible. This is only supported if + postgresql is configured by the module. This is done by default, but + can be turned off with . + + + + + secretKeybaseFile is a path to the file which contains the secret generated + with openssl as described above. + + + + +
+ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 413db7063b82..f062208a3b64 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -330,6 +330,7 @@ in php80 = handleTest ./php { php = pkgs.php80; }; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; + plausible = handleTest ./plausible.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix new file mode 100644 index 000000000000..eb14bf5f4915 --- /dev/null +++ b/nixos/tests/plausible.nix @@ -0,0 +1,46 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "plausible"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { pkgs, ... }: { + virtualisation.memorySize = 4096; + services.plausible = { + enable = true; + adminUser = { + email = "admin@example.org"; + passwordFile = "${pkgs.writeText "pwd" "foobar"}"; + activate = true; + }; + server = { + baseUrl = "http://localhost:8000"; + secretKeybaseFile = "${pkgs.writeText "dont-try-this-at-home" "nannannannannannannannannannannannannannannannannannannan_batman!"}"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("plausible.service") + machine.wait_for_open_port(8000) + + machine.succeed("curl -f localhost:8000 >&2") + + csrf_token = machine.succeed( + "curl -c /tmp/cookies localhost:8000/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" + ) + + machine.succeed( + f"curl -b /tmp/cookies -f -X POST localhost:8000/login -F email=admin@example.org -F password=foobar -F _csrf_token={csrf_token.strip()} -D headers" + ) + + # By ensuring that the user is redirected to the dashboard after login, we + # also make sure that the automatic verification of the module works. + machine.succeed( + "[[ $(grep 'location: ' headers | cut -d: -f2- | xargs echo) == /sites* ]]" + ) + + machine.shutdown() + ''; +}) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix new file mode 100644 index 000000000000..0264d30e9ff6 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -0,0 +1,85 @@ +{ lib, stdenv, beamPackages, fetchFromGitHub, glibcLocales, cacert +, mkYarnModules, nodejs, fetchpatch, nixosTests +}: + +let + pname = "plausible"; + version = "1.3.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "plausible"; + repo = "analytics"; + rev = "v${version}"; + sha256 = "03lm1f29gwwixnhgjish5bhi3m73qyp71ns2sczdnwnbhrw61zps"; + }; + + mixDeps = beamPackages.fetchMixDeps { + pname = "${pname}-deps"; + inherit src version; + sha256 = "sha256-66zSdYmis3UnbdLkPi649RbPbMPI5gVeFlaMekOy5CQ="; + }; + + yarnDeps = mkYarnModules { + pname = "${pname}-yarn-deps"; + inherit version; + packageJSON = ./package.json; + yarnNix = ./yarn.nix; + yarnLock = ./yarn.lock; + preBuild = '' + mkdir -p tmp/deps + cp -r ${mixDeps}/phoenix tmp/deps/phoenix + cp -r ${mixDeps}/phoenix_html tmp/deps/phoenix_html + ''; + postBuild = '' + echo 'module.exports = {}' > $out/node_modules/flatpickr/dist/postcss.config.js + ''; + }; +in beamPackages.mixRelease { + inherit pname version src mixDeps; + + nativeBuildInputs = [ nodejs ]; + + patches = [ + # Allow socket-authentication against postgresql. Upstream PR is + # https://github.com/plausible/analytics/pull/1052 + (fetchpatch { + url = "https://github.com/Ma27/analytics/commit/f2ee5892a6c3e1a861d69ed30cac43e05e9cd36f.patch"; + sha256 = "sha256-JvJ7xlGw+tHtWje+jiQChVC4KTyqqdq2q+MIcOv/k1o="; + }) + ]; + + passthru = { + tests = { inherit (nixosTests) plausible; }; + updateScript = ./update.sh; + }; + + postPatch = '' + # Without this modification, tzdata tries to write in its store-path: + # https://github.com/lau/tzdata#data-directory-and-releases + echo 'config :tzdata, :data_dir, (System.get_env("PLAUSIBLE_TZDATA") || "/tmp/plausible_tzdata")' \ + >> config/config.exs + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + ln -sf ${yarnDeps}/node_modules assets/node_modules + mix deps.compile --path $out --no-deps-check + mix compile --no-deps-check --path $out + + npm run deploy --prefix ./assets + mix release plausible --no-deps-check --path $out + + runHook postBuild + ''; + + meta = with lib; { + license = licenses.agpl3Plus; + homepage = "https://plausible.io/"; + description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics."; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/web-apps/plausible/package.json b/pkgs/servers/web-apps/plausible/package.json new file mode 100644 index 000000000000..63c88f647dc3 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/package.json @@ -0,0 +1,57 @@ +{ + "repository": {}, + "license": "MIT", + "scripts": { + "deploy": "$(npm bin)/webpack --mode production", + "watch": "$(npm bin)/webpack --mode development --watch" + }, + "dependencies": { + "@babel/core": "^7.11.1", + "@babel/preset-env": "^7.11.0", + "@babel/preset-react": "^7.10.4", + "@tailwindcss/aspect-ratio": "^0.2.0", + "@tailwindcss/forms": "^0.2.1", + "@tailwindcss/typography": "^0.3.1", + "abortcontroller-polyfill": "^1.5.0", + "alpinejs": "^2.7.3", + "autoprefixer": "^9.8.6", + "babel-loader": "^8.1.0", + "chart.js": "^2.9.3", + "copy-webpack-plugin": "^6.0.3", + "css-loader": "^3.6.0", + "datamaps": "^0.5.9", + "iframe-resizer": "^4.3.1", + "mini-css-extract-plugin": "^0.8.2", + "optimize-css-assets-webpack-plugin": "^5.0.3", + "phoenix": "file:../../tmp/deps/phoenix", + "phoenix_html": "file:../../tmp/deps/phoenix_html", + "postcss": "^7.0.35", + "postcss-loader": "^4.0.4", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-flatpickr": "^3.10.5", + "react-flip-move": "^3.0.4", + "react-router-dom": "^5.2.0", + "react-transition-group": "^4.4.1", + "tailwindcss": "2.0.1-compat", + "terser-webpack-plugin": "^4.2.3", + "url-search-params-polyfill": "^8.0.0", + "webpack": "4.39.2", + "webpack-cli": "^3.3.12" + }, + "devDependencies": { + "eslint": "^7.2.0", + "eslint-config-airbnb": "^18.2.0", + "eslint-config-prettier": "^7.0.0", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-prettier": "^3.3.0", + "eslint-plugin-react": "^7.21.5", + "eslint-plugin-react-hooks": "^4.2.0", + "stylelint": "^13.8.0", + "stylelint-config-prettier": "^8.0.2", + "stylelint-config-standard": "^20.0.0" + }, + "name": "plausible", + "version": "v1.3.0" +} diff --git a/pkgs/servers/web-apps/plausible/update.sh b/pkgs/servers/web-apps/plausible/update.sh new file mode 100755 index 000000000000..8861cd50a721 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/update.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch-git yarn yarn2nix-moretea.yarn2nix moreutils + +# NOTE: please check on new releases which steps aren't necessary anymore! +# Currently the following things are done: +# +# * Add correct `name`/`version` field to `package.json`, otherwise `yarn2nix` fails to +# find required dependencies. +# * Keep `tailwindcss` on version 2.0.1-compat (on `yarn` it will be upgraded due to the `^`). +# This is needed to make sure the entire build still works with `postcss-7` (needed +# by plausible). +# * Adjust `file:`-dependencies a bit for the structure inside a Nix build. +# * Update hashes for the tarball & the fixed-output drv with all `mix`-dependencies. +# * Generate `yarn.lock` & `yarn.nix` in a temporary directory. + +set -x + +dir="$(realpath $(dirname "$0"))" +latest="$(curl -q https://api.github.com/repos/plausible/analytics/releases/latest \ + | jq -r '.tag_name')" +nix_version="$(cut -c2- <<< "$latest")" + +if [ "$(nix-instantiate -A plausible.version --eval | xargs echo)" = "$nix_version" ]; +then + echo "Already using version $latest, skipping" + exit 0 +fi + +SRC="https://raw.githubusercontent.com/plausible/analytics/${latest}" + +package_json="$(curl -qf "$SRC/assets/package.json")" +fixed_tailwind_version="$(jq '.dependencies.tailwindcss' -r <<< "$package_json" | sed -e 's,^^,,g')" + +echo "$package_json" \ + | jq '. + {"name":"plausible","version":"'$latest'"}' \ + | jq '.dependencies.tailwindcss = "'"$fixed_tailwind_version"'"' \ + | sed -e 's,../deps/,../../tmp/deps/,g' \ + > $dir/package.json + +tarball_meta="$(nix-prefetch-git https://github.com/plausible/analytics --rev "$latest" --quiet)" +tarball_hash="$(jq -r '.sha256' <<< "$tarball_meta")" +tarball_path="$(jq -r '.path' <<< "$tarball_meta")" +fake_hash="$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" + +sed -i "$dir/default.nix" \ + -e 's,version = ".*",version = "'"$nix_version"'",' \ + -e '/^ src = fetchFromGitHub/,+4{;s/sha256 = "\(.*\)"/sha256 = "'"$tarball_hash"'"/}' \ + -e '/^ mixDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$fake_hash"'"/}' + +mix_hash="$(nix-build -A plausible.mixDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo)" + +sed -i "$dir/default.nix" -e '/^ mixDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$mix_hash"'"/}' + +tmp_setup_dir="$(mktemp -d)" +trap "rm -rf $tmp_setup_dir" EXIT + +cp -r $tarball_path/* $tmp_setup_dir/ +cp -r "$(nix-build -A plausible.mixDeps)" "$tmp_setup_dir/deps" +chmod -R a+rwx "$tmp_setup_dir" + +pushd $tmp_setup_dir/assets +jq < package.json '.dependencies.tailwindcss = "'"$fixed_tailwind_version"'"' | sponge package.json +yarn +yarn2nix > "$dir/yarn.nix" +cp yarn.lock "$dir/yarn.lock" +popd + +nix-build -A plausible diff --git a/pkgs/servers/web-apps/plausible/yarn.lock b/pkgs/servers/web-apps/plausible/yarn.lock new file mode 100644 index 000000000000..c37791d9d23a --- /dev/null +++ b/pkgs/servers/web-apps/plausible/yarn.lock @@ -0,0 +1,7732 @@ +# 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", "@babel/code-frame@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + dependencies: + "@babel/highlight" "^7.12.13" + +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== + +"@babel/core@>=7.9.0", "@babel/core@^7.11.1": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" + integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.14.3" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.2" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.3" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + source-map "^0.5.0" + +"@babel/generator@^7.14.2", "@babel/generator@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" + integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== + dependencies: + "@babel/types" "^7.14.2" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" + integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" + integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" + integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== + dependencies: + "@babel/compat-data" "^7.13.15" + "@babel/helper-validator-option" "^7.12.17" + browserslist "^4.14.5" + semver "^6.3.0" + +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz#832111bcf4f57ca57a4c5b1a000fc125abc6554a" + integrity sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.14.2" + "@babel/helper-member-expression-to-functions" "^7.13.12" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-replace-supers" "^7.14.3" + "@babel/helper-split-export-declaration" "^7.12.13" + +"@babel/helper-create-regexp-features-plugin@^7.12.13": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz#149aa6d78c016e318c43e2409a0ae9c136a86688" + integrity sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + regexpu-core "^4.7.1" + +"@babel/helper-define-polyfill-provider@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.1.tgz#e6f5f4a6edc3722152c21359190de67fc6cf664d" + integrity sha512-x3AUTVZNPunaw1opRTa5OwVA5N0YxGlIad9xQ5QflK1uIS7PnAGGU5O2Dj/G183fR//N8AzTq+Q8+oiu9m0VFg== + dependencies: + "@babel/helper-compilation-targets" "^7.13.0" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/traverse" "^7.13.0" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + +"@babel/helper-explode-assignable-expression@^7.12.13": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" + integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== + dependencies: + "@babel/types" "^7.13.0" + +"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" + integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== + dependencies: + "@babel/helper-get-function-arity" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/types" "^7.14.2" + +"@babel/helper-get-function-arity@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" + integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-hoist-variables@^7.13.0": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30" + integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg== + dependencies: + "@babel/traverse" "^7.13.15" + "@babel/types" "^7.13.16" + +"@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== + dependencies: + "@babel/types" "^7.13.12" + +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== + dependencies: + "@babel/types" "^7.13.12" + +"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" + integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== + dependencies: + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.14.0" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" + +"@babel/helper-optimise-call-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" + integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" + integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== + +"@babel/helper-remap-async-to-generator@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" + integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" + integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.13.12" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" + +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== + dependencies: + "@babel/types" "^7.13.12" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" + integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-split-export-declaration@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" + integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== + +"@babel/helper-validator-option@^7.12.17": + version "7.12.17" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" + integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== + +"@babel/helper-wrap-function@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" + integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== + dependencies: + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/helpers@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== + dependencies: + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.0" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" + integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a" + integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" + +"@babel/plugin-proposal-async-generator-functions@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e" + integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-remap-async-to-generator" "^7.13.0" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +"@babel/plugin-proposal-class-properties@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" + integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-proposal-class-static-block@^7.13.11": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz#5a527e2cae4a4753119c3a3e7f64ecae8ccf1360" + integrity sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.3" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-class-static-block" "^7.12.13" + +"@babel/plugin-proposal-dynamic-import@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f" + integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + +"@babel/plugin-proposal-export-namespace-from@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz#62542f94aa9ce8f6dba79eec698af22112253791" + integrity sha512-sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + +"@babel/plugin-proposal-json-strings@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c" + integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" + +"@babel/plugin-proposal-logical-assignment-operators@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz#222348c080a1678e0e74ea63fe76f275882d1fd7" + integrity sha512-1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546" + integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + +"@babel/plugin-proposal-numeric-separator@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz#82b4cc06571143faf50626104b335dd71baa4f9e" + integrity sha512-DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + +"@babel/plugin-proposal-object-rest-spread@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc" + integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw== + dependencies: + "@babel/compat-data" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.14.2" + +"@babel/plugin-proposal-optional-catch-binding@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717" + integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + +"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e" + integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-proposal-private-methods@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" + integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-proposal-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636" + integrity sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.14.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" + +"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" + integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-class-static-block@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz#8e3d674b0613e67975ceac2776c97b60cafc5c9c" + integrity sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-dynamic-import@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-jsx@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" + integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz#762a4babec61176fec6c88480dec40372b140c0b" + integrity sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-syntax-top-level-await@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-arrow-functions@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" + integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-async-to-generator@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" + integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-remap-async-to-generator" "^7.13.0" + +"@babel/plugin-transform-block-scoped-functions@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" + integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-block-scoping@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c" + integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-classes@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d" + integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.14.2" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-split-export-declaration" "^7.12.13" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" + integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-destructuring@^7.13.17": + version "7.13.17" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" + integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" + integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-duplicate-keys@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" + integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-exponentiation-operator@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" + integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-for-of@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" + integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" + integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== + dependencies: + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" + integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-member-expression-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" + integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-modules-amd@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0" + integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw== + dependencies: + "@babel/helper-module-transforms" "^7.14.2" + "@babel/helper-plugin-utils" "^7.13.0" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161" + integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ== + dependencies: + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-simple-access" "^7.13.12" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" + integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== + dependencies: + "@babel/helper-hoist-variables" "^7.13.0" + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-identifier" "^7.12.11" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34" + integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw== + dependencies: + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" + integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + +"@babel/plugin-transform-new-target@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" + integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-object-super@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" + integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + +"@babel/plugin-transform-parameters@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31" + integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-property-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" + integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-react-display-name@^7.12.13": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz#2e854544d42ab3bb9c21f84e153d62e800fbd593" + integrity sha512-zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-react-jsx-development@^7.12.17": + version "7.12.17" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447" + integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.12.17" + +"@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.13.12": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz#0e26597805cf0862da735f264550933c38babb66" + integrity sha512-uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/types" "^7.14.2" + +"@babel/plugin-transform-react-pure-annotations@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" + integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-regenerator@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" + integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== + dependencies: + regenerator-transform "^0.14.2" + +"@babel/plugin-transform-reserved-words@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" + integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-shorthand-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" + integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-spread@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" + integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + +"@babel/plugin-transform-sticky-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" + integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-template-literals@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" + integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-typeof-symbol@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" + integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-unicode-escapes@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" + integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-unicode-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" + integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/preset-env@^7.11.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz#e80612965da73579c84ad2f963c2359c71524ed5" + integrity sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ== + dependencies: + "@babel/compat-data" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-option" "^7.12.17" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" + "@babel/plugin-proposal-async-generator-functions" "^7.14.2" + "@babel/plugin-proposal-class-properties" "^7.13.0" + "@babel/plugin-proposal-class-static-block" "^7.13.11" + "@babel/plugin-proposal-dynamic-import" "^7.14.2" + "@babel/plugin-proposal-export-namespace-from" "^7.14.2" + "@babel/plugin-proposal-json-strings" "^7.14.2" + "@babel/plugin-proposal-logical-assignment-operators" "^7.14.2" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.2" + "@babel/plugin-proposal-numeric-separator" "^7.14.2" + "@babel/plugin-proposal-object-rest-spread" "^7.14.2" + "@babel/plugin-proposal-optional-catch-binding" "^7.14.2" + "@babel/plugin-proposal-optional-chaining" "^7.14.2" + "@babel/plugin-proposal-private-methods" "^7.13.0" + "@babel/plugin-proposal-private-property-in-object" "^7.14.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.12.13" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" + "@babel/plugin-syntax-top-level-await" "^7.12.13" + "@babel/plugin-transform-arrow-functions" "^7.13.0" + "@babel/plugin-transform-async-to-generator" "^7.13.0" + "@babel/plugin-transform-block-scoped-functions" "^7.12.13" + "@babel/plugin-transform-block-scoping" "^7.14.2" + "@babel/plugin-transform-classes" "^7.14.2" + "@babel/plugin-transform-computed-properties" "^7.13.0" + "@babel/plugin-transform-destructuring" "^7.13.17" + "@babel/plugin-transform-dotall-regex" "^7.12.13" + "@babel/plugin-transform-duplicate-keys" "^7.12.13" + "@babel/plugin-transform-exponentiation-operator" "^7.12.13" + "@babel/plugin-transform-for-of" "^7.13.0" + "@babel/plugin-transform-function-name" "^7.12.13" + "@babel/plugin-transform-literals" "^7.12.13" + "@babel/plugin-transform-member-expression-literals" "^7.12.13" + "@babel/plugin-transform-modules-amd" "^7.14.2" + "@babel/plugin-transform-modules-commonjs" "^7.14.0" + "@babel/plugin-transform-modules-systemjs" "^7.13.8" + "@babel/plugin-transform-modules-umd" "^7.14.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" + "@babel/plugin-transform-new-target" "^7.12.13" + "@babel/plugin-transform-object-super" "^7.12.13" + "@babel/plugin-transform-parameters" "^7.14.2" + "@babel/plugin-transform-property-literals" "^7.12.13" + "@babel/plugin-transform-regenerator" "^7.13.15" + "@babel/plugin-transform-reserved-words" "^7.12.13" + "@babel/plugin-transform-shorthand-properties" "^7.12.13" + "@babel/plugin-transform-spread" "^7.13.0" + "@babel/plugin-transform-sticky-regex" "^7.12.13" + "@babel/plugin-transform-template-literals" "^7.13.0" + "@babel/plugin-transform-typeof-symbol" "^7.12.13" + "@babel/plugin-transform-unicode-escapes" "^7.12.13" + "@babel/plugin-transform-unicode-regex" "^7.12.13" + "@babel/preset-modules" "^0.1.4" + "@babel/types" "^7.14.2" + babel-plugin-polyfill-corejs2 "^0.2.0" + babel-plugin-polyfill-corejs3 "^0.2.0" + babel-plugin-polyfill-regenerator "^0.2.0" + core-js-compat "^3.9.0" + semver "^6.3.0" + +"@babel/preset-modules@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/preset-react@^7.10.4": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761" + integrity sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-option" "^7.12.17" + "@babel/plugin-transform-react-display-name" "^7.12.13" + "@babel/plugin-transform-react-jsx" "^7.13.12" + "@babel/plugin-transform-react-jsx-development" "^7.12.17" + "@babel/plugin-transform-react-pure-annotations" "^7.12.1" + +"@babel/runtime-corejs3@^7.10.2": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz#6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66" + integrity sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg== + dependencies: + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" + integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" + integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.14.2" + "@babel/helper-function-name" "^7.14.2" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.14.2" + "@babel/types" "^7.14.2" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.4": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" + integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== + dependencies: + "@babel/helper-validator-identifier" "^7.14.0" + to-fast-properties "^2.0.0" + +"@eslint/eslintrc@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" + integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.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" + +"@fullhuman/postcss-purgecss@^3.0.0": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-3.1.3.tgz#47af7b87c9bfb3de4bc94a38f875b928fffdf339" + integrity sha512-kwOXw8fZ0Lt1QmeOOrd+o4Ibvp4UTEBFQbzvWldjlKv5n+G9sXfIPn1hh63IQIL8K8vbvv1oYMJiIUbuy9bGaA== + dependencies: + purgecss "^3.1.3" + +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== + dependencies: + "@nodelib/fs.stat" "2.0.4" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + dependencies: + "@nodelib/fs.scandir" "2.1.4" + fastq "^1.6.0" + +"@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" + +"@stylelint/postcss-css-in-js@^0.37.2": + version "0.37.2" + resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2" + integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA== + dependencies: + "@babel/core" ">=7.9.0" + +"@stylelint/postcss-markdown@^0.36.2": + version "0.36.2" + resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391" + integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ== + dependencies: + remark "^13.0.0" + unist-util-find-all-after "^3.0.2" + +"@tailwindcss/aspect-ratio@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.0.tgz#bebd32b7d0756b695294d4db1ae658796ff72a2c" + integrity sha512-v5LyHkwXj/4lI74B06zUrmWEdmSqS43+jw717pkt3fAXqb7ALwu77A8t7j+Bej+ZbdlIIqNMYheGN7wSGV1A6w== + +"@tailwindcss/forms@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.2.1.tgz#3244b185854fae1a7cbe8d2456314d8b2d98cf43" + integrity sha512-czfvEdY+J2Ogfd6RUSr/ZSUmDxTujr34M++YLnp2cCPC3oJ4kFvFMaRXA6cEXKw7F1hJuapdjXRjsXIEXGgORg== + dependencies: + mini-svg-data-uri "^1.2.3" + +"@tailwindcss/typography@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.3.1.tgz#253ce580c8e06b6163d9a288edd24f25e1d0dfee" + integrity sha512-HyZ+3Eay8SGaPq7kcFoANZLr4EjeXQ19yjjb9fp6B0PHHpvZoe00jdsnpnooMEbx9J5rQ93nxPUG3MQmXVxGMQ== + +"@types/d3@3.5.38": + version "3.5.38" + resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.38.tgz#76f8f2e9159ae562965b2fa0e6fbee1aa643a1bc" + integrity sha1-dvjy6RWa5WKWWy+g5vvuGqZDobw= + +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== + +"@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/mdast@^3.0.0": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" + integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw== + dependencies: + "@types/unist" "*" + +"@types/minimist@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" + integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== + +"@types/node@*": + version "15.6.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz#f0ddca5a61e52627c9dcb771a6039d44694597bc" + integrity sha512-gCYSfQpy+LYhOFTKAeE8BkyGqaxmlFxe+n4DKM6DR0wzw/HISUE/hAmkC/KT8Sw5PCJblqg062b3z9gucv3k0A== + +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/q@^1.5.1": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" + integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + +"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" + integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== + +"@webassemblyjs/ast@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" + integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== + dependencies: + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + +"@webassemblyjs/floating-point-hex-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" + integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== + +"@webassemblyjs/helper-api-error@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" + integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== + +"@webassemblyjs/helper-buffer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" + integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== + +"@webassemblyjs/helper-code-frame@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" + integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== + dependencies: + "@webassemblyjs/wast-printer" "1.8.5" + +"@webassemblyjs/helper-fsm@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" + integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== + +"@webassemblyjs/helper-module-context@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" + integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== + dependencies: + "@webassemblyjs/ast" "1.8.5" + mamacro "^0.0.3" + +"@webassemblyjs/helper-wasm-bytecode@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" + integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== + +"@webassemblyjs/helper-wasm-section@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" + integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + +"@webassemblyjs/ieee754@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" + integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" + integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" + integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== + +"@webassemblyjs/wasm-edit@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" + integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/helper-wasm-section" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-opt" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/wast-printer" "1.8.5" + +"@webassemblyjs/wasm-gen@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" + integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + +"@webassemblyjs/wasm-opt@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" + integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + +"@webassemblyjs/wasm-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" + integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + +"@webassemblyjs/wast-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" + integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/floating-point-hex-parser" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-code-frame" "1.8.5" + "@webassemblyjs/helper-fsm" "1.8.5" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/wast-printer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" + integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + "@xtuc/long" "4.2.2" + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +abortcontroller-polyfill@^1.5.0: + version "1.7.3" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5" + integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q== + +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn-node@^1.6.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== + dependencies: + acorn "^7.0.0" + acorn-walk "^7.0.0" + xtend "^4.0.2" + +acorn-walk@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^6.2.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.0.0, acorn@^7.1.1, 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== + +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.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.5.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b" + integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ== + 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.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + +alpinejs@^2.7.3: + version "2.8.2" + resolved "https://registry.yarnpkg.com/alpinejs/-/alpinejs-2.8.2.tgz#b14ec21ae3cd78dcee4aed0a78ed0f01b676dac4" + integrity sha512-5yOUtckn4CBp0qsHpo2qgjZyZit84uXvHbB7NJ27sn4FA6UlFl2i9PGUAdTXkcbFvvxDJBM+zpOD8RuNYFvQAw== + +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@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +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.1.1: + 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.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +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" + +aria-query@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== + dependencies: + "@babel/runtime" "^7.10.2" + "@babel/runtime-corejs3" "^7.10.2" + +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.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-includes@^3.1.1, array-includes@^3.1.2, 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.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" + +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" + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= + +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" + +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= + +ast-types-flow@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" + integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= + +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.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== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +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== + +autoprefixer@^9, autoprefixer@^9.8.6: + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== + dependencies: + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" + colorette "^1.2.1" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.32" + postcss-value-parser "^4.1.0" + +axe-core@^4.0.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.1.tgz#2e50bcf10ee5b819014f6e342e41e45096239e34" + integrity sha512-evY7DN8qSIbsW2H/TWQ1bX3sXN1d4MNb5Vb4n7BzPuCwRHdkZ1H2eNLuSh73EoQqkGKUtju2G2HCcjCfhvZIAA== + +axobject-query@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" + integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== + +babel-loader@^8.1.0: + version "8.2.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" + integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== + dependencies: + find-cache-dir "^3.3.1" + loader-utils "^1.4.0" + make-dir "^3.1.0" + schema-utils "^2.6.5" + +babel-plugin-dynamic-import-node@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-polyfill-corejs2@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.1.tgz#ae2cf6d6f1aa7c0edcf04a25180e8856a6d1184f" + integrity sha512-hXGSPbr6IbjeMyGew+3uGIAkRjBFSOJ9FLDZNOfHuyJZCcoia4nd/72J0bSgvfytcVfUcP/dxEVcUhVJuQRtSw== + dependencies: + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.1" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.1.tgz#786f40218040030f0edecfd48e6e59f1ee9bef53" + integrity sha512-WZCqF3DLUhdTD/P381MDJfuP18hdCZ+iqJ+wHtzhWENpsiof284JJ1tMQg1CE+hfCWyG48F7e5gDMk2c3Laz7w== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.1" + core-js-compat "^3.9.1" + +babel-plugin-polyfill-regenerator@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.1.tgz#ca9595d7d5f3afefec2d83126148b90db751a091" + integrity sha512-T3bYyL3Sll2EtC94v3f+fA8M28q7YPTOZdB++SRHjvYZTvtd+WorMUq3tDTD4Q7Kjk1LG0gGromslKjcO5p2TA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.1" + +bail@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +balanced-match@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" + integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== + +base64-js@^1.0.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +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" + +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" + +bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +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== + +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= + +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@^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" + +brfs@^1.3.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3" + integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ== + dependencies: + quote-stream "^1.0.1" + resolve "^1.1.5" + static-module "^2.2.0" + through2 "^2.0.0" + +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= + +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-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@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== + dependencies: + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" + escalade "^3.1.1" + node-releases "^1.1.71" + +buffer-equal@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" + integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffer-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.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" + +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= + +bytes@^3.0.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.1.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz#164c2f857ee606e4cc793c63018fefd0ea5eba7b" + integrity sha512-mfx0C+mCfWjD1PnwQ9yaOrwG1ou9FkKnx0SvzUHWdFt7r7GaRtzT+9M8HAvLu62zIHtnpQ/1m93nWNDCckJGXQ== + dependencies: + "@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" + +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase-css@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== + +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== + dependencies: + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" + +camelcase@^5.0.0, camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +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.30001109, caniuse-lite@^1.0.30001219: + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== + +chalk@^2.0.0, chalk@^2.4.1, 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, chalk@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +character-entities-legacy@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== + +character-entities@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== + +character-reference-invalid@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== + +chart.js@^2.9.3: + version "2.9.4" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684" + integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A== + dependencies: + chartjs-color "^2.1.0" + moment "^2.10.2" + +chartjs-color-string@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" + integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A== + dependencies: + color-name "^1.0.0" + +chartjs-color@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0" + integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w== + dependencies: + chartjs-color-string "^0.6.0" + color-convert "^1.9.3" + +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" + +chokidar@^3.4.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +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-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@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +clone-regexp@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f" + integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q== + dependencies: + is-regexp "^2.0.0" + +coa@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== + dependencies: + "@types/q" "^1.5.1" + chalk "^2.4.1" + q "^1.1.2" + +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, color-convert@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" + integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.0.0, color@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" + integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.4" + +colorette@^1.2.1, colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + +component-emitter@^1.2.1: + 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== + +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, concat-stream@~1.6.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" + +confusing-browser-globals@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59" + integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA== + +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== + +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= + +convert-source-map@^1.5.1, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +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.0.3: + 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-compat@^3.9.0, core-js-compat@^3.9.1: + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b" + integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ== + dependencies: + browserslist "^4.16.6" + semver "7.0.0" + +core-js-pure@^3.0.0: + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz#934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8" + integrity sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ== + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cosmiconfig@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +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@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +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@0.0.4, css-color-names@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" + integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= + +css-declaration-sorter@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" + integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== + dependencies: + postcss "^7.0.1" + timsort "^0.3.0" + +css-loader@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" + integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== + dependencies: + camelcase "^5.3.1" + cssesc "^3.0.0" + icss-utils "^4.1.1" + loader-utils "^1.2.3" + normalize-path "^3.0.0" + postcss "^7.0.32" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" + postcss-value-parser "^4.1.0" + schema-utils "^2.7.0" + semver "^6.3.0" + +css-select-base-adapter@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== + +css-select@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== + dependencies: + boolbase "^1.0.0" + css-what "^3.2.1" + domutils "^1.7.0" + nth-check "^1.0.2" + +css-tree@1.0.0-alpha.37: + version "1.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== + dependencies: + mdn-data "2.0.4" + source-map "^0.6.1" + +css-tree@^1.1.2: + 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-unit-converter@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" + integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== + +css-what@^3.2.1: + version "3.4.2" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssnano-preset-default@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" + integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== + dependencies: + css-declaration-sorter "^4.0.1" + cssnano-util-raw-cache "^4.0.1" + postcss "^7.0.0" + postcss-calc "^7.0.1" + postcss-colormin "^4.0.3" + postcss-convert-values "^4.0.1" + postcss-discard-comments "^4.0.2" + postcss-discard-duplicates "^4.0.2" + postcss-discard-empty "^4.0.1" + postcss-discard-overridden "^4.0.1" + postcss-merge-longhand "^4.0.11" + postcss-merge-rules "^4.0.3" + postcss-minify-font-values "^4.0.2" + postcss-minify-gradients "^4.0.2" + postcss-minify-params "^4.0.2" + postcss-minify-selectors "^4.0.2" + postcss-normalize-charset "^4.0.1" + postcss-normalize-display-values "^4.0.2" + postcss-normalize-positions "^4.0.2" + postcss-normalize-repeat-style "^4.0.2" + postcss-normalize-string "^4.0.2" + postcss-normalize-timing-functions "^4.0.2" + postcss-normalize-unicode "^4.0.1" + postcss-normalize-url "^4.0.1" + postcss-normalize-whitespace "^4.0.2" + postcss-ordered-values "^4.1.2" + postcss-reduce-initial "^4.0.3" + postcss-reduce-transforms "^4.0.2" + postcss-svgo "^4.0.3" + postcss-unique-selectors "^4.0.1" + +cssnano-util-get-arguments@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" + integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= + +cssnano-util-get-match@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" + integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= + +cssnano-util-raw-cache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" + integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== + dependencies: + postcss "^7.0.0" + +cssnano-util-same-parent@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" + integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== + +cssnano@^4.1.10: + version "4.1.11" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" + integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== + dependencies: + cosmiconfig "^5.0.0" + cssnano-preset-default "^4.0.8" + is-resolvable "^1.0.0" + postcss "^7.0.0" + +csso@^4.0.2: + 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" + +csstype@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== + +cyclist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" + integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= + +d3-geo-projection@0.2: + version "0.2.16" + resolved "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz#4994ecd1033ddb1533b6c4c5528a1c81dcc29427" + integrity sha1-SZTs0QM92xUztsTFUoocgdzClCc= + dependencies: + brfs "^1.3.0" + +d3-queue@1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-1.2.3.tgz#143a701cfa65fe021292f321c10d14e98abd491b" + integrity sha1-FDpwHPpl/gISkvMhwQ0U6Yq9SRs= + +d3-queue@2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-2.0.3.tgz#07fbda3acae5358a9c5299aaf880adf0953ed2c2" + integrity sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI= + +d3@3, d3@^3.5.6: + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" + integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g= + +damerau-levenshtein@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" + integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== + +datamaps@^0.5.9: + version "0.5.9" + resolved "https://registry.yarnpkg.com/datamaps/-/datamaps-0.5.9.tgz#2a775473aaab29b55025208b2245e840ecfd4fe1" + integrity sha512-GUXpO713URNzaExVUgBtqA5fr2UuxUG/fVitI04zEFHVL2FHSjd672alHq8E16oQqRNzF0m1bmx8WlTnDrGSqQ== + dependencies: + "@types/d3" "3.5.38" + d3 "^3.5.6" + topojson "^1.6.19" + +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +decamelize-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" + integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.1.0, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +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-is@^0.1.3, deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +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" + +defined@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + +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" + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + +detective@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== + dependencies: + acorn-node "^1.6.1" + defined "^1.0.0" + minimist "^1.1.1" + +didyoumean@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz#e92edfdada6537d484d73c0172fd1eba0c4976ff" + integrity sha1-6S7f2tplN9SE1zwBcv0eugxJdv8= + +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-helpers@^5.0.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +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.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: + 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" + +domutils@^1.5.1, domutils@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +duplexer2@~0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + +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" + +electron-to-chromium@^1.3.723: + version "1.3.735" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz#fa1a8660f2790662291cb2136f0e446a444cdfdc" + integrity sha512-cp7MWzC3NseUJV2FJFgaiesdrS+A8ZUjX5fLAxdRlcaPDkaPGFplX930S5vf84yqDp4LjuLdKouWuVOTwUfqHQ== + +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@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.0.0: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1: + 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: + 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== + +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.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: + version "1.18.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" + integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.2" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.2" + is-string "^1.0.5" + object-inspect "^1.9.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.0" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^1.11.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +escodegen@~1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" + integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q== + dependencies: + esprima "^3.1.3" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-config-airbnb-base@^14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e" + integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA== + dependencies: + confusing-browser-globals "^1.0.10" + object.assign "^4.1.2" + object.entries "^1.1.2" + +eslint-config-airbnb@^18.2.0: + version "18.2.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz#b7fe2b42f9f8173e825b73c8014b592e449c98d9" + integrity sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg== + dependencies: + eslint-config-airbnb-base "^14.2.1" + object.assign "^4.1.2" + object.entries "^1.1.2" + +eslint-config-prettier@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9" + integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg== + +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + dependencies: + debug "^2.6.9" + resolve "^1.13.1" + +eslint-module-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" + integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== + dependencies: + debug "^3.2.7" + pkg-dir "^2.0.0" + +eslint-plugin-import@^2.22.1: + version "2.23.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.3.tgz#8a1b073289fff03c4af0f04b6df956b7d463e191" + integrity sha512-wDxdYbSB55F7T5CC7ucDjY641VvKmlRwT0Vxh7PkY1mI4rclVRFWYfsrjDgZvwYYDZ5ee0ZtfFKXowWjqvEoRQ== + 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.4" + eslint-module-utils "^2.6.1" + find-up "^2.0.0" + has "^1.0.3" + is-core-module "^2.4.0" + minimatch "^3.0.4" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.9.0" + +eslint-plugin-jsx-a11y@^6.4.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd" + integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg== + dependencies: + "@babel/runtime" "^7.11.2" + aria-query "^4.2.2" + array-includes "^3.1.1" + ast-types-flow "^0.0.7" + axe-core "^4.0.2" + axobject-query "^2.2.0" + damerau-levenshtein "^1.0.6" + emoji-regex "^9.0.0" + has "^1.0.3" + jsx-ast-utils "^3.1.0" + language-tags "^1.0.5" + +eslint-plugin-prettier@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7" + integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-react-hooks@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" + integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== + +eslint-plugin-react@^7.21.5: + version "7.23.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz#2d2291b0f95c03728b55869f01102290e792d494" + integrity sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw== + dependencies: + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" + doctrine "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.3" + object.fromentries "^2.0.4" + object.values "^1.1.3" + prop-types "^15.7.2" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.4" + +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.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.2.0: + version "7.27.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz#665a1506d8f95655c9274d84bd78f7166b07e9c7" + integrity sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.1" + 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.0.0" + 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@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" + integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.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, estraverse@^4.2.0: + 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== + +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" + +execall@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45" + integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow== + dependencies: + clone-regexp "^2.1.0" + +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-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" + +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.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +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" + +falafel@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.2.4.tgz#b5d86c060c2412a43166243cb1bce44d1abd2819" + integrity sha512-0HXjo8XASWRmsS0X1EkhwEMZaD3Qvp7FfURwjLKjG1ghfRm/MGZl2r4cWUTv41KdNghTw4OUMmVtdGQp3+H+uQ== + dependencies: + acorn "^7.1.1" + foreach "^2.0.5" + isarray "^2.0.1" + object-keys "^1.0.6" + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +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.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + dependencies: + reusify "^1.0.4" + +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-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== + +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" + +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.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.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, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +findup-sync@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatpickr@^4.6.2: + version "4.6.9" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499" + integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== + +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + +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" + +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= + +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + +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" + +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-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-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-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.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.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-stdin@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + +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= + +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.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.0.0, 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" + +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.1, globby@^11.0.3: + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM= + +gonzales-pe@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3" + integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ== + dependencies: + minimist "^1.2.5" + +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-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.0, has@^1.0.1, 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" + +hex-color-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" + integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== + +history@^4.9.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" + integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== + dependencies: + "@babel/runtime" "^7.1.2" + loose-envify "^1.2.0" + resolve-pathname "^3.0.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + value-equal "^1.0.1" + +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" + +hoist-non-react-statics@^3.1.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + +hsl-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" + integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= + +hsla-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" + integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= + +html-tags@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== + +htmlparser2@^3.10.0: + 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" + +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= + +iconv-lite@0.2: + version "0.2.11" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8" + integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg= + +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" + +ieee754@^1.1.4: + 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= + +iframe-resizer@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.2.tgz#42dd88345d18b9e377b6044dddb98c664ab0ce6b" + integrity sha512-gOWo2hmdPjMQsQ+zTKbses08mDfDEMh4NneGQNP4qwePYujY1lguqP6gnbeJkf154gojWlBhIltlgnMfYjGHWA== + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +ignore@^5.1.4, ignore@^5.1.8: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + +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-lazy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" + integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== + +import-local@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" + integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== + dependencies: + pkg-dir "^3.0.0" + resolve-cwd "^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= + +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== + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= + +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== + +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.1, inherits@^2.0.3, inherits@^2.0.4, 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.4, ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +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@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +is-absolute-url@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" + integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= + +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@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" + integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== + +is-alphanumerical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^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.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + +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-boolean-object@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + dependencies: + call-bind "^1.0.2" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-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.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + +is-color-stop@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" + integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= + dependencies: + css-color-names "^0.0.4" + hex-color-regex "^1.1.0" + hsl-regex "^1.0.0" + hsla-regex "^1.0.0" + rgb-regex "^1.0.1" + rgba-regex "^1.0.0" + +is-core-module@^2.2.0, is-core-module@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== + 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: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + +is-decimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== + +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-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= + +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@^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-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^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@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== + +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.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + +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@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-plain-obj@^1.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= + +is-plain-obj@^2.0.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-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-regex@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== + dependencies: + call-bind "^1.0.2" + has-symbols "^1.0.2" + +is-regexp@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" + integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== + +is-resolvable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== + +is-string@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== + +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-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-windows@^1.0.1, 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.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= + +jest-worker@^26.5.0: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +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-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= + +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.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== + dependencies: + array-includes "^3.1.2" + object.assign "^4.1.2" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +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== + +known-css-properties@^0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d" + integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw== + +language-subtag-registry@~0.3.2: + version "0.3.21" + resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a" + integrity sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg== + +language-tags@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a" + integrity sha1-0yHbxNowuovzAk4ED6XBRmH5GTo= + dependencies: + language-subtag-registry "~0.3.2" + +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" + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +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" + +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.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + 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" + +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.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= + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.toarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" + integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= + +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.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.20, lodash@^4.17.21, 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" + +longest-streak@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" + integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== + +loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lru-cache@^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" + +magic-string@^0.22.4: + version "0.22.5" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" + integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w== + dependencies: + vlq "^0.2.2" + +make-dir@^2.0.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, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +mamacro@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" + integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== + +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-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + +map-obj@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7" + integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ== + +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" + +mathml-tag-names@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" + integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== + +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-util-from-markdown@^0.8.0: + version "0.8.5" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c" + integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-to-string "^2.0.0" + micromark "~2.11.0" + parse-entities "^2.0.0" + unist-util-stringify-position "^2.0.0" + +mdast-util-to-markdown@^0.6.0: + version "0.6.5" + resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe" + integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ== + dependencies: + "@types/unist" "^2.0.0" + longest-streak "^2.0.0" + mdast-util-to-string "^2.0.0" + parse-entities "^2.0.0" + repeat-string "^1.0.0" + zwitch "^1.0.0" + +mdast-util-to-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== + +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" + +meow@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" + integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize "^1.2.0" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" + +merge-source-map@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f" + integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8= + dependencies: + source-map "^0.5.6" + +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== + +micromark@~2.11.0: + version "2.11.4" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a" + integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA== + dependencies: + debug "^4.0.0" + parse-entities "^2.0.0" + +micromatch@^3.0.4, 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.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" + +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" + +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + +mini-create-react-context@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== + dependencies: + "@babel/runtime" "^7.12.1" + tiny-warning "^1.0.3" + +mini-css-extract-plugin@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161" + integrity sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw== + dependencies: + loader-utils "^1.1.0" + normalize-url "1.9.1" + schema-utils "^1.0.0" + webpack-sources "^1.1.0" + +mini-svg-data-uri@^1.2.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.3.3.tgz#91d2c09f45e056e5e1043340b8b37ba7b50f4fac" + integrity sha512-+fA2oRcR1dJI/7ITmeQJDrYWks0wodlOz0pAEhKYJ2IVc1z0AnwJUsKY2fzFmPAM3Jo9J0rBx8JAA9QQSJ5PuA== + +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: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + kind-of "^6.0.3" + +minimist@^1.1.1, minimist@^1.1.3, 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== + +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@^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@^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.1, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +modern-normalize@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" + integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== + +moment@^2.10.2: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + +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.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +nan@^2.12.1: + version "2.14.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + +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== + +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= + +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== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-emoji@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da" + integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw== + dependencies: + lodash.toarray "^4.4.0" + +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-releases@^1.1.71: + version "1.1.72" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" + integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== + +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-package-data@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== + dependencies: + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" + validate-npm-package-license "^3.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-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= + +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM= + +normalize-url@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + +normalize-url@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" + integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== + +nth-check@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + +object-assign@^4.0.1, 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-hash@^2.0.3: + version "2.1.1" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" + integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== + +object-inspect@^1.9.0: + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== + +object-inspect@~1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4" + integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw== + +object-keys@^1.0.12, object-keys@^1.0.6, 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.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.entries@^1.1.2, object.entries@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" + integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + has "^1.0.3" + +object.fromentries@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" + integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + has "^1.0.3" + +object.getownpropertydescriptors@^2.1.0: + 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.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.0, object.values@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" + integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + has "^1.0.3" + +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" + +optimist@0.3: + version "0.3.7" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9" + integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk= + dependencies: + wordwrap "~0.0.2" + +optimize-css-assets-webpack-plugin@^5.0.3: + version "5.0.6" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.6.tgz#abad0c6c11a632201794f75ddba3ce13e32ae80e" + integrity sha512-JAYw7WrIAIuHWoKeSBB3lJ6ZG9PSDK3JJduv/FMpIY060wvbA8Lqn/TCtxNGICNlg0X5AGshLzIhpYrkltdq+A== + dependencies: + cssnano "^4.1.10" + last-call-webpack-plugin "^3.0.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + 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= + +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-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== + +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" + +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@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.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-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +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: + 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@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +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.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +path-to-regexp@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + dependencies: + isarray "0.0.1" + +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== + +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" + +"phoenix@file:../deps/phoenix": + version "1.5.8" + +"phoenix_html@file:../deps/phoenix_html": + version "2.14.3" + +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: + 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" + +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@^7.0.1: + version "7.0.5" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" + integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== + dependencies: + postcss "^7.0.27" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + +postcss-colormin@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" + integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== + dependencies: + browserslist "^4.0.0" + color "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-convert-values@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" + integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-discard-comments@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" + integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== + dependencies: + postcss "^7.0.0" + +postcss-discard-duplicates@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" + integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== + dependencies: + postcss "^7.0.0" + +postcss-discard-empty@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" + integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== + dependencies: + postcss "^7.0.0" + +postcss-discard-overridden@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" + integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== + dependencies: + postcss "^7.0.0" + +postcss-functions@^3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e" + integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4= + dependencies: + glob "^7.1.2" + object-assign "^4.1.1" + postcss "^6.0.9" + postcss-value-parser "^3.3.0" + +postcss-html@^0.36.0: + version "0.36.0" + resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204" + integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw== + dependencies: + htmlparser2 "^3.10.0" + +postcss-js@^2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9" + integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w== + dependencies: + camelcase-css "^2.0.1" + postcss "^7.0.18" + +postcss-less@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad" + integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA== + dependencies: + postcss "^7.0.14" + +postcss-loader@^4.0.4: + version "4.3.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc" + integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q== + dependencies: + cosmiconfig "^7.0.0" + klona "^2.0.4" + loader-utils "^2.0.0" + schema-utils "^3.0.0" + semver "^7.3.4" + +postcss-media-query-parser@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= + +postcss-merge-longhand@^4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" + integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== + dependencies: + css-color-names "0.0.4" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + stylehacks "^4.0.0" + +postcss-merge-rules@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" + integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + cssnano-util-same-parent "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + vendors "^1.0.0" + +postcss-minify-font-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" + integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-gradients@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" + integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + is-color-stop "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-params@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" + integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== + dependencies: + alphanum-sort "^1.0.0" + browserslist "^4.0.0" + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + uniqs "^2.0.0" + +postcss-minify-selectors@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" + integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== + dependencies: + alphanum-sort "^1.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== + dependencies: + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" + +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + dependencies: + icss-utils "^4.0.0" + postcss "^7.0.6" + +postcss-nested@^4: + version "4.2.3" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6" + integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw== + dependencies: + postcss "^7.0.32" + postcss-selector-parser "^6.0.2" + +postcss-normalize-charset@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" + integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== + dependencies: + postcss "^7.0.0" + +postcss-normalize-display-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" + integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-positions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" + integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== + dependencies: + cssnano-util-get-arguments "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-repeat-style@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" + integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-string@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" + integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== + dependencies: + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-timing-functions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" + integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-unicode@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" + integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-url@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" + integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== + dependencies: + is-absolute-url "^2.0.0" + normalize-url "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-whitespace@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" + integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-ordered-values@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" + integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== + dependencies: + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-reduce-initial@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" + integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + +postcss-reduce-transforms@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" + integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== + dependencies: + cssnano-util-get-match "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4= + +postcss-safe-parser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96" + integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g== + dependencies: + postcss "^7.0.26" + +postcss-sass@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3" + integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg== + dependencies: + gonzales-pe "^4.3.0" + postcss "^7.0.21" + +postcss-scss@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383" + integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA== + dependencies: + postcss "^7.0.6" + +postcss-selector-parser@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" + integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== + dependencies: + dot-prop "^5.2.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^6.0.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@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" + integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + svgo "^1.0.0" + +postcss-syntax@^0.36.2: + version "0.36.2" + resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" + integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== + +postcss-unique-selectors@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" + integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== + dependencies: + alphanum-sort "^1.0.0" + postcss "^7.0.0" + uniqs "^2.0.0" + +postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + +postcss-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@^6.0.9: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + +postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" + integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + +postcss@^8.2.1: + version "8.3.0" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz#b1a713f6172ca427e3f05ef1303de8b65683325f" + integrity sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prepend-http@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +pretty-hrtime@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= + +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== + +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= + +prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + +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= + +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: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +purgecss@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-3.1.3.tgz#26987ec09d12eeadc318e22f6e5a9eb0be094f41" + integrity sha512-hRSLN9mguJ2lzlIQtW4qmPS2kh6oMnA9RxdIYK8sz18QYqd6ePp4GNDl18oWHA1f2v2NEQIh51CO8s/E3YGckQ== + dependencies: + commander "^6.0.0" + glob "^7.0.0" + postcss "^8.2.1" + postcss-selector-parser "^6.0.2" + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.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= + +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== + +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== + +quote-stream@^1.0.1, quote-stream@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2" + integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI= + dependencies: + buffer-equal "0.0.1" + minimist "^1.1.3" + through2 "^2.0.0" + +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" + +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" + +react-dom@^16.13.1: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" + integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-flatpickr@^3.10.5: + version "3.10.7" + resolved "https://registry.yarnpkg.com/react-flatpickr/-/react-flatpickr-3.10.7.tgz#bca6da2a1ccf23bb884881e2a1723073f0bfb391" + integrity sha512-dJ7cZAayefqWJnX4Xe8Piy13oK2h4aeGCH9tz+D2iSNh+kbezUAWVMVCKdTqjsNBqTMS4v0DkfMy2CP2atNCTQ== + dependencies: + flatpickr "^4.6.2" + prop-types "^15.5.10" + +react-flip-move@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-flip-move/-/react-flip-move-3.0.4.tgz#261f66101fbc305f9b7b28959c5cf8236413ca74" + integrity sha512-HyUVv9g3t/BS7Yz9HgrtYSWyRNdR2F81nkj+C5iRY675AwlqCLB5JU9mnZWg0cdVz7IM4iquoyZx70vzZv3Z8Q== + +react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-router-dom@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" + integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA== + dependencies: + "@babel/runtime" "^7.1.2" + history "^4.9.0" + loose-envify "^1.3.1" + prop-types "^15.6.2" + react-router "5.2.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + +react-router@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293" + integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw== + dependencies: + "@babel/runtime" "^7.1.2" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" + loose-envify "^1.3.1" + mini-create-react-context "^0.4.0" + path-to-regexp "^1.7.0" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + +react-transition-group@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" + integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + +react@^16.13.1: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" + integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +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-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^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" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, 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@^3.1.1, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +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.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + +reduce-css-calc@^2.1.6: + version "2.1.8" + resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03" + integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg== + dependencies: + css-unit-converter "^1.1.1" + postcss-value-parser "^3.3.0" + +regenerate-unicode-properties@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== + dependencies: + regenerate "^1.4.0" + +regenerate@^1.4.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + +regenerator-transform@^0.14.2: + version "0.14.5" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== + dependencies: + "@babel/runtime" "^7.8.4" + +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.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + +regexpu-core@^4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" + integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.2.0" + +regjsgen@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== + +regjsparser@^0.6.4: + version "0.6.9" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" + integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== + dependencies: + jsesc "~0.5.0" + +remark-parse@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640" + integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw== + dependencies: + mdast-util-from-markdown "^0.8.0" + +remark-stringify@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894" + integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg== + dependencies: + mdast-util-to-markdown "^0.6.0" + +remark@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425" + integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA== + dependencies: + remark-parse "^9.0.0" + remark-stringify "^9.0.0" + unified "^9.1.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= + +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.0.0, 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= + +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== + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +resolve-cwd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" + integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= + dependencies: + resolve-from "^3.0.0" + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha1-six699nWiBvItuZTM17rywoYh0g= + +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-pathname@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== + +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.1.5, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +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== + +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== + +rgb-regex@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" + integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= + +rgba-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" + integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= + +rimraf@^2.5.4, 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.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.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-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-regex@^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.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +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== + +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +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@^2.6.5, schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +"semver@2 || 3 || 4 || 5", semver@^5.5.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@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.4: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +serialize-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" + +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= + +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-copy@~0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170" + integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA= + +shapefile@0.3: + version "0.3.1" + resolved "https://registry.yarnpkg.com/shapefile/-/shapefile-0.3.1.tgz#9bb9a429bd6086a0cfb03962d14cfdf420ffba12" + integrity sha1-m7mkKb1ghqDPsDli0Uz99CD/uhI= + dependencies: + d3-queue "1" + iconv-lite "0.2" + optimist "0.3" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.2: + 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@^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" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + +source-list-map@^2.0.0: + 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.5.12, source-map-support@~0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + 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.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.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" + 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.9" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + +specificity@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" + integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== + +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" + +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= + +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== + +static-eval@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.1.0.tgz#a16dbe54522d7fa5ef1389129d813fd47b148014" + integrity sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw== + dependencies: + escodegen "^1.11.1" + +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" + +static-module@^2.2.0: + version "2.2.5" + resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf" + integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ== + dependencies: + concat-stream "~1.6.0" + convert-source-map "^1.5.1" + duplexer2 "~0.1.4" + escodegen "~1.9.0" + falafel "^2.1.0" + has "^1.0.1" + magic-string "^0.22.4" + merge-source-map "1.0.4" + object-inspect "~1.4.0" + quote-stream "~1.0.2" + readable-stream "~2.3.3" + shallow-copy "~0.0.1" + static-eval "^2.0.0" + through2 "~2.0.3" + +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== + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.2.0, string-width@^4.2.2: + 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.prototype.matchall@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" + integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + has-symbols "^1.0.1" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.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@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +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-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + +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== + +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI= + +stylehacks@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" + integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +stylelint-config-prettier@^8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz#da9de33da4c56893cbe7e26df239a7374045e14e" + integrity sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A== + +stylelint-config-recommended@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657" + integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ== + +stylelint-config-standard@^20.0.0: + version "20.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d" + integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA== + dependencies: + stylelint-config-recommended "^3.0.0" + +stylelint@^13.8.0: + version "13.13.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c" + integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ== + dependencies: + "@stylelint/postcss-css-in-js" "^0.37.2" + "@stylelint/postcss-markdown" "^0.36.2" + autoprefixer "^9.8.6" + balanced-match "^2.0.0" + chalk "^4.1.1" + cosmiconfig "^7.0.0" + debug "^4.3.1" + execall "^2.0.0" + fast-glob "^3.2.5" + fastest-levenshtein "^1.0.12" + file-entry-cache "^6.0.1" + get-stdin "^8.0.0" + global-modules "^2.0.0" + globby "^11.0.3" + globjoin "^0.1.4" + html-tags "^3.1.0" + ignore "^5.1.8" + import-lazy "^4.0.0" + imurmurhash "^0.1.4" + known-css-properties "^0.21.0" + lodash "^4.17.21" + log-symbols "^4.1.0" + mathml-tag-names "^2.1.3" + meow "^9.0.0" + micromatch "^4.0.4" + normalize-selector "^0.2.0" + postcss "^7.0.35" + postcss-html "^0.36.0" + postcss-less "^3.1.4" + postcss-media-query-parser "^0.2.3" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^4.0.2" + postcss-sass "^0.4.4" + postcss-scss "^2.1.1" + postcss-selector-parser "^6.0.5" + postcss-syntax "^0.36.2" + postcss-value-parser "^4.1.0" + resolve-from "^5.0.0" + slash "^3.0.0" + specificity "^0.4.1" + string-width "^4.2.2" + strip-ansi "^6.0.0" + style-search "^0.1.0" + sugarss "^2.0.0" + svg-tags "^1.0.0" + table "^6.6.0" + v8-compile-cache "^2.3.0" + write-file-atomic "^3.0.3" + +sugarss@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d" + integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ== + dependencies: + postcss "^7.0.2" + +supports-color@^5.3.0, supports-color@^5.4.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@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.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" + +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= + +svgo@^1.0.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== + dependencies: + chalk "^2.4.1" + coa "^2.0.2" + css-select "^2.0.0" + css-select-base-adapter "^0.1.1" + css-tree "1.0.0-alpha.37" + csso "^4.0.2" + js-yaml "^3.13.1" + mkdirp "~0.5.1" + object.values "^1.1.0" + sax "~1.2.4" + stable "^0.1.8" + unquote "~1.1.1" + util.promisify "~1.0.0" + +table@^6.0.9, table@^6.6.0: + 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" + +tailwindcss@2.0.1-compat: + version "2.0.1-compat" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.0.1-compat.tgz#2f57e9e4e848587bfc67ed92ee0de0882c3d0673" + integrity sha512-6lRJGPW7NlM7cemvGeuyrzb/Doj1hScnCMmAVNt8iTmMhIy4n6rUo84RC8m65+AAyOpSybS4b06lb4GI6Rw6Kw== + dependencies: + "@fullhuman/postcss-purgecss" "^3.0.0" + autoprefixer "^9" + bytes "^3.0.0" + chalk "^4.1.0" + color "^3.1.3" + detective "^5.2.0" + didyoumean "^1.2.1" + fs-extra "^9.0.1" + html-tags "^3.1.0" + lodash "^4.17.20" + modern-normalize "^1.0.0" + node-emoji "^1.8.1" + object-hash "^2.0.3" + postcss "^7" + postcss-functions "^3" + postcss-js "^2" + postcss-nested "^4" + postcss-selector-parser "^6.0.4" + postcss-value-parser "^4.1.0" + pretty-hrtime "^1.0.3" + reduce-css-calc "^2.1.6" + resolve "^1.19.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== + +tar@^6.0.2: + version "6.1.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + 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" + +terser-webpack-plugin@^1.4.1: + 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-webpack-plugin@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a" + integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ== + dependencies: + cacache "^15.0.5" + find-cache-dir "^3.3.1" + jest-worker "^26.5.0" + p-limit "^3.0.2" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + terser "^5.3.4" + webpack-sources "^1.4.3" + +terser@^4.1.2: + 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" + +terser@^5.3.4: + version "5.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" + integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + +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, through2@~2.0.3: + 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" + +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= + +tiny-invariant@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" + integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== + +tiny-warning@^1.0.0, tiny-warning@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + +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@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-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" + +topojson@^1.6.19: + version "1.6.27" + resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.27.tgz#adbe33a67e2f1673d338df12644ad20fc20b42ed" + integrity sha1-rb4zpn4vFnPTON8SZErSD8ILQu0= + dependencies: + d3 "3" + d3-geo-projection "0.2" + d3-queue "2" + optimist "0.3" + rw "1" + shapefile "0.3" + +trim-newlines@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" + integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA== + +trough@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== + +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + +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= + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +unbox-primitive@^1.0.0: + 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" + +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== + +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + +unicode-match-property-value-ecmascript@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" + integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== + +unicode-property-aliases-ecmascript@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" + integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== + +unified@^9.1.0: + version "9.2.1" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3" + integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.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" + +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= + +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-find-all-after@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6" + integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ== + dependencies: + unist-util-is "^4.0.0" + +unist-util-is@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" + integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== + +unist-util-stringify-position@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== + dependencies: + "@types/unist" "^2.0.2" + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +unquote@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= + +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-search-params-polyfill@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-8.1.1.tgz#9e69e4dba300a71ae7ad3cead62c7717fd99329f" + integrity sha512-KmkCs6SjE6t4ihrfW9JelAPQIIIFbJweaaSLTh/4AO+c58JlDcb+GbdPt8yr5lRcFg4rPswRFRRhBGpWwh0K/Q== + +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== + +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.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" + +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" + +v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +value-equal@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== + +vendors@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== + +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + +vfile@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + +vlq@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" + integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== + +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.6.0: + 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" + +webpack-cli@^3.3.12: + version "3.3.12" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" + integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag== + dependencies: + chalk "^2.4.2" + cross-spawn "^6.0.5" + enhanced-resolve "^4.1.1" + findup-sync "^3.0.0" + global-modules "^2.0.0" + import-local "^2.0.0" + interpret "^1.4.0" + loader-utils "^1.4.0" + supports-color "^6.1.0" + v8-compile-cache "^2.1.1" + yargs "^13.3.2" + +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@4.39.2: + version "4.39.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa" + integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/wasm-edit" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.1.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.1" + 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.1" + watchpack "^1.6.0" + webpack-sources "^1.4.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-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@^1.2.14, which@^1.2.9, which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +word-wrap@^1.2.3, word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + +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" + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^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== + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs-parser@^20.2.3: + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + +yargs@^13.3.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" + +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== + +zwitch@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== diff --git a/pkgs/servers/web-apps/plausible/yarn.nix b/pkgs/servers/web-apps/plausible/yarn.nix new file mode 100644 index 000000000000..a578b3e8353e --- /dev/null +++ b/pkgs/servers/web-apps/plausible/yarn.nix @@ -0,0 +1,8278 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + }; + } + { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + }; + } + { + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; + }; + } + { + name = "_babel_core___core_7.14.3.tgz"; + path = fetchurl { + name = "_babel_core___core_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; + sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; + }; + } + { + name = "_babel_generator___generator_7.14.3.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; + sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz"; + sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a"; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.3.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz"; + sha1 = "149aa6d78c016e318c43e2409a0ae9c136a86688"; + }; + } + { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.1.tgz"; + path = fetchurl { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.1.tgz"; + sha1 = "e6f5f4a6edc3722152c21359190de67fc6cf664d"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha1 = "17b5c59ff473d9f956f40ef570cf3a76ca12657f"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; + sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; + sha1 = "1b1651249e94b51f8f0d33439843e33e39775b30"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; + sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; + sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; + }; + } + { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + }; + } + { + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; + }; + } + { + name = "_babel_helpers___helpers_7.14.0.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; + sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; + }; + } + { + name = "_babel_highlight___highlight_7.14.0.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + }; + } + { + name = "_babel_parser___parser_7.14.3.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; + sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; + }; + } + { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; + path = fetchurl { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; + sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; + sha1 = "3a2085abbf5d5f962d480dbc81347385ed62eb1e"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; + }; + } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; + sha1 = "5a527e2cae4a4753119c3a3e7f64ecae8ccf1360"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; + sha1 = "01ebabd7c381cff231fa43e302939a9de5be9d9f"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; + sha1 = "62542f94aa9ce8f6dba79eec698af22112253791"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; + sha1 = "830b4e2426a782e8b2878fbfe2cba85b70cbf98c"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; + sha1 = "222348c080a1678e0e74ea63fe76f275882d1fd7"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; + sha1 = "425b11dc62fc26939a2ab42cbba680bdf5734546"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; + sha1 = "82b4cc06571143faf50626104b335dd71baa4f9e"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz"; + sha1 = "e17d418f81cc103fedd4ce037e181c8056225abc"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; + sha1 = "150d4e58e525b16a9a1431bd5326c4eed870d717"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; + sha1 = "df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; + }; + } + { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; + sha1 = "b1a1f2030586b9d3489cc26179d2eb5883277636"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; + }; + } + { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; + sha1 = "8e3d674b0613e67975ceac2776c97b60cafc5c9c"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + }; + } + { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; + sha1 = "762a4babec61176fec6c88480dec40372b140c0b"; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz"; + sha1 = "761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz"; + sha1 = "3f1196c5709f064c252ad056207d87b7aeb2d03d"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; + sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; + sha1 = "6622806fe1a7c07a1388444222ef9535f2ca17b0"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; + sha1 = "52bc199cb581e0992edba0f0f80356467587f161"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; + sha1 = "2f8179d1bbc9263665ce4a65f305526b2ea8ac34"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; + sha1 = "e4290f72e0e9e831000d066427c4667098decc31"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz"; + sha1 = "2e854544d42ab3bb9c21f84e153d62e800fbd593"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; + sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.14.3.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz"; + sha1 = "0e26597805cf0862da735f264550933c38babb66"; + }; + } + { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; + sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; + sha1 = "e5eb28945bf8b6563e7f818945f966a8d2997f39"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; + }; + } + { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; + }; + } + { + name = "_babel_preset_env___preset_env_7.14.2.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz"; + sha1 = "e80612965da73579c84ad2f963c2359c71524ed5"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; + }; + } + { + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; + sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; + sha1 = "6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66"; + }; + } + { + name = "_babel_runtime___runtime_7.14.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; + sha1 = "46794bc20b612c5f75e62dd071e24dfd95f1cbe6"; + }; + } + { + name = "_babel_template___template_7.12.13.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + }; + } + { + name = "_babel_traverse___traverse_7.14.2.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; + sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; + }; + } + { + name = "_babel_types___types_7.14.2.tgz"; + path = fetchurl { + name = "_babel_types___types_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz"; + sha1 = "4208ae003107ef8a057ea8333e56eb64d2f6a2c3"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; + sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + }; + } + { + name = "_fullhuman_postcss_purgecss___postcss_purgecss_3.1.3.tgz"; + path = fetchurl { + name = "_fullhuman_postcss_purgecss___postcss_purgecss_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-3.1.3.tgz"; + sha1 = "47af7b87c9bfb3de4bc94a38f875b928fffdf339"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; + }; + } + { + name = "_npmcli_move_file___move_file_1.1.2.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"; + sha1 = "1a82c3e372f7cae9253eb66d72543d6b8685c674"; + }; + } + { + name = "_stylelint_postcss_css_in_js___postcss_css_in_js_0.37.2.tgz"; + path = fetchurl { + name = "_stylelint_postcss_css_in_js___postcss_css_in_js_0.37.2.tgz"; + url = "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz"; + sha1 = "7e5a84ad181f4234a2480803422a47b8749af3d2"; + }; + } + { + name = "_stylelint_postcss_markdown___postcss_markdown_0.36.2.tgz"; + path = fetchurl { + name = "_stylelint_postcss_markdown___postcss_markdown_0.36.2.tgz"; + url = "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"; + sha1 = "0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"; + }; + } + { + name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.0.tgz"; + path = fetchurl { + name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.0.tgz"; + sha1 = "bebd32b7d0756b695294d4db1ae658796ff72a2c"; + }; + } + { + name = "_tailwindcss_forms___forms_0.2.1.tgz"; + path = fetchurl { + name = "_tailwindcss_forms___forms_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.2.1.tgz"; + sha1 = "3244b185854fae1a7cbe8d2456314d8b2d98cf43"; + }; + } + { + name = "_tailwindcss_typography___typography_0.3.1.tgz"; + path = fetchurl { + name = "_tailwindcss_typography___typography_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.3.1.tgz"; + sha1 = "253ce580c8e06b6163d9a288edd24f25e1d0dfee"; + }; + } + { + name = "_types_d3___d3_3.5.38.tgz"; + path = fetchurl { + name = "_types_d3___d3_3.5.38.tgz"; + url = "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.38.tgz"; + sha1 = "76f8f2e9159ae562965b2fa0e6fbee1aa643a1bc"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + } + { + name = "_types_mdast___mdast_3.0.3.tgz"; + path = fetchurl { + name = "_types_mdast___mdast_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz"; + sha1 = "2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"; + }; + } + { + name = "_types_minimist___minimist_1.2.1.tgz"; + path = fetchurl { + name = "_types_minimist___minimist_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz"; + sha1 = "283f669ff76d7b8260df8ab7a4262cc83d988256"; + }; + } + { + name = "_types_node___node_15.6.0.tgz"; + path = fetchurl { + name = "_types_node___node_15.6.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz"; + sha1 = "f0ddca5a61e52627c9dcb771a6039d44694597bc"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_q___q_1.5.4.tgz"; + path = fetchurl { + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; + }; + } + { + name = "_types_unist___unist_2.0.3.tgz"; + path = fetchurl { + name = "_types_unist___unist_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; + sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz"; + sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; + sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; + sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; + sha1 = "fea93e429863dd5e4338555f42292385a653f204"; + }; + } + { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; + sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e"; + }; + } + { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; + sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452"; + }; + } + { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; + sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; + sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; + sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; + sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; + sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; + sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; + sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; + sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; + sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; + sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d"; + }; + } + { + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; + sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; + sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "abortcontroller_polyfill___abortcontroller_polyfill_1.7.3.tgz"; + path = fetchurl { + name = "abortcontroller_polyfill___abortcontroller_polyfill_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha1 = "1b5b487bd6436b5b764fd52a612509702c3144b5"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + }; + } + { + name = "acorn_node___acorn_node_1.8.2.tgz"; + path = fetchurl { + name = "acorn_node___acorn_node_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; + sha1 = "114c95d64539e53dede23de8b9d96df7c7ae2af8"; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } + { + name = "acorn___acorn_6.4.2.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + }; + } + { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + path = fetchurl { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + }; + } + { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + path = fetchurl { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + }; + } + { + name = "alpinejs___alpinejs_2.8.2.tgz"; + path = fetchurl { + name = "alpinejs___alpinejs_2.8.2.tgz"; + url = "https://registry.yarnpkg.com/alpinejs/-/alpinejs-2.8.2.tgz"; + sha1 = "b14ec21ae3cd78dcee4aed0a78ed0f01b676dac4"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_2.0.0.tgz"; + path = fetchurl { + name = "anymatch___anymatch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; + sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + }; + } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "aria_query___aria_query_4.2.2.tgz"; + path = fetchurl { + name = "aria_query___aria_query_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; + sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_includes___array_includes_3.1.3.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; + sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; + }; + } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; + sha1 = "94cfd47cc1556ec0747d97f7c7738c58122004c9"; + }; + } + { + name = "arrify___arrify_1.0.1.tgz"; + path = fetchurl { + name = "arrify___arrify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + } + { + name = "asn1.js___asn1.js_5.4.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; + }; + } + { + name = "assert___assert_1.5.0.tgz"; + path = fetchurl { + name = "assert___assert_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; + sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + path = fetchurl { + name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; + sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "at_least_node___at_least_node_1.0.0.tgz"; + path = fetchurl { + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + path = fetchurl { + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; + }; + } + { + name = "axe_core___axe_core_4.2.1.tgz"; + path = fetchurl { + name = "axe_core___axe_core_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.1.tgz"; + sha1 = "2e50bcf10ee5b819014f6e342e41e45096239e34"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; + }; + } + { + name = "babel_loader___babel_loader_8.2.2.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; + sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81"; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; + }; + } + { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.1.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.1.tgz"; + sha1 = "ae2cf6d6f1aa7c0edcf04a25180e8856a6d1184f"; + }; + } + { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.1.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.1.tgz"; + sha1 = "786f40218040030f0edecfd48e6e59f1ee9bef53"; + }; + } + { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.1.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.1.tgz"; + sha1 = "ca9595d7d5f3afefec2d83126148b90db751a091"; + }; + } + { + name = "bail___bail_1.0.5.tgz"; + path = fetchurl { + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "balanced_match___balanced_match_2.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz"; + sha1 = "dc70f920d78db8b858535795867bf48f820633d9"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "bn.js___bn.js_4.12.0.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + }; + } + { + name = "bn.js___bn.js_5.2.0.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; + sha1 = "358860674396c6997771a9d051fcc1b57d4ae002"; + }; + } + { + name = "boolbase___boolbase_1.0.0.tgz"; + path = fetchurl { + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "brfs___brfs_1.6.1.tgz"; + path = fetchurl { + name = "brfs___brfs_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz"; + sha1 = "b78ce2336d818e25eea04a0947cba6d4fb8849c3"; + }; + } + { + name = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + } + { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha1 = "326734642f403dabc3003209853bb70ad428ef48"; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; + }; + } + { + name = "browserify_des___browserify_des_1.0.2.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; + sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c"; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + path = fetchurl { + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha1 = "b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"; + }; + } + { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + }; + } + { + name = "browserslist___browserslist_4.16.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + }; + } + { + name = "buffer_equal___buffer_equal_0.0.1.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + } + { + name = "buffer___buffer_4.9.2.tgz"; + path = fetchurl { + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cacache___cacache_12.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_15.1.0.tgz"; + path = fetchurl { + name = "cacache___cacache_15.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz"; + sha1 = "164c2f857ee606e4cc793c63018fefd0ea5eba7b"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase_css___camelcase_css_2.0.1.tgz"; + path = fetchurl { + name = "camelcase_css___camelcase_css_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz"; + sha1 = "ee978f6947914cc30c6b44741b6ed1df7f043fd5"; + }; + } + { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + path = fetchurl { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha1 = "5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + path = fetchurl { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; + sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + path = fetchurl { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; + }; + } + { + name = "character_entities___character_entities_1.2.4.tgz"; + path = fetchurl { + name = "character_entities___character_entities_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; + sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; + }; + } + { + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + path = fetchurl { + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; + }; + } + { + name = "chart.js___chart.js_2.9.4.tgz"; + path = fetchurl { + name = "chart.js___chart.js_2.9.4.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz"; + sha1 = "0827f9563faffb2dc5c06562f8eb10337d5b9684"; + }; + } + { + name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; + path = fetchurl { + name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; + sha1 = "1df096621c0e70720a64f4135ea171d051402f71"; + }; + } + { + name = "chartjs_color___chartjs_color_2.4.1.tgz"; + path = fetchurl { + name = "chartjs_color___chartjs_color_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz"; + sha1 = "6118bba202fe1ea79dd7f7c0f9da93467296c3b0"; + }; + } + { + name = "chokidar___chokidar_2.1.8.tgz"; + path = fetchurl { + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + path = fetchurl { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz"; + sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f"; + }; + } + { + name = "coa___coa_2.0.2.tgz"; + path = fetchurl { + name = "coa___coa_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; + sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "color_string___color_string_1.5.5.tgz"; + path = fetchurl { + name = "color_string___color_string_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; + sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; + }; + } + { + name = "color___color_3.1.3.tgz"; + path = fetchurl { + name = "color___color_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz"; + sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e"; + }; + } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_6.2.1.tgz"; + path = fetchurl { + name = "commander___commander_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; + sha1 = "0792eb682dfbc325999bb2b84fddddba110ac73c"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; + path = fetchurl { + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz"; + sha1 = "30d1e7f3d1b882b25ec4933d1d1adac353d20a59"; + }; + } + { + name = "console_browserify___console_browserify_1.2.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_6.4.1.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz"; + sha1 = "138cd9b436dbca0a6d071720d5414848992ec47e"; + }; + } + { + name = "core_js_compat___core_js_compat_3.12.1.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.12.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz"; + sha1 = "2c302c4708505fa7072b0adb5156d26f7801a18b"; + }; + } + { + name = "core_js_pure___core_js_pure_3.12.1.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.12.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz"; + sha1 = "934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + }; + } + { + name = "css_color_names___css_color_names_0.0.4.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + }; + } + { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + path = fetchurl { + name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; + sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; + }; + } + { + name = "css_loader___css_loader_3.6.0.tgz"; + path = fetchurl { + name = "css_loader___css_loader_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz"; + sha1 = "2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"; + }; + } + { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + path = fetchurl { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; + }; + } + { + name = "css_select___css_select_2.1.0.tgz"; + path = fetchurl { + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; + }; + } + { + name = "css_tree___css_tree_1.1.3.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; + sha1 = "eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"; + }; + } + { + name = "css_unit_converter___css_unit_converter_1.1.2.tgz"; + path = fetchurl { + name = "css_unit_converter___css_unit_converter_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz"; + sha1 = "4c77f5a1954e6dbff60695ecb214e3270436ab21"; + }; + } + { + name = "css_what___css_what_3.4.2.tgz"; + path = fetchurl { + name = "css_what___css_what_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; + sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; + path = fetchurl { + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; + }; + } + { + name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; + sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + }; + } + { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + path = fetchurl { + name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; + sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + }; + } + { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; + sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; + }; + } + { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + path = fetchurl { + name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; + sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; + }; + } + { + name = "cssnano___cssnano_4.1.11.tgz"; + path = fetchurl { + name = "cssnano___cssnano_4.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; + sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; + }; + } + { + name = "csso___csso_4.2.0.tgz"; + path = fetchurl { + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha1 = "ea3a561346e8dc9f546d6febedd50187cf389529"; + }; + } + { + name = "csstype___csstype_3.0.8.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } + { + name = "d3_geo_projection___d3_geo_projection_0.2.16.tgz"; + path = fetchurl { + name = "d3_geo_projection___d3_geo_projection_0.2.16.tgz"; + url = "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz"; + sha1 = "4994ecd1033ddb1533b6c4c5528a1c81dcc29427"; + }; + } + { + name = "d3_queue___d3_queue_1.2.3.tgz"; + path = fetchurl { + name = "d3_queue___d3_queue_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/d3-queue/-/d3-queue-1.2.3.tgz"; + sha1 = "143a701cfa65fe021292f321c10d14e98abd491b"; + }; + } + { + name = "d3_queue___d3_queue_2.0.3.tgz"; + path = fetchurl { + name = "d3_queue___d3_queue_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-queue/-/d3-queue-2.0.3.tgz"; + sha1 = "07fbda3acae5358a9c5299aaf880adf0953ed2c2"; + }; + } + { + name = "d3___d3_3.5.17.tgz"; + path = fetchurl { + name = "d3___d3_3.5.17.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz"; + sha1 = "bc46748004378b21a360c9fc7cf5231790762fb8"; + }; + } + { + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + path = fetchurl { + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; + sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; + }; + } + { + name = "datamaps___datamaps_0.5.9.tgz"; + path = fetchurl { + name = "datamaps___datamaps_0.5.9.tgz"; + url = "https://registry.yarnpkg.com/datamaps/-/datamaps-0.5.9.tgz"; + sha1 = "2a775473aaab29b55025208b2245e840ecfd4fe1"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_3.2.7.tgz"; + path = fetchurl { + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + path = fetchurl { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "defined___defined_1.0.0.tgz"; + path = fetchurl { + name = "defined___defined_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + } + { + name = "des.js___des.js_1.0.1.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "detective___detective_5.2.0.tgz"; + path = fetchurl { + name = "detective___detective_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz"; + sha1 = "feb2a77e85b904ecdea459ad897cc90a99bd2a7b"; + }; + } + { + name = "didyoumean___didyoumean_1.2.1.tgz"; + path = fetchurl { + name = "didyoumean___didyoumean_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz"; + sha1 = "e92edfdada6537d484d73c0172fd1eba0c4976ff"; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dom_helpers___dom_helpers_5.2.1.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz"; + sha1 = "d9400536b2bf8225ad98fe052e029451ac40e902"; + }; + } + { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; + }; + } + { + name = "domain_browser___domain_browser_1.2.0.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; + sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; + }; + } + { + name = "domelementtype___domelementtype_1.3.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; + }; + } + { + name = "domelementtype___domelementtype_2.2.0.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; + }; + } + { + name = "domhandler___domhandler_2.4.2.tgz"; + path = fetchurl { + name = "domhandler___domhandler_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz"; + sha1 = "8805097e933d65e85546f726d60f5eb88b44f803"; + }; + } + { + name = "domutils___domutils_1.7.0.tgz"; + path = fetchurl { + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + }; + } + { + name = "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 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.735.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.735.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz"; + sha1 = "fa1a8660f2790662291cb2136f0e446a444cdfdc"; + }; + } + { + name = "elliptic___elliptic_6.5.4.tgz"; + path = fetchurl { + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha1 = "840c8803b0d8047f4ff0cf963176b32d4ef3ed72"; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { + name = "entities___entities_1.1.2.tgz"; + path = fetchurl { + name = "entities___entities_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz"; + sha1 = "bdfa735299664dfafd34529ed4f8522a275fea56"; + }; + } + { + name = "entities___entities_2.2.0.tgz"; + path = fetchurl { + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; + }; + } + { + name = "errno___errno_0.1.8.tgz"; + path = fetchurl { + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; + sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "escodegen___escodegen_1.9.1.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz"; + sha1 = "dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"; + }; + } + { + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz"; + path = fetchurl { + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz"; + sha1 = "8a2eb38455dc5a312550193b319cdaeef042cd1e"; + }; + } + { + name = "eslint_config_airbnb___eslint_config_airbnb_18.2.1.tgz"; + path = fetchurl { + name = "eslint_config_airbnb___eslint_config_airbnb_18.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz"; + sha1 = "b7fe2b42f9f8173e825b73c8014b592e449c98d9"; + }; + } + { + name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz"; + sha1 = "f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"; + }; + } + { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + path = fetchurl { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; + }; + } + { + name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; + path = fetchurl { + name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz"; + sha1 = "b51be1e473dd0de1c5ea638e22429c2490ea8233"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.23.3.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.23.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.3.tgz"; + sha1 = "8a1b073289fff03c4af0f04b6df956b7d463e191"; + }; + } + { + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + path = fetchurl { + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; + sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; + }; + } + { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; + path = fetchurl { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; + sha1 = "cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"; + }; + } + { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + path = fetchurl { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; + sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; + sha1 = "2d2291b0f95c03728b55869f01102290e792d494"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + }; + } + { + name = "eslint___eslint_7.27.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.27.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; + sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } + { + name = "esprima___esprima_3.1.3.tgz"; + path = fetchurl { + name = "esprima___esprima_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + }; + } + { + name = "execall___execall_2.0.0.tgz"; + path = fetchurl { + name = "execall___execall_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz"; + sha1 = "16a06b5fe5099df7d00be5d9c06eecded1663b45"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "falafel___falafel_2.2.4.tgz"; + path = fetchurl { + name = "falafel___falafel_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/falafel/-/falafel-2.2.4.tgz"; + sha1 = "b5d86c060c2412a43166243cb1bce44d1abd2819"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_diff___fast_diff_1.2.0.tgz"; + path = fetchurl { + name = "fast_diff___fast_diff_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; + sha1 = "73ee11982d86caaf7959828d519cfe927fac5f03"; + }; + } + { + name = "fast_glob___fast_glob_3.2.5.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; + sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha1 = "9990f7d3a88cc5a9ffd1f1745745251700d497e2"; + }; + } + { + name = "fastq___fastq_1.11.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; + sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; + }; + } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + }; + } + { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + }; + } + { + name = "find_up___find_up_2.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "findup_sync___findup_sync_3.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; + sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } + { + name = "flatpickr___flatpickr_4.6.9.tgz"; + path = fetchurl { + name = "flatpickr___flatpickr_4.6.9.tgz"; + url = "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz"; + sha1 = "9a13383e8a6814bda5d232eae3fcdccb97dc1499"; + }; + } + { + name = "flatted___flatted_3.1.1.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "foreach___foreach_2.0.5.tgz"; + path = fetchurl { + name = "foreach___foreach_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_extra___fs_extra_9.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } + { + name = "get_stdin___get_stdin_8.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz"; + sha1 = "cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "glob_parent___glob_parent_3.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "global_prefix___global_prefix_3.0.0.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; + sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { + name = "globals___globals_13.8.0.tgz"; + path = fetchurl { + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } + { + name = "globby___globby_11.0.3.tgz"; + path = fetchurl { + name = "globby___globby_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; + sha1 = "9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"; + }; + } + { + name = "globjoin___globjoin_0.1.4.tgz"; + path = fetchurl { + name = "globjoin___globjoin_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz"; + sha1 = "2f4494ac8919e3767c5cbb691e9f463324285d43"; + }; + } + { + name = "gonzales_pe___gonzales_pe_4.3.0.tgz"; + path = fetchurl { + name = "gonzales_pe___gonzales_pe_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz"; + sha1 = "fe9dec5f3c557eead09ff868c65826be54d067b3"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + }; + } + { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + path = fetchurl { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha1 = "1c6eda5c1685c63942766d79bb40ae773cecd883"; + }; + } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hash_base___hash_base_3.1.0.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; + }; + } + { + name = "hash.js___hash.js_1.1.7.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; + sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + }; + } + { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + path = fetchurl { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; + }; + } + { + name = "history___history_4.10.1.tgz"; + path = fetchurl { + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; + }; + } + { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + }; + } + { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + }; + } + { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + }; + } + { + name = "html_tags___html_tags_3.1.0.tgz"; + path = fetchurl { + name = "html_tags___html_tags_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz"; + sha1 = "7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"; + }; + } + { + name = "htmlparser2___htmlparser2_3.10.1.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_3.10.1.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f"; + }; + } + { + name = "https_browserify___https_browserify_1.0.0.tgz"; + path = fetchurl { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + } + { + name = "iconv_lite___iconv_lite_0.2.11.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.2.11.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz"; + sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; + }; + } + { + name = "icss_utils___icss_utils_4.1.1.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz"; + sha1 = "21170b53789ee27447c2f47dd683081403f9a467"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "iframe_resizer___iframe_resizer_4.3.2.tgz"; + path = fetchurl { + name = "iframe_resizer___iframe_resizer_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.2.tgz"; + sha1 = "42dd88345d18b9e377b6044dddb98c664ab0ce6b"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { + name = "import_lazy___import_lazy_4.0.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz"; + sha1 = "e8eb627483a0a43da3c03f3e35548be5cb0cc153"; + }; + } + { + name = "import_local___import_local_2.0.0.tgz"; + path = fetchurl { + name = "import_local___import_local_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; + sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { + name = "indexes_of___indexes_of_1.0.1.tgz"; + path = fetchurl { + name = "indexes_of___indexes_of_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "internal_slot___internal_slot_1.0.3.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + }; + } + { + name = "interpret___interpret_1.4.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; + }; + } + { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; + sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + path = fetchurl { + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; + }; + } + { + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + path = fetchurl { + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + }; + } + { + name = "is_bigint___is_bigint_1.0.2.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + path = fetchurl { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_buffer___is_buffer_2.0.5.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz"; + sha1 = "ebc252e400d22ff8d77fa09888821a24a658c191"; + }; + } + { + name = "is_callable___is_callable_1.2.3.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; + }; + } + { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + path = fetchurl { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + }; + } + { + name = "is_core_module___is_core_module_2.4.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; + sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.4.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; + sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5"; + }; + } + { + name = "is_decimal___is_decimal_1.0.4.tgz"; + path = fetchurl { + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_3.1.0.tgz"; + path = fetchurl { + name = "is_glob___is_glob_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + path = fetchurl { + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + }; + } + { + name = "is_number_object___is_number_object_1.0.5.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_regex___is_regex_1.1.3.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; + }; + } + { + name = "is_regexp___is_regexp_2.1.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz"; + sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d"; + }; + } + { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + path = fetchurl { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; + }; + } + { + name = "is_string___is_string_1.0.6.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; + }; + } + { + name = "is_symbol___is_symbol_1.0.4.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + path = fetchurl { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha1 = "3f26c76a809593b52bfa2ecb5710ed2779b522a7"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "is_wsl___is_wsl_1.1.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isarray___isarray_2.0.5.tgz"; + path = fetchurl { + name = "isarray___isarray_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz"; + sha1 = "8af1e4c1221244cc62459faf38940d4e644a5723"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "jest_worker___jest_worker_26.6.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; + sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + name = "jsonfile___jsonfile_6.1.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + }; + } + { + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; + sha1 = "41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } + { + name = "known_css_properties___known_css_properties_0.21.0.tgz"; + path = fetchurl { + name = "known_css_properties___known_css_properties_0.21.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz"; + sha1 = "15fbd0bbb83447f3ce09d8af247ed47c68ede80d"; + }; + } + { + name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; + path = fetchurl { + name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; + url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz"; + sha1 = "04ac218bea46f04cb039084602c6da9e788dd45a"; + }; + } + { + name = "language_tags___language_tags_1.0.5.tgz"; + path = fetchurl { + name = "language_tags___language_tags_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; + sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; + }; + } + { + name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz"; + path = fetchurl { + name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz"; + sha1 = "9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "load_json_file___load_json_file_4.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + } + { + name = "loader_runner___loader_runner_2.4.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; + sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; + }; + } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { + name = "locate_path___locate_path_2.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } + { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { + name = "lodash.toarray___lodash.toarray_4.4.0.tgz"; + path = fetchurl { + name = "lodash.toarray___lodash.toarray_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; + sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "log_symbols___log_symbols_4.1.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha1 = "3fbdbb95b4683ac9fc785111e792e558d4abd503"; + }; + } + { + name = "longest_streak___longest_streak_2.0.4.tgz"; + path = fetchurl { + name = "longest_streak___longest_streak_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz"; + sha1 = "b8599957da5b5dab64dee3fe316fa774597d90e4"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "magic_string___magic_string_0.22.5.tgz"; + path = fetchurl { + name = "magic_string___magic_string_0.22.5.tgz"; + url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz"; + sha1 = "8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "mamacro___mamacro_0.0.3.tgz"; + path = fetchurl { + name = "mamacro___mamacro_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz"; + sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_obj___map_obj_1.0.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + } + { + name = "map_obj___map_obj_4.2.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz"; + sha1 = "e4ea399dbc979ae735c83c863dd31bdf364277b7"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; + path = fetchurl { + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; + sha1 = "4ddadd67308e780cf16a47685878ee27b736a0a3"; + }; + } + { + name = "md5.js___md5.js_1.3.5.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; + sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; + }; + } + { + name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; + path = fetchurl { + name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha1 = "d1ef2ca42bc377ecb0463a987910dae89bd9a28c"; + }; + } + { + name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; + path = fetchurl { + name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; + sha1 = "b33f67ca820d69e6cc527a93d4039249b504bebe"; + }; + } + { + name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; + path = fetchurl { + name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; + sha1 = "b8cfe6a713e1091cb5b728fc48885a4767f8b97b"; + }; + } + { + name = "mdn_data___mdn_data_2.0.14.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.14.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; + sha1 = "7113fc4281917d63ce29b43446f701e68c25ba50"; + }; + } + { + name = "mdn_data___mdn_data_2.0.4.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; + sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; + }; + } + { + name = "memory_fs___memory_fs_0.4.1.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + } + { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } + { + name = "meow___meow_9.0.0.tgz"; + path = fetchurl { + name = "meow___meow_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; + sha1 = "cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"; + }; + } + { + name = "merge_source_map___merge_source_map_1.0.4.tgz"; + path = fetchurl { + name = "merge_source_map___merge_source_map_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz"; + sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "micromark___micromark_2.11.4.tgz"; + path = fetchurl { + name = "micromark___micromark_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz"; + sha1 = "d13436138eea826383e822449c9a5c50ee44665a"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + }; + } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + }; + } + { + name = "mini_create_react_context___mini_create_react_context_0.4.1.tgz"; + path = fetchurl { + name = "mini_create_react_context___mini_create_react_context_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz"; + sha1 = "072171561bfdc922da08a60c2197a497cc2d1d5e"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz"; + sha1 = "a875e169beb27c88af77dd962771c9eedc3da161"; + }; + } + { + name = "mini_svg_data_uri___mini_svg_data_uri_1.3.3.tgz"; + path = fetchurl { + name = "mini_svg_data_uri___mini_svg_data_uri_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.3.3.tgz"; + sha1 = "91d2c09f45e056e5e1043340b8b37ba7b50f4fac"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist_options___minimist_options_4.1.0.tgz"; + path = fetchurl { + name = "minimist_options___minimist_options_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; + sha1 = "c0655713c53a8a2ebd77ffa247d342c40f010619"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + }; + } + { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "modern_normalize___modern_normalize_1.1.0.tgz"; + path = fetchurl { + name = "modern_normalize___modern_normalize_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz"; + sha1 = "da8e80140d9221426bd4f725c6e11283d34f90b7"; + }; + } + { + name = "moment___moment_2.29.1.tgz"; + path = fetchurl { + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "nan___nan_2.14.2.tgz"; + path = fetchurl { + name = "nan___nan_2.14.2.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; + sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + }; + } + { + name = "nanoid___nanoid_3.1.23.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_emoji___node_emoji_1.10.0.tgz"; + path = fetchurl { + name = "node_emoji___node_emoji_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz"; + sha1 = "8886abd25d9c7bb61802a658523d1f8d2a89b2da"; + }; + } + { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + path = fetchurl { + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; + }; + } + { + name = "node_releases___node_releases_1.1.72.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.72.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; + sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; + sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_range___normalize_range_0.1.2.tgz"; + path = fetchurl { + name = "normalize_range___normalize_range_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + } + { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + path = fetchurl { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz"; + sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03"; + }; + } + { + name = "normalize_url___normalize_url_1.9.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + } + { + name = "normalize_url___normalize_url_3.3.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; + sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; + }; + } + { + name = "nth_check___nth_check_1.0.2.tgz"; + path = fetchurl { + name = "nth_check___nth_check_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; + sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; + }; + } + { + name = "num2fraction___num2fraction_1.2.2.tgz"; + path = fetchurl { + name = "num2fraction___num2fraction_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_hash___object_hash_2.1.1.tgz"; + path = fetchurl { + name = "object_hash___object_hash_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz"; + sha1 = "9447d0279b4fcf80cff3259bf66a1dc73afabe09"; + }; + } + { + name = "object_inspect___object_inspect_1.10.3.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; + sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; + }; + } + { + name = "object_inspect___object_inspect_1.4.1.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz"; + sha1 = "37ffb10e71adaf3748d05f713b4c9452f402cbc4"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + }; + } + { + name = "object.entries___object.entries_1.1.3.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; + sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; + }; + } + { + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + path = fetchurl { + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; + sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha1 = "1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "object.values___object.values_1.1.3.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; + sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "optimist___optimist_0.3.7.tgz"; + path = fetchurl { + name = "optimist___optimist_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + } + { + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.6.tgz"; + path = fetchurl { + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.6.tgz"; + url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.6.tgz"; + sha1 = "abad0c6c11a632201794f75ddba3ce13e32ae80e"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + } + { + name = "p_limit___p_limit_1.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + }; + } + { + name = "p_locate___p_locate_2.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + }; + } + { + name = "p_try___p_try_1.0.0.tgz"; + path = fetchurl { + name = "p_try___p_try_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "pako___pako_1.0.11.tgz"; + path = fetchurl { + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; + }; + } + { + name = "parse_entities___parse_entities_2.0.0.tgz"; + path = fetchurl { + name = "parse_entities___parse_entities_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz"; + sha1 = "53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_browserify___path_browserify_0.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; + sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; + }; + } + { + name = "path_dirname___path_dirname_1.0.2.tgz"; + path = fetchurl { + name = "path_dirname___path_dirname_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; + }; + } + { + name = "path_type___path_type_3.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha1 = "dd822aa0887580e52f1a039dc3eda108efae3075"; + }; + } + + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_up___pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "postcss_calc___postcss_calc_7.0.5.tgz"; + path = fetchurl { + name = "postcss_calc___postcss_calc_7.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e"; + }; + } + { + name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + path = fetchurl { + name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; + sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; + }; + } + { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + path = fetchurl { + name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; + sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; + }; + } + { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; + sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; + }; + } + { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + path = fetchurl { + name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; + sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; + }; + } + { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; + sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; + }; + } + { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; + sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; + }; + } + { + name = "postcss_functions___postcss_functions_3.0.0.tgz"; + path = fetchurl { + name = "postcss_functions___postcss_functions_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz"; + sha1 = "0e94d01444700a481de20de4d55fb2640564250e"; + }; + } + { + name = "postcss_html___postcss_html_0.36.0.tgz"; + path = fetchurl { + name = "postcss_html___postcss_html_0.36.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz"; + sha1 = "b40913f94eaacc2453fd30a1327ad6ee1f88b204"; + }; + } + { + name = "postcss_js___postcss_js_2.0.3.tgz"; + path = fetchurl { + name = "postcss_js___postcss_js_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz"; + sha1 = "a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9"; + }; + } + { + name = "postcss_less___postcss_less_3.1.4.tgz"; + path = fetchurl { + name = "postcss_less___postcss_less_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz"; + sha1 = "369f58642b5928ef898ffbc1a6e93c958304c5ad"; + }; + } + { + name = "postcss_loader___postcss_loader_4.3.0.tgz"; + path = fetchurl { + name = "postcss_loader___postcss_loader_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz"; + sha1 = "2c4de9657cd4f07af5ab42bd60a673004da1b8cc"; + }; + } + { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + path = fetchurl { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; + sha1 = "27b39c6f4d94f81b1a73b8f76351c609e5cef244"; + }; + } + { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + path = fetchurl { + name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; + sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; + }; + } + { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + path = fetchurl { + name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; + sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; + }; + } + { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; + sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; + }; + } + { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; + sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; + }; + } + { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; + sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; + }; + } + { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + path = fetchurl { + name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; + sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; + sha1 = "818719a1ae1da325f9832446b01136eeb493cd7e"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10"; + }; + } + { + name = "postcss_nested___postcss_nested_4.2.3.tgz"; + path = fetchurl { + name = "postcss_nested___postcss_nested_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz"; + sha1 = "c6f255b0a720549776d220d00c4b70cd244136f6"; + }; + } + { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; + sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; + }; + } + { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; + sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; + }; + } + { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; + sha1 = "05f757f84f260437378368a91f8932d4b102917f"; + }; + } + { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; + sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; + }; + } + { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; + sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; + }; + } + { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; + sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; + }; + } + { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; + sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; + }; + } + { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; + sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; + }; + } + { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + path = fetchurl { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; + sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; + }; + } + { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + path = fetchurl { + name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; + sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; + }; + } + { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + path = fetchurl { + name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; + sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; + }; + } + { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + path = fetchurl { + name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; + sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; + }; + } + { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + path = fetchurl { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; + sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"; + }; + } + { + name = "postcss_safe_parser___postcss_safe_parser_4.0.2.tgz"; + path = fetchurl { + name = "postcss_safe_parser___postcss_safe_parser_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; + sha1 = "a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"; + }; + } + { + name = "postcss_sass___postcss_sass_0.4.4.tgz"; + path = fetchurl { + name = "postcss_sass___postcss_sass_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz"; + sha1 = "91f0f3447b45ce373227a98b61f8d8f0785285a3"; + }; + } + { + name = "postcss_scss___postcss_scss_2.1.1.tgz"; + path = fetchurl { + name = "postcss_scss___postcss_scss_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz"; + sha1 = "ec3a75fa29a55e016b90bf3269026c53c1d2b383"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + }; + } + { + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + path = fetchurl { + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; + }; + } + { + name = "postcss_syntax___postcss_syntax_0.36.2.tgz"; + path = fetchurl { + name = "postcss_syntax___postcss_syntax_0.36.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz"; + sha1 = "f08578c7d95834574e5593a82dfbfa8afae3b51c"; + }; + } + { + name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + path = fetchurl { + name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; + sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_6.0.23.tgz"; + path = fetchurl { + name = "postcss___postcss_6.0.23.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; + sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; + }; + } + { + name = "postcss___postcss_7.0.35.tgz"; + path = fetchurl { + name = "postcss___postcss_7.0.35.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; + sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; + }; + } + { + name = "postcss___postcss_8.3.0.tgz"; + path = fetchurl { + name = "postcss___postcss_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz"; + sha1 = "b1a713f6172ca427e3f05ef1303de8b65683325f"; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + path = fetchurl { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha1 = "d23d41fe1375646de2d0104d3454a3008802cf7b"; + }; + } + { + name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; + path = fetchurl { + name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "purgecss___purgecss_3.1.3.tgz"; + path = fetchurl { + name = "purgecss___purgecss_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/purgecss/-/purgecss-3.1.3.tgz"; + sha1 = "26987ec09d12eeadc318e22f6e5a9eb0be094f41"; + }; + } + { + name = "q___q_1.5.1.tgz"; + path = fetchurl { + name = "q___q_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + } + { + name = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } + { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + }; + } + { + name = "quick_lru___quick_lru_4.0.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; + sha1 = "5b8878f113a58217848c6482026c73e1ba57727f"; + }; + } + { + name = "quote_stream___quote_stream_1.0.2.tgz"; + path = fetchurl { + name = "quote_stream___quote_stream_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz"; + sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + }; + } + { + name = "react_dom___react_dom_16.14.0.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; + sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; + }; + } + { + name = "react_flatpickr___react_flatpickr_3.10.7.tgz"; + path = fetchurl { + name = "react_flatpickr___react_flatpickr_3.10.7.tgz"; + url = "https://registry.yarnpkg.com/react-flatpickr/-/react-flatpickr-3.10.7.tgz"; + sha1 = "bca6da2a1ccf23bb884881e2a1723073f0bfb391"; + }; + } + { + name = "react_flip_move___react_flip_move_3.0.4.tgz"; + path = fetchurl { + name = "react_flip_move___react_flip_move_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/react-flip-move/-/react-flip-move-3.0.4.tgz"; + sha1 = "261f66101fbc305f9b7b28959c5cf8236413ca74"; + }; + } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } + { + name = "react_router_dom___react_router_dom_5.2.0.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz"; + sha1 = "9e65a4d0c45e13289e66c7b17c7e175d0ea15662"; + }; + } + { + name = "react_router___react_router_5.2.0.tgz"; + path = fetchurl { + name = "react_router___react_router_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz"; + sha1 = "424e75641ca8747fbf76e5ecca69781aa37ea293"; + }; + } + { + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; + }; + } + { + name = "react___react_16.14.0.tgz"; + path = fetchurl { + name = "react___react_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; + sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; + }; + } + { + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } + { + name = "read_pkg___read_pkg_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } + { + name = "redent___redent_3.0.0.tgz"; + path = fetchurl { + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; + }; + } + { + name = "reduce_css_calc___reduce_css_calc_2.1.8.tgz"; + path = fetchurl { + name = "reduce_css_calc___reduce_css_calc_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz"; + sha1 = "7ef8761a28d614980dc0c982f772c93f7a99de03"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; + }; + } + { + name = "regenerate___regenerate_1.4.2.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + }; + } + { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; + }; + } + { + name = "regjsgen___regjsgen_0.5.2.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; + }; + } + { + name = "regjsparser___regjsparser_0.6.9.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz"; + sha1 = "b489eef7c9a2ce43727627011429cf833a7183e6"; + }; + } + { + name = "remark_parse___remark_parse_9.0.0.tgz"; + path = fetchurl { + name = "remark_parse___remark_parse_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz"; + sha1 = "4d20a299665880e4f4af5d90b7c7b8a935853640"; + }; + } + { + name = "remark_stringify___remark_stringify_9.0.1.tgz"; + path = fetchurl { + name = "remark_stringify___remark_stringify_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz"; + sha1 = "576d06e910548b0a7191a71f27b33f1218862894"; + }; + } + { + name = "remark___remark_13.0.0.tgz"; + path = fetchurl { + name = "remark___remark_13.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz"; + sha1 = "d15d9bf71a402f40287ebe36067b66d54868e425"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.4.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "resolve___resolve_2.0.0_next.3.tgz"; + path = fetchurl { + name = "resolve___resolve_2.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; + sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + path = fetchurl { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + }; + } + { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + path = fetchurl { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rw___rw_1.3.3.tgz"; + path = fetchurl { + name = "rw___rw_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + }; + } + { + name = "schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; + }; + } + { + name = "schema_utils___schema_utils_2.7.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; + }; + } + { + name = "schema_utils___schema_utils_3.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; + sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + }; + } + { + name = "shallow_copy___shallow_copy_0.0.1.tgz"; + path = fetchurl { + name = "shallow_copy___shallow_copy_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }; + } + { + name = "shapefile___shapefile_0.3.1.tgz"; + path = fetchurl { + name = "shapefile___shapefile_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/shapefile/-/shapefile-0.3.1.tgz"; + sha1 = "9bb9a429bd6086a0cfb03962d14cfdf420ffba12"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "side_channel___side_channel_1.0.4.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + path = fetchurl { + name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } + { + name = "source_list_map___source_list_map_2.0.1.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; + sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; + }; + } + { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_url___source_map_url_0.4.1.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha1 = "8a595135def9592bda69709474f1cbeea7c2467f"; + }; + } + { + name = "specificity___specificity_0.4.1.tgz"; + path = fetchurl { + name = "specificity___specificity_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz"; + sha1 = "aab5e645012db08ba182e151165738d00887b019"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "ssri___ssri_6.0.2.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; + }; + } + { + name = "ssri___ssri_8.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; + sha1 = "638e4e439e2ffbd2cd289776d5ca457c4f51a2af"; + }; + } + { + name = "stable___stable_0.1.8.tgz"; + path = fetchurl { + name = "stable___stable_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; + sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf"; + }; + } + { + name = "static_eval___static_eval_2.1.0.tgz"; + path = fetchurl { + name = "static_eval___static_eval_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/static-eval/-/static-eval-2.1.0.tgz"; + sha1 = "a16dbe54522d7fa5ef1389129d813fd47b148014"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "static_module___static_module_2.2.5.tgz"; + path = fetchurl { + name = "static_module___static_module_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz"; + sha1 = "bd40abceae33da6b7afb84a0e4329ff8852bfbbf"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_http___stream_http_2.8.3.tgz"; + path = fetchurl { + name = "stream_http___stream_http_2.8.3.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; + sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; + sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_indent___strip_indent_3.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "style_search___style_search_0.1.0.tgz"; + path = fetchurl { + name = "style_search___style_search_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz"; + sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; + }; + } + { + name = "stylehacks___stylehacks_4.0.3.tgz"; + path = fetchurl { + name = "stylehacks___stylehacks_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; + sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; + }; + } + { + name = "stylelint_config_prettier___stylelint_config_prettier_8.0.2.tgz"; + path = fetchurl { + name = "stylelint_config_prettier___stylelint_config_prettier_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz"; + sha1 = "da9de33da4c56893cbe7e26df239a7374045e14e"; + }; + } + { + name = "stylelint_config_recommended___stylelint_config_recommended_3.0.0.tgz"; + path = fetchurl { + name = "stylelint_config_recommended___stylelint_config_recommended_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz"; + sha1 = "e0e547434016c5539fe2650afd58049a2fd1d657"; + }; + } + { + name = "stylelint_config_standard___stylelint_config_standard_20.0.0.tgz"; + path = fetchurl { + name = "stylelint_config_standard___stylelint_config_standard_20.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz"; + sha1 = "06135090c9e064befee3d594289f50e295b5e20d"; + }; + } + { + name = "stylelint___stylelint_13.13.1.tgz"; + path = fetchurl { + name = "stylelint___stylelint_13.13.1.tgz"; + url = "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz"; + sha1 = "fca9c9f5de7990ab26a00f167b8978f083a18f3c"; + }; + } + { + name = "sugarss___sugarss_2.0.0.tgz"; + path = fetchurl { + name = "sugarss___sugarss_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz"; + sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "svg_tags___svg_tags_1.0.0.tgz"; + path = fetchurl { + name = "svg_tags___svg_tags_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz"; + sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; + }; + } + { + name = "tailwindcss___tailwindcss_2.0.1_compat.tgz"; + path = fetchurl { + name = "tailwindcss___tailwindcss_2.0.1_compat.tgz"; + url = "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.0.1-compat.tgz"; + sha1 = "2f57e9e4e848587bfc67ed92ee0de0882c3d0673"; + }; + } + { + name = "tapable___tapable_1.1.3.tgz"; + path = fetchurl { + name = "tapable___tapable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; + sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; + }; + } + { + name = "tar___tar_6.1.0.tgz"; + path = fetchurl { + name = "tar___tar_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; + sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; + sha1 = "28daef4a83bd17c1db0297070adc07fc8cfc6a9a"; + }; + } + { + name = "terser___terser_4.8.0.tgz"; + path = fetchurl { + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + }; + } + { + name = "terser___terser_5.7.0.tgz"; + path = fetchurl { + name = "terser___terser_5.7.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz"; + sha1 = "a761eeec206bc87b605ab13029876ead938ae693"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "timers_browserify___timers_browserify_2.0.12.tgz"; + path = fetchurl { + name = "timers_browserify___timers_browserify_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee"; + }; + } + { + name = "timsort___timsort_0.3.0.tgz"; + path = fetchurl { + name = "timsort___timsort_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; + sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + }; + } + { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + path = fetchurl { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; + }; + } + { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + path = fetchurl { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; + sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; + }; + } + { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + path = fetchurl { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "topojson___topojson_1.6.27.tgz"; + path = fetchurl { + name = "topojson___topojson_1.6.27.tgz"; + url = "https://registry.yarnpkg.com/topojson/-/topojson-1.6.27.tgz"; + sha1 = "adbe33a67e2f1673d338df12644ad20fc20b42ed"; + }; + } + { + name = "trim_newlines___trim_newlines_3.0.0.tgz"; + path = fetchurl { + name = "trim_newlines___trim_newlines_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz"; + sha1 = "79726304a6a898aa8373427298d54c2ee8b1cb30"; + }; + } + { + name = "trough___trough_1.0.5.tgz"; + path = fetchurl { + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; + }; + } + { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + path = fetchurl { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } + { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + path = fetchurl { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_fest___type_fest_0.18.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; + sha1 = "db4bc151a4a2cf4eebf9add5db75508db6cc841f"; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; + }; + } + { + name = "unified___unified_9.2.1.tgz"; + path = fetchurl { + name = "unified___unified_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz"; + sha1 = "ae18d5674c114021bfdbdf73865ca60f410215a3"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "uniq___uniq_1.0.1.tgz"; + path = fetchurl { + name = "uniq___uniq_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + } + { + name = "uniqs___uniqs_2.0.0.tgz"; + path = fetchurl { + name = "uniqs___uniqs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; + path = fetchurl { + name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"; + sha1 = "fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"; + }; + } + { + name = "unist_util_is___unist_util_is_4.1.0.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz"; + sha1 = "976e5f462a7a5de73d94b706bac1b90671b57797"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; + sha1 = "cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"; + }; + } + { + name = "universalify___universalify_2.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + }; + } + { + name = "unquote___unquote_1.1.1.tgz"; + path = fetchurl { + name = "unquote___unquote_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; + sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "upath___upath_1.2.0.tgz"; + path = fetchurl { + name = "upath___upath_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; + sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "url_search_params_polyfill___url_search_params_polyfill_8.1.1.tgz"; + path = fetchurl { + name = "url_search_params_polyfill___url_search_params_polyfill_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-8.1.1.tgz"; + sha1 = "9e69e4dba300a71ae7ad3cead62c7717fd99329f"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + } + { + name = "util___util_0.11.1.tgz"; + path = fetchurl { + name = "util___util_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; + sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "value_equal___value_equal_1.0.1.tgz"; + path = fetchurl { + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; + }; + } + { + name = "vendors___vendors_1.0.4.tgz"; + path = fetchurl { + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; + }; + } + { + name = "vfile_message___vfile_message_2.0.4.tgz"; + path = fetchurl { + name = "vfile_message___vfile_message_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz"; + sha1 = "5b43b88171d409eae58477d13f23dd41d52c371a"; + }; + } + { + name = "vfile___vfile_4.2.1.tgz"; + path = fetchurl { + name = "vfile___vfile_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz"; + sha1 = "03f1dce28fc625c625bc6514350fbdb00fa9e624"; + }; + } + { + name = "vlq___vlq_0.2.3.tgz"; + path = fetchurl { + name = "vlq___vlq_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz"; + sha1 = "8f3e4328cf63b1540c0d67e1b2778386f8975b26"; + }; + } + { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; + }; + } + { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; + path = fetchurl { + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha1 = "38500072ee6ece66f3769936950ea1771be1c957"; + }; + } + { + name = "watchpack___watchpack_1.7.5.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.5.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz"; + sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453"; + }; + } + { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; + }; + } + { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; + }; + } + { + name = "webpack___webpack_4.39.2.tgz"; + path = fetchurl { + name = "webpack___webpack_4.39.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz"; + sha1 = "c9aa5c1776d7c309d1b3911764f0288c8c2816aa"; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wordwrap___wordwrap_0.0.3.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_4.0.3.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + { + name = "zwitch___zwitch_1.0.5.tgz"; + path = fetchurl { + name = "zwitch___zwitch_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz"; + sha1 = "d11d7381ffed16b742f6af7b3f223d5cd9fe9920"; + }; + } + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4387b8583f56..4f431b940d32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1655,6 +1655,8 @@ in play-with-mpv = callPackage ../tools/video/play-with-mpv { }; + plausible = callPackage ../servers/web-apps/plausible { }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; skhd = callPackage ../os-specific/darwin/skhd { From ba934e9fc1898c749a3577ca85607e67e0a6c692 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 May 2021 16:12:51 +0200 Subject: [PATCH 649/664] beam/fetchMixDeps: allow adding patches Needed to modify e.g. a few things in the `plausible` package to get it running properly. --- pkgs/development/beam-modules/fetch-mix-deps.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 73365bd1a93e..0c6f4e35a90e 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -7,6 +7,7 @@ , mixEnv ? "prod" , debug ? false , meta ? { } +, patches ? [] , ... }@attrs: @@ -36,6 +37,8 @@ stdenvNoCC.mkDerivation (attrs // { runHook postConfigure ''; + inherit patches; + dontBuild = true; installPhase = attrs.installPhase or '' From 02b15d0f5bc6bd821718d808e8dcdbc441449f72 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 May 2021 16:13:20 +0200 Subject: [PATCH 650/664] plausible: first review fix iteration * Most significant is probably the patching necessary to run plausible with postgres without superuser privilege. This change includes: * updating ecto_sql to 3.6 where `CREATE DATABASE` is only executed if it doesn't exist[1]. * patching a migration to only modify the `users.email` column (to use `citext` rather than creating the extension. `plausible-postgres` takes care of that). * Correctly declare dependencies in systemd. * A few minor fixes. [1] https://github.com/elixir-ecto/ecto_sql/commit/051baf669ef6ec92639ccc8b113d00b98047e927 --- nixos/modules/services/web-apps/plausible.nix | 53 ++++++++++--------- nixos/modules/services/web-apps/plausible.xml | 2 +- pkgs/servers/web-apps/plausible/default.nix | 16 ++++-- .../web-apps/plausible/ecto_sql-fix.patch | 13 +++++ .../web-apps/plausible/skip-create-ext.patch | 16 ++++++ pkgs/servers/web-apps/plausible/update.sh | 8 +-- 6 files changed, 73 insertions(+), 35 deletions(-) create mode 100644 pkgs/servers/web-apps/plausible/ecto_sql-fix.patch create mode 100644 pkgs/servers/web-apps/plausible/skip-create-ext.patch diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 429a4fa62059..a07f683e28c3 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -5,10 +5,10 @@ with lib; let cfg = config.services.plausible; + # FIXME consider using LoadCredential as soon as it actually works. envSecrets = '' export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})" export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})" - export RELEASE_TMP=/var/lib/plausible/tmp ${optionalString (cfg.mail.smtp.passwordFile != null) '' export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})" ''} @@ -51,9 +51,7 @@ in { default = "http://localhost:8123/default"; type = types.str; description = '' - The URL to be used to connect to postgres. The format - is described in - the elixir docs. + The URL to be used to connect to clickhouse. ''; }; }; @@ -110,7 +108,7 @@ in { mail = { email = mkOption { - default = " hello@plausible.local"; + default = "hello@plausible.local"; type = types.str; description = '' The email id to use for as from address of all communications @@ -146,7 +144,7 @@ in { The path to the file with the password in case SMTP auth is enabled. ''; }; - enableSSL = mkEnableOption ""; + enableSSL = mkEnableOption "SSL when connecting to the SMTP server"; retries = mkOption { type = types.ints.unsigned; default = 2; @@ -162,7 +160,7 @@ in { assertions = [ { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; message = '' - Unable to automatically activate the admin-user if no local DB-managed for + Unable to automatically activate the admin-user if no locally DB-managed for postgres (`services.plausible.database.postgres.setup') is enabled! ''; } @@ -181,10 +179,13 @@ in { plausible = { inherit (pkgs.plausible.meta) description; documentation = [ "https://plausible.io/docs/self-hosting" ]; - wantedBy = [ "multi-user.target" ] - ++ optional cfg.database.clickhouse.setup "clickhouse.service" - ++ optional cfg.database.postgres.setup "postgresql.service"; + wantedBy = [ "multi-user.target" ]; after = optional cfg.database.postgres.setup "plausible-postgres.service"; + requires = optional cfg.database.clickhouse.setup "clickhouse.service" + ++ optionals cfg.database.postgres.setup [ + "postgresql.service" + "plausible-postgres.service" + ]; environment = { # NixOS specific option to avoid that it's trying to write into its store-path. @@ -196,6 +197,8 @@ in { PORT = toString cfg.server.port; DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; + RELEASE_TMP = "/var/lib/plausible/tmp"; + ADMIN_USER_NAME = cfg.adminUser.name; ADMIN_USER_EMAIL = cfg.adminUser.email; @@ -210,8 +213,11 @@ in { SMTP_HOST_PORT = toString cfg.mail.smtp.hostPort; SMTP_RETRIES = toString cfg.mail.smtp.retries; SMTP_HOST_SSL_ENABLED = boolToString cfg.mail.smtp.enableSSL; - ${if cfg.mail.smtp.user != null then "SMTP_USER_NAME" else null} = cfg.mail.smtp.user; - }; + + SELFHOST = "true"; + } // (optionalAttrs (cfg.mail.smtp.user != null) { + SMTP_USER_NAME = cfg.mail.smtp.user; + }); path = [ pkgs.plausible ] ++ optional cfg.database.postgres.setup config.services.postgresql.package; @@ -239,26 +245,23 @@ in { }; } (mkIf cfg.database.postgres.setup { - # Unfortunately `plausible' requires super-user permissions in postgresql, so this - # has to be done imperatively here. + # `plausible' requires the `citext'-extension. plausible-postgres = { after = [ "postgresql.service" ]; bindsTo = [ "postgresql.service" ]; requiredBy = [ "plausible.service" ]; partOf = [ "plausible.service" ]; serviceConfig.Type = "oneshot"; + unitConfig.ConditionPathExists = "!/var/lib/plausible/.db-setup"; script = '' - if [ ! -e /var/lib/plausible/.db-setup ]; then - mkdir -p /var/lib/plausible/ - PSQL() { - /run/wrappers/bin/sudo -Hu postgres ${config.services.postgresql.package}/bin/psql --port=5432 "$@" - } - PSQL -tAc "CREATE EXTENSION IF NOT EXISTS citext;" - PSQL -tAc "CREATE ROLE plausible WITH LOGIN;" - PSQL -tAc "CREATE DATABASE plausible WITH OWNER plausible;" - PSQL -tAc "ALTER USER plausible WITH SUPERUSER;" - touch /var/lib/plausible/.db-setup - fi + mkdir -p /var/lib/plausible/ + PSQL() { + /run/wrappers/bin/sudo -Hu postgres ${config.services.postgresql.package}/bin/psql --port=5432 "$@" + } + PSQL -tAc "CREATE ROLE plausible WITH LOGIN;" + PSQL -tAc "CREATE DATABASE plausible WITH OWNER plausible;" + PSQL -d plausible -tAc "CREATE EXTENSION IF NOT EXISTS citext;" + touch /var/lib/plausible/.db-setup ''; }; }) diff --git a/nixos/modules/services/web-apps/plausible.xml b/nixos/modules/services/web-apps/plausible.xml index d1bcc22b2314..92a571b9fbdb 100644 --- a/nixos/modules/services/web-apps/plausible.xml +++ b/nixos/modules/services/web-apps/plausible.xml @@ -12,7 +12,7 @@ Basic Usage At first, a secret key is needed to be generated. This can be done with e.g. - $ openssl rand -base64 64 + $ openssl rand -base64 64 After that, plausible can be deployed like this: diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 0264d30e9ff6..91c683b5ddbf 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -14,10 +14,12 @@ let sha256 = "03lm1f29gwwixnhgjish5bhi3m73qyp71ns2sczdnwnbhrw61zps"; }; - mixDeps = beamPackages.fetchMixDeps { + # TODO consider using `mix2nix` as soon as it supports git dependencies. + mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "sha256-66zSdYmis3UnbdLkPi649RbPbMPI5gVeFlaMekOy5CQ="; + sha256 = "sha256-pv/zXcku+ZgxV1804kIfDZN0jave2qG3rgZwm4yGA6I="; + patches = [ ./ecto_sql-fix.patch ]; }; yarnDeps = mkYarnModules { @@ -28,15 +30,15 @@ let yarnLock = ./yarn.lock; preBuild = '' mkdir -p tmp/deps - cp -r ${mixDeps}/phoenix tmp/deps/phoenix - cp -r ${mixDeps}/phoenix_html tmp/deps/phoenix_html + cp -r ${mixFodDeps}/phoenix tmp/deps/phoenix + cp -r ${mixFodDeps}/phoenix_html tmp/deps/phoenix_html ''; postBuild = '' echo 'module.exports = {}' > $out/node_modules/flatpickr/dist/postcss.config.js ''; }; in beamPackages.mixRelease { - inherit pname version src mixDeps; + inherit pname version src mixFodDeps; nativeBuildInputs = [ nodejs ]; @@ -47,6 +49,10 @@ in beamPackages.mixRelease { url = "https://github.com/Ma27/analytics/commit/f2ee5892a6c3e1a861d69ed30cac43e05e9cd36f.patch"; sha256 = "sha256-JvJ7xlGw+tHtWje+jiQChVC4KTyqqdq2q+MIcOv/k1o="; }) + + # CREATE EXTENSION requires super-user privileges. To avoid that, we just skip + # the responsible SQL statement here and take care of it in the module. + ./skip-create-ext.patch ]; passthru = { diff --git a/pkgs/servers/web-apps/plausible/ecto_sql-fix.patch b/pkgs/servers/web-apps/plausible/ecto_sql-fix.patch new file mode 100644 index 000000000000..13c3f4ffc3c0 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/ecto_sql-fix.patch @@ -0,0 +1,13 @@ +diff --git a/mix.exs b/mix.exs +index f6e3b9a..67687d1 100644 +--- a/mix.exs ++++ b/mix.exs +@@ -52,7 +52,7 @@ defmodule Plausible.MixProject do + [ + {:bcrypt_elixir, "~> 2.0"}, + {:cors_plug, "~> 1.5"}, +- {:ecto_sql, "~> 3.0"}, ++ {:ecto_sql, "~> 3.6"}, + {:elixir_uuid, "~> 1.2"}, + {:gettext, "~> 0.11"}, + {:jason, "~> 1.0"}, diff --git a/pkgs/servers/web-apps/plausible/skip-create-ext.patch b/pkgs/servers/web-apps/plausible/skip-create-ext.patch new file mode 100644 index 000000000000..ad9defadf9a5 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/skip-create-ext.patch @@ -0,0 +1,16 @@ +diff --git a/priv/repo/migrations/20190430140411_use_citext_for_email.exs b/priv/repo/migrations/20190430140411_use_citext_for_email.exs +index ecb6f80..f3bf12f 100644 +--- a/priv/repo/migrations/20190430140411_use_citext_for_email.exs ++++ b/priv/repo/migrations/20190430140411_use_citext_for_email.exs +@@ -2,10 +2,6 @@ defmodule Plausible.Repo.Migrations.UseCitextForEmail do + use Ecto.Migration + + def change do +- execute "CREATE EXTENSION IF NOT EXISTS citext;" +- +- alter table(:users) do +- modify :email, :citext, null: false +- end ++ execute "ALTER TABLE users ALTER COLUMN email TYPE citext;" + end + end diff --git a/pkgs/servers/web-apps/plausible/update.sh b/pkgs/servers/web-apps/plausible/update.sh index 8861cd50a721..0807f11ede94 100755 --- a/pkgs/servers/web-apps/plausible/update.sh +++ b/pkgs/servers/web-apps/plausible/update.sh @@ -45,17 +45,17 @@ fake_hash="$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" sed -i "$dir/default.nix" \ -e 's,version = ".*",version = "'"$nix_version"'",' \ -e '/^ src = fetchFromGitHub/,+4{;s/sha256 = "\(.*\)"/sha256 = "'"$tarball_hash"'"/}' \ - -e '/^ mixDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$fake_hash"'"/}' + -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$fake_hash"'"/}' -mix_hash="$(nix-build -A plausible.mixDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo)" +mix_hash="$(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo)" -sed -i "$dir/default.nix" -e '/^ mixDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$mix_hash"'"/}' +sed -i "$dir/default.nix" -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$mix_hash"'"/}' tmp_setup_dir="$(mktemp -d)" trap "rm -rf $tmp_setup_dir" EXIT cp -r $tarball_path/* $tmp_setup_dir/ -cp -r "$(nix-build -A plausible.mixDeps)" "$tmp_setup_dir/deps" +cp -r "$(nix-build -A plausible.mixFodDeps)" "$tmp_setup_dir/deps" chmod -R a+rwx "$tmp_setup_dir" pushd $tmp_setup_dir/assets From 6bc72cdd4a9afa3c301b3f6ea8679ef117287946 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 May 2021 17:33:16 +0200 Subject: [PATCH 651/664] plausiblew: cleanup build & update script --- nixos/modules/services/web-apps/plausible.nix | 2 +- pkgs/servers/web-apps/plausible/default.nix | 5 +- pkgs/servers/web-apps/plausible/update.sh | 23 +- pkgs/servers/web-apps/plausible/yarn.lock | 275 +++++++++--------- pkgs/servers/web-apps/plausible/yarn.nix | 248 ++++++++-------- 5 files changed, 274 insertions(+), 279 deletions(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index a07f683e28c3..7a6756d6fb27 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -160,7 +160,7 @@ in { assertions = [ { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; message = '' - Unable to automatically activate the admin-user if no locally DB-managed for + Unable to automatically activate the admin-user if no locally managed DB for postgres (`services.plausible.database.postgres.setup') is enabled! ''; } diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 91c683b5ddbf..7fb17199562a 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -18,7 +18,7 @@ let mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "sha256-pv/zXcku+ZgxV1804kIfDZN0jave2qG3rgZwm4yGA6I="; + sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6"; patches = [ ./ecto_sql-fix.patch ]; }; @@ -72,9 +72,6 @@ in beamPackages.mixRelease { mkdir -p $out ln -sf ${yarnDeps}/node_modules assets/node_modules - mix deps.compile --path $out --no-deps-check - mix compile --no-deps-check --path $out - npm run deploy --prefix ./assets mix release plausible --no-deps-check --path $out diff --git a/pkgs/servers/web-apps/plausible/update.sh b/pkgs/servers/web-apps/plausible/update.sh index 0807f11ede94..3abf3ee616fc 100755 --- a/pkgs/servers/web-apps/plausible/update.sh +++ b/pkgs/servers/web-apps/plausible/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix-prefetch-git yarn yarn2nix-moretea.yarn2nix moreutils +#!nix-shell -i bash -p jq nix-prefetch-github yarn yarn2nix-moretea.yarn2nix moreutils # NOTE: please check on new releases which steps aren't necessary anymore! # Currently the following things are done: @@ -13,14 +13,14 @@ # * Update hashes for the tarball & the fixed-output drv with all `mix`-dependencies. # * Generate `yarn.lock` & `yarn.nix` in a temporary directory. -set -x +set -euxo pipefail dir="$(realpath $(dirname "$0"))" -latest="$(curl -q https://api.github.com/repos/plausible/analytics/releases/latest \ +export latest="$(curl -q https://api.github.com/repos/plausible/analytics/releases/latest \ | jq -r '.tag_name')" nix_version="$(cut -c2- <<< "$latest")" -if [ "$(nix-instantiate -A plausible.version --eval | xargs echo)" = "$nix_version" ]; +if [[ "$(nix-instantiate -A plausible.version --eval --json | jq -r)" = "$nix_version" ]]; then echo "Already using version $latest, skipping" exit 0 @@ -29,17 +29,16 @@ fi SRC="https://raw.githubusercontent.com/plausible/analytics/${latest}" package_json="$(curl -qf "$SRC/assets/package.json")" -fixed_tailwind_version="$(jq '.dependencies.tailwindcss' -r <<< "$package_json" | sed -e 's,^^,,g')" +export fixed_tailwind_version="$(jq '.dependencies.tailwindcss' -r <<< "$package_json" | sed -e 's,^^,,g')" echo "$package_json" \ - | jq '. + {"name":"plausible","version":"'$latest'"}' \ - | jq '.dependencies.tailwindcss = "'"$fixed_tailwind_version"'"' \ + | jq '. + {"name":"plausible","version": $ENV.latest} | .dependencies.tailwindcss = $ENV.fixed_tailwind_version' \ | sed -e 's,../deps/,../../tmp/deps/,g' \ > $dir/package.json -tarball_meta="$(nix-prefetch-git https://github.com/plausible/analytics --rev "$latest" --quiet)" -tarball_hash="$(jq -r '.sha256' <<< "$tarball_meta")" -tarball_path="$(jq -r '.path' <<< "$tarball_meta")" +tarball_meta="$(nix-prefetch-github plausible analytics --rev "$latest")" +tarball_hash="$(nix to-base32 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" +tarball_path="$(nix-build -E 'with import ./. {}; { p }: fetchFromGitHub (builtins.fromJSON p)' --argstr p "$tarball_meta")" fake_hash="$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" sed -i "$dir/default.nix" \ @@ -47,7 +46,7 @@ sed -i "$dir/default.nix" \ -e '/^ src = fetchFromGitHub/,+4{;s/sha256 = "\(.*\)"/sha256 = "'"$tarball_hash"'"/}' \ -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$fake_hash"'"/}' -mix_hash="$(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo)" +mix_hash="$(nix to-base32 $(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))" sed -i "$dir/default.nix" -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$mix_hash"'"/}' @@ -56,7 +55,7 @@ trap "rm -rf $tmp_setup_dir" EXIT cp -r $tarball_path/* $tmp_setup_dir/ cp -r "$(nix-build -A plausible.mixFodDeps)" "$tmp_setup_dir/deps" -chmod -R a+rwx "$tmp_setup_dir" +chmod -R u+rwx "$tmp_setup_dir" pushd $tmp_setup_dir/assets jq < package.json '.dependencies.tailwindcss = "'"$fixed_tailwind_version"'"' | sponge package.json diff --git a/pkgs/servers/web-apps/plausible/yarn.lock b/pkgs/servers/web-apps/plausible/yarn.lock index c37791d9d23a..273ff3d42180 100644 --- a/pkgs/servers/web-apps/plausible/yarn.lock +++ b/pkgs/servers/web-apps/plausible/yarn.lock @@ -16,10 +16,10 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" - integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" + integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== "@babel/core@>=7.9.0", "@babel/core@^7.11.1": version "7.14.3" @@ -66,26 +66,26 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" - integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" + integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== dependencies: - "@babel/compat-data" "^7.13.15" + "@babel/compat-data" "^7.14.4" "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.3": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz#832111bcf4f57ca57a4c5b1a000fc125abc6554a" - integrity sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz#abf888d836a441abee783c75229279748705dc42" + integrity sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-function-name" "^7.14.2" "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.14.3" + "@babel/helper-replace-supers" "^7.14.4" "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-create-regexp-features-plugin@^7.12.13": @@ -96,10 +96,10 @@ "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.1.tgz#e6f5f4a6edc3722152c21359190de67fc6cf664d" - integrity sha512-x3AUTVZNPunaw1opRTa5OwVA5N0YxGlIad9xQ5QflK1uIS7PnAGGU5O2Dj/G183fR//N8AzTq+Q8+oiu9m0VFg== +"@babel/helper-define-polyfill-provider@^0.2.2": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6" + integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -190,15 +190,15 @@ "@babel/helper-wrap-function" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.3": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" - integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== +"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836" + integrity sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ== dependencies: "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.4" "@babel/helper-simple-access@^7.13.12": version "7.13.12" @@ -260,9 +260,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" - integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" + integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -290,7 +290,7 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-proposal-class-static-block@^7.13.11": +"@babel/plugin-proposal-class-static-block@^7.14.3": version "7.14.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz#5a527e2cae4a4753119c3a3e7f64ecae8ccf1360" integrity sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ== @@ -347,13 +347,13 @@ "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc" - integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw== +"@babel/plugin-proposal-object-rest-spread@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz#0e2b4de419915dc0b409378e829412e2031777c4" + integrity sha512-AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA== dependencies: - "@babel/compat-data" "^7.14.0" - "@babel/helper-compilation-targets" "^7.13.16" + "@babel/compat-data" "^7.14.4" + "@babel/helper-compilation-targets" "^7.14.4" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.14.2" @@ -529,23 +529,23 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c" - integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg== +"@babel/plugin-transform-block-scoping@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz#caf140b0b2e2462c509553d140e6d0abefb61ed8" + integrity sha512-5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g== dependencies: "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-transform-classes@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d" - integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg== +"@babel/plugin-transform-classes@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz#a83c15503fc71a0f99e876fdce7dadbc6575ec3a" + integrity sha512-p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-function-name" "^7.14.2" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-replace-supers" "^7.14.4" "@babel/helper-split-export-declaration" "^7.12.13" globals "^11.1.0" @@ -556,10 +556,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-transform-destructuring@^7.13.17": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" - integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== +"@babel/plugin-transform-destructuring@^7.14.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz#acbec502e9951f30f4441eaca1d2f29efade59ed" + integrity sha512-JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" @@ -788,25 +788,25 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/preset-env@^7.11.0": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz#e80612965da73579c84ad2f963c2359c71524ed5" - integrity sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ== + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz#73fc3228c59727e5e974319156f304f0d6685a2d" + integrity sha512-GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA== dependencies: - "@babel/compat-data" "^7.14.0" - "@babel/helper-compilation-targets" "^7.13.16" + "@babel/compat-data" "^7.14.4" + "@babel/helper-compilation-targets" "^7.14.4" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" "@babel/plugin-proposal-async-generator-functions" "^7.14.2" "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-class-static-block" "^7.13.11" + "@babel/plugin-proposal-class-static-block" "^7.14.3" "@babel/plugin-proposal-dynamic-import" "^7.14.2" "@babel/plugin-proposal-export-namespace-from" "^7.14.2" "@babel/plugin-proposal-json-strings" "^7.14.2" "@babel/plugin-proposal-logical-assignment-operators" "^7.14.2" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.2" "@babel/plugin-proposal-numeric-separator" "^7.14.2" - "@babel/plugin-proposal-object-rest-spread" "^7.14.2" + "@babel/plugin-proposal-object-rest-spread" "^7.14.4" "@babel/plugin-proposal-optional-catch-binding" "^7.14.2" "@babel/plugin-proposal-optional-chaining" "^7.14.2" "@babel/plugin-proposal-private-methods" "^7.13.0" @@ -829,10 +829,10 @@ "@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.14.2" - "@babel/plugin-transform-classes" "^7.14.2" + "@babel/plugin-transform-block-scoping" "^7.14.4" + "@babel/plugin-transform-classes" "^7.14.4" "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.17" + "@babel/plugin-transform-destructuring" "^7.14.4" "@babel/plugin-transform-dotall-regex" "^7.12.13" "@babel/plugin-transform-duplicate-keys" "^7.12.13" "@babel/plugin-transform-exponentiation-operator" "^7.12.13" @@ -859,7 +859,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.4" babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0" @@ -927,10 +927,10 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.4": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" - integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== +"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.14.4", "@babel/types@^7.4.4": + version "7.14.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" + integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -1002,9 +1002,9 @@ unist-util-find-all-after "^3.0.2" "@tailwindcss/aspect-ratio@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.0.tgz#bebd32b7d0756b695294d4db1ae658796ff72a2c" - integrity sha512-v5LyHkwXj/4lI74B06zUrmWEdmSqS43+jw717pkt3fAXqb7ALwu77A8t7j+Bej+ZbdlIIqNMYheGN7wSGV1A6w== + version "0.2.1" + resolved "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.1.tgz#a7ce776688b8218d9559a6918f0bccc58f0f16dd" + integrity sha512-aDFi80aHQ3JM3symJ5iKU70lm151ugIGFCI0yRZGpyjgQSDS+Fbe93QwypC1tCEllQE8p0S7TUu20ih1b9IKLA== "@tailwindcss/forms@^0.2.1": version "0.2.1" @@ -1046,9 +1046,9 @@ integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== "@types/node@*": - version "15.6.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz#f0ddca5a61e52627c9dcb771a6039d44694597bc" - integrity sha512-gCYSfQpy+LYhOFTKAeE8BkyGqaxmlFxe+n4DKM6DR0wzw/HISUE/hAmkC/KT8Sw5PCJblqg062b3z9gucv3k0A== + version "15.6.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz#32d43390d5c62c5b6ec486a9bc9c59544de39a08" + integrity sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1522,28 +1522,28 @@ babel-plugin-dynamic-import-node@^2.3.3: object.assign "^4.1.0" babel-plugin-polyfill-corejs2@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.1.tgz#ae2cf6d6f1aa7c0edcf04a25180e8856a6d1184f" - integrity sha512-hXGSPbr6IbjeMyGew+3uGIAkRjBFSOJ9FLDZNOfHuyJZCcoia4nd/72J0bSgvfytcVfUcP/dxEVcUhVJuQRtSw== + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" + integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ== dependencies: "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.1" + "@babel/helper-define-polyfill-provider" "^0.2.2" semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.1.tgz#786f40218040030f0edecfd48e6e59f1ee9bef53" - integrity sha512-WZCqF3DLUhdTD/P381MDJfuP18hdCZ+iqJ+wHtzhWENpsiof284JJ1tMQg1CE+hfCWyG48F7e5gDMk2c3Laz7w== + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz#7424a1682ee44baec817327710b1b094e5f8f7f5" + integrity sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.1" + "@babel/helper-define-polyfill-provider" "^0.2.2" core-js-compat "^3.9.1" babel-plugin-polyfill-regenerator@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.1.tgz#ca9595d7d5f3afefec2d83126148b90db751a091" - integrity sha512-T3bYyL3Sll2EtC94v3f+fA8M28q7YPTOZdB++SRHjvYZTvtd+WorMUq3tDTD4Q7Kjk1LG0gGromslKjcO5p2TA== + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077" + integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.1" + "@babel/helper-define-polyfill-provider" "^0.2.2" bail@^1.0.0: version "1.0.5" @@ -1727,7 +1727,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6: version "4.16.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== @@ -1794,9 +1794,9 @@ cacache@^12.0.2: y18n "^4.0.0" cacache@^15.0.5: - version "15.1.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz#164c2f857ee606e4cc793c63018fefd0ea5eba7b" - integrity sha512-mfx0C+mCfWjD1PnwQ9yaOrwG1ou9FkKnx0SvzUHWdFt7r7GaRtzT+9M8HAvLu62zIHtnpQ/1m93nWNDCckJGXQ== + version "15.2.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" + integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw== dependencies: "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" @@ -1893,9 +1893,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001228" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" - integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== + version "1.0.30001230" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71" + integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ== chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" @@ -2194,17 +2194,17 @@ copy-webpack-plugin@^6.0.3: webpack-sources "^1.4.3" core-js-compat@^3.9.0, core-js-compat@^3.9.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b" - integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ== + version "3.13.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.13.1.tgz#05444caa8f153be0c67db03cf8adb8ec0964e58e" + integrity sha512-mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ== dependencies: browserslist "^4.16.6" semver "7.0.0" core-js-pure@^3.0.0: - version "3.12.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz#934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8" - integrity sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ== + version "3.13.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.13.1.tgz#5d139d346780f015f67225f45ee2362a6bed6ba1" + integrity sha512-wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw== core-util-is@~1.0.0: version "1.0.2" @@ -2705,9 +2705,9 @@ duplexify@^3.4.2, duplexify@^3.6.0: stream-shift "^1.0.0" electron-to-chromium@^1.3.723: - version "1.3.735" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz#fa1a8660f2790662291cb2136f0e446a444cdfdc" - integrity sha512-cp7MWzC3NseUJV2FJFgaiesdrS+A8ZUjX5fLAxdRlcaPDkaPGFplX930S5vf84yqDp4LjuLdKouWuVOTwUfqHQ== + version "1.3.742" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz#7223215acbbd3a5284962ebcb6df85d88b95f200" + integrity sha512-ihL14knI9FikJmH2XUIDdZFWJxvr14rPSdOhJ7PpS27xbz8qmaRwCwyg/bmFwjWKmWK9QyamiCZVCvXm5CH//Q== elliptic@^6.5.3: version "6.5.4" @@ -2789,10 +2789,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== +es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: + version "1.18.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" + integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -2802,14 +2802,14 @@ es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: has-symbols "^1.0.2" is-callable "^1.2.3" is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.10.3" 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.0" + unbox-primitive "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -3515,9 +3515,9 @@ globals@^12.1.0: type-fest "^0.8.1" globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: type-fest "^0.20.2" @@ -4081,7 +4081,7 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-regex@^1.1.2: +is-regex@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== @@ -4099,7 +4099,7 @@ is-resolvable@^1.0.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-string@^1.0.5: +is-string@^1.0.5, is-string@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== @@ -4986,11 +4986,11 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-hash@^2.0.3: - version "2.1.1" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" - integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" + integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.9.0: +object-inspect@^1.10.3, object-inspect@^1.9.0: version "1.10.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== @@ -5023,14 +5023,13 @@ object.assign@^4.1.0, object.assign@^4.1.2: object-keys "^1.1.1" object.entries@^1.1.2, object.entries@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" - integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" + es-abstract "^1.18.2" object.fromentries@^2.0.4: version "2.0.4" @@ -5059,14 +5058,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0, object.values@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" - integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== + 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.0-next.2" - has "^1.0.3" + es-abstract "^1.18.2" once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" @@ -5286,9 +5284,9 @@ path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + 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@^1.7.0: version "1.8.0" @@ -6033,9 +6031,9 @@ react-router@5.2.0: tiny-warning "^1.0.0" react-transition-group@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" - integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== dependencies: "@babel/runtime" "^7.5.5" dom-helpers "^5.0.1" @@ -6818,14 +6816,15 @@ string-width@^4.2.0, string-width@^4.2.2: strip-ansi "^6.0.0" string.prototype.matchall@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" - integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ== + version "4.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" + integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - has-symbols "^1.0.1" + es-abstract "^1.18.2" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" internal-slot "^1.0.3" regexp.prototype.flags "^1.3.1" side-channel "^1.0.4" @@ -7223,9 +7222,9 @@ topojson@^1.6.19: shapefile "0.3" trim-newlines@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" - integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== trough@^1.0.0: version "1.0.5" @@ -7293,7 +7292,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -unbox-primitive@^1.0.0: +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== diff --git a/pkgs/servers/web-apps/plausible/yarn.nix b/pkgs/servers/web-apps/plausible/yarn.nix index a578b3e8353e..303ccb31c551 100644 --- a/pkgs/servers/web-apps/plausible/yarn.nix +++ b/pkgs/servers/web-apps/plausible/yarn.nix @@ -18,11 +18,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; - sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; + sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; }; } { @@ -58,19 +58,19 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; + sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz"; - sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; + sha1 = "abf888d836a441abee783c75229279748705dc42"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.1.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.3.tgz"; path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.1.tgz"; - sha1 = "e6f5f4a6edc3722152c21359190de67fc6cf664d"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"; + sha1 = "0525edec5094653a282688d34d846e4c75e9c0b6"; }; } { @@ -170,11 +170,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; - sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; + sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; }; } { @@ -242,11 +242,11 @@ }; } { - name = "_babel_parser___parser_7.14.3.tgz"; + name = "_babel_parser___parser_7.14.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; - sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; + name = "_babel_parser___parser_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; + sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; }; } { @@ -330,11 +330,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.2.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz"; - sha1 = "e17d418f81cc103fedd4ce037e181c8056225abc"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; + sha1 = "0e2b4de419915dc0b409378e829412e2031777c4"; }; } { @@ -522,19 +522,19 @@ }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz"; - sha1 = "761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; + sha1 = "caf140b0b2e2462c509553d140e6d0abefb61ed8"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.2.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz"; - sha1 = "3f1196c5709f064c252ad056207d87b7aeb2d03d"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; + sha1 = "a83c15503fc71a0f99e876fdce7dadbc6575ec3a"; }; } { @@ -546,11 +546,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; - sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; + sha1 = "acbec502e9951f30f4441eaca1d2f29efade59ed"; }; } { @@ -786,11 +786,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.14.2.tgz"; + name = "_babel_preset_env___preset_env_7.14.4.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz"; - sha1 = "e80612965da73579c84ad2f963c2359c71524ed5"; + name = "_babel_preset_env___preset_env_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz"; + sha1 = "73fc3228c59727e5e974319156f304f0d6685a2d"; }; } { @@ -842,11 +842,11 @@ }; } { - name = "_babel_types___types_7.14.2.tgz"; + name = "_babel_types___types_7.14.4.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz"; - sha1 = "4208ae003107ef8a057ea8333e56eb64d2f6a2c3"; + name = "_babel_types___types_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; + sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; }; } { @@ -914,11 +914,11 @@ }; } { - name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.0.tgz"; + name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.1.tgz"; path = fetchurl { - name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.0.tgz"; - sha1 = "bebd32b7d0756b695294d4db1ae658796ff72a2c"; + name = "_tailwindcss_aspect_ratio___aspect_ratio_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/@tailwindcss/aspect-ratio/-/aspect-ratio-0.2.1.tgz"; + sha1 = "a7ce776688b8218d9559a6918f0bccc58f0f16dd"; }; } { @@ -978,11 +978,11 @@ }; } { - name = "_types_node___node_15.6.0.tgz"; + name = "_types_node___node_15.6.1.tgz"; path = fetchurl { - name = "_types_node___node_15.6.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz"; - sha1 = "f0ddca5a61e52627c9dcb771a6039d44694597bc"; + name = "_types_node___node_15.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.6.1.tgz"; + sha1 = "32d43390d5c62c5b6ec486a9bc9c59544de39a08"; }; } { @@ -1538,27 +1538,27 @@ }; } { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.1.tgz"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.2.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.1.tgz"; - sha1 = "ae2cf6d6f1aa7c0edcf04a25180e8856a6d1184f"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"; + sha1 = "e9124785e6fd94f94b618a7954e5693053bf5327"; }; } { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.1.tgz"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.2.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.1.tgz"; - sha1 = "786f40218040030f0edecfd48e6e59f1ee9bef53"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz"; + sha1 = "7424a1682ee44baec817327710b1b094e5f8f7f5"; }; } { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.1.tgz"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.2.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.1.tgz"; - sha1 = "ca9595d7d5f3afefec2d83126148b90db751a091"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"; + sha1 = "b310c8d642acada348c1fa3b3e6ce0e851bee077"; }; } { @@ -1818,11 +1818,11 @@ }; } { - name = "cacache___cacache_15.1.0.tgz"; + name = "cacache___cacache_15.2.0.tgz"; path = fetchurl { - name = "cacache___cacache_15.1.0.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz"; - sha1 = "164c2f857ee606e4cc793c63018fefd0ea5eba7b"; + name = "cacache___cacache_15.2.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz"; + sha1 = "73af75f77c58e72d8c630a7a2858cb18ef523389"; }; } { @@ -1906,11 +1906,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; - sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; + name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; + sha1 = "8135c57459854b2240b57a4a6786044bdc5a9f71"; }; } { @@ -2234,19 +2234,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.12.1.tgz"; + name = "core_js_compat___core_js_compat_3.13.1.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.12.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz"; - sha1 = "2c302c4708505fa7072b0adb5156d26f7801a18b"; + name = "core_js_compat___core_js_compat_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.13.1.tgz"; + sha1 = "05444caa8f153be0c67db03cf8adb8ec0964e58e"; }; } { - name = "core_js_pure___core_js_pure_3.12.1.tgz"; + name = "core_js_pure___core_js_pure_3.13.1.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.12.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz"; - sha1 = "934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8"; + name = "core_js_pure___core_js_pure_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.13.1.tgz"; + sha1 = "5d139d346780f015f67225f45ee2362a6bed6ba1"; }; } { @@ -2762,11 +2762,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.735.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.742.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.735.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz"; - sha1 = "fa1a8660f2790662291cb2136f0e446a444cdfdc"; + name = "electron_to_chromium___electron_to_chromium_1.3.742.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz"; + sha1 = "7223215acbbd3a5284962ebcb6df85d88b95f200"; }; } { @@ -2866,11 +2866,11 @@ }; } { - name = "es_abstract___es_abstract_1.18.0.tgz"; + name = "es_abstract___es_abstract_1.18.3.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; - sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; + name = "es_abstract___es_abstract_1.18.3.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz"; + sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0"; }; } { @@ -3578,11 +3578,11 @@ }; } { - name = "globals___globals_13.8.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { @@ -5346,11 +5346,11 @@ }; } { - name = "object_hash___object_hash_2.1.1.tgz"; + name = "object_hash___object_hash_2.2.0.tgz"; path = fetchurl { - name = "object_hash___object_hash_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz"; - sha1 = "9447d0279b4fcf80cff3259bf66a1dc73afabe09"; + name = "object_hash___object_hash_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz"; + sha1 = "5ad518581eefc443bd763472b8ff2e9c2c0d54a5"; }; } { @@ -5394,11 +5394,11 @@ }; } { - name = "object.entries___object.entries_1.1.3.tgz"; + name = "object.entries___object.entries_1.1.4.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; - sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; + name = "object.entries___object.entries_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz"; + sha1 = "43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"; }; } { @@ -5426,11 +5426,11 @@ }; } { - name = "object.values___object.values_1.1.3.tgz"; + name = "object.values___object.values_1.1.4.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; - sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; + name = "object.values___object.values_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; + sha1 = "0d273762833e816b693a637d30073e7051535b30"; }; } { @@ -5682,11 +5682,11 @@ }; } { - name = "path_parse___path_parse_1.0.6.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; }; } { @@ -6459,11 +6459,11 @@ }; } { - name = "react_transition_group___react_transition_group_4.4.1.tgz"; + name = "react_transition_group___react_transition_group_4.4.2.tgz"; path = fetchurl { - name = "react_transition_group___react_transition_group_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; - sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha1 = "8b59a56f09ced7b55cbd53c36768b922890d5470"; }; } { @@ -7355,11 +7355,11 @@ }; } { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; - sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz"; + sha1 = "59370644e1db7e4c0c045277690cf7b01203c4da"; }; } { @@ -7699,11 +7699,11 @@ }; } { - name = "trim_newlines___trim_newlines_3.0.0.tgz"; + name = "trim_newlines___trim_newlines_3.0.1.tgz"; path = fetchurl { - name = "trim_newlines___trim_newlines_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz"; - sha1 = "79726304a6a898aa8373427298d54c2ee8b1cb30"; + name = "trim_newlines___trim_newlines_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha1 = "260a5d962d8b752425b32f3a7db0dcacd176c144"; }; } { From f3d5618ae1fd942c26e8233578691cd5a68ab493 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 31 May 2021 19:01:39 +0200 Subject: [PATCH 652/664] plausible: correctly run digest task --- pkgs/servers/web-apps/plausible/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 7fb17199562a..c2de1ae98816 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -73,7 +73,10 @@ in beamPackages.mixRelease { mkdir -p $out ln -sf ${yarnDeps}/node_modules assets/node_modules npm run deploy --prefix ./assets - mix release plausible --no-deps-check --path $out + + # for external task you need a workaround for the no deps check flag + # https://github.com/phoenixframework/phoenix/issues/2690 + mix do deps.loadpaths --no-deps-check, phx.digest runHook postBuild ''; From 1ed65d4bf6466f7ca47ca7f16cf9a4712e422052 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 31 May 2021 19:03:12 +0200 Subject: [PATCH 653/664] plausible: platforms.{linux -> unix} Co-authored-by: Raphael Megzari --- pkgs/servers/web-apps/plausible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index c2de1ae98816..1fb37dc7ee03 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -86,6 +86,6 @@ in beamPackages.mixRelease { homepage = "https://plausible.io/"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics."; maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From cc88797ce079d632e1d71b190b40a36efc7ac378 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Jun 2021 17:59:59 +0200 Subject: [PATCH 654/664] plausible: minor polishing --- nixos/modules/services/web-apps/plausible.nix | 2 +- nixos/tests/plausible.nix | 2 +- pkgs/servers/web-apps/plausible/default.nix | 33 ++++++++++--------- .../web-apps/plausible/tzdata-rebased.patch | 21 ++++++++++++ 4 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 pkgs/servers/web-apps/plausible/tzdata-rebased.patch diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 7a6756d6fb27..caf5ba466dfe 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -190,7 +190,7 @@ in { environment = { # NixOS specific option to avoid that it's trying to write into its store-path. # See also https://github.com/lau/tzdata#data-directory-and-releases - PLAUSIBLE_TZDATA = "/var/lib/plausible/elixir_tzdata"; + TZDATA_DIR = "/var/lib/plausible/elixir_tzdata"; # Configuration options from # https://plausible.io/docs/self-hosting-configuration diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index eb14bf5f4915..45e11f0270e6 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "plausible"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 1fb37dc7ee03..c1cafb49d6af 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, beamPackages, fetchFromGitHub, glibcLocales, cacert -, mkYarnModules, nodejs, fetchpatch, nixosTests +{ lib +, stdenv +, beamPackages +, fetchFromGitHub +, glibcLocales +, cacert +, mkYarnModules +, nodejs +, fetchpatch +, nixosTests }: let @@ -37,7 +45,8 @@ let echo 'module.exports = {}' > $out/node_modules/flatpickr/dist/postcss.config.js ''; }; -in beamPackages.mixRelease { +in +beamPackages.mixRelease { inherit pname version src mixFodDeps; nativeBuildInputs = [ nodejs ]; @@ -50,6 +59,10 @@ in beamPackages.mixRelease { sha256 = "sha256-JvJ7xlGw+tHtWje+jiQChVC4KTyqqdq2q+MIcOv/k1o="; }) + # Ensure that `tzdata` doesn't write into its store-path + # https://github.com/plausible/analytics/pull/1096, but rebased onto 1.3.0 + ./tzdata-rebased.patch + # CREATE EXTENSION requires super-user privileges. To avoid that, we just skip # the responsible SQL statement here and take care of it in the module. ./skip-create-ext.patch @@ -60,25 +73,13 @@ in beamPackages.mixRelease { updateScript = ./update.sh; }; - postPatch = '' - # Without this modification, tzdata tries to write in its store-path: - # https://github.com/lau/tzdata#data-directory-and-releases - echo 'config :tzdata, :data_dir, (System.get_env("PLAUSIBLE_TZDATA") || "/tmp/plausible_tzdata")' \ - >> config/config.exs - ''; - - buildPhase = '' - runHook preBuild - - mkdir -p $out + postBuild = '' ln -sf ${yarnDeps}/node_modules assets/node_modules npm run deploy --prefix ./assets # for external task you need a workaround for the no deps check flag # https://github.com/phoenixframework/phoenix/issues/2690 mix do deps.loadpaths --no-deps-check, phx.digest - - runHook postBuild ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/plausible/tzdata-rebased.patch b/pkgs/servers/web-apps/plausible/tzdata-rebased.patch new file mode 100644 index 000000000000..462ab3cb6d6e --- /dev/null +++ b/pkgs/servers/web-apps/plausible/tzdata-rebased.patch @@ -0,0 +1,21 @@ +diff --git a/config/runtime.exs b/config/runtime.exs +index 7c9cc14..8facd05 100644 +--- a/config/runtime.exs ++++ b/config/runtime.exs +@@ -15,9 +15,7 @@ end + base_url = URI.parse(base_url) + + if base_url.scheme not in ["http", "https"] do +- raise "BASE_URL must start with `http` or `https`. Currently configured as `#{ +- System.get_env("BASE_URL") +- }`" ++ raise "BASE_URL must start with `http` or `https`. Currently configured as `#{System.get_env("BASE_URL")}`" + end + + secret_key_base = +@@ -300,3 +298,5 @@ if appsignal_api_key do + env: env, + active: true + end ++ ++config :tzdata, :data_dir, System.get_env("TZDATA_DIR", "priv") From c4afcbb77ecaa57534bdf4c827bd8fcdd23b505a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Jun 2021 11:48:02 +0200 Subject: [PATCH 655/664] plausible: remove create extension patch Turns out this isn't needed if the module correctly adds the `citext` extension to the `plausible` database. --- pkgs/servers/web-apps/plausible/default.nix | 8 ++++---- .../web-apps/plausible/skip-create-ext.patch | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/servers/web-apps/plausible/skip-create-ext.patch diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index c1cafb49d6af..bf408551a44e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -27,6 +27,10 @@ let pname = "${pname}-deps"; inherit src version; sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6"; + + # We need ecto 3.6 as this version checks whether the database exists before + # trying to create it. The creation attempt would always require super-user privileges + # and since 3.6 this isn't the case anymore. patches = [ ./ecto_sql-fix.patch ]; }; @@ -62,10 +66,6 @@ beamPackages.mixRelease { # Ensure that `tzdata` doesn't write into its store-path # https://github.com/plausible/analytics/pull/1096, but rebased onto 1.3.0 ./tzdata-rebased.patch - - # CREATE EXTENSION requires super-user privileges. To avoid that, we just skip - # the responsible SQL statement here and take care of it in the module. - ./skip-create-ext.patch ]; passthru = { diff --git a/pkgs/servers/web-apps/plausible/skip-create-ext.patch b/pkgs/servers/web-apps/plausible/skip-create-ext.patch deleted file mode 100644 index ad9defadf9a5..000000000000 --- a/pkgs/servers/web-apps/plausible/skip-create-ext.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/priv/repo/migrations/20190430140411_use_citext_for_email.exs b/priv/repo/migrations/20190430140411_use_citext_for_email.exs -index ecb6f80..f3bf12f 100644 ---- a/priv/repo/migrations/20190430140411_use_citext_for_email.exs -+++ b/priv/repo/migrations/20190430140411_use_citext_for_email.exs -@@ -2,10 +2,6 @@ defmodule Plausible.Repo.Migrations.UseCitextForEmail do - use Ecto.Migration - - def change do -- execute "CREATE EXTENSION IF NOT EXISTS citext;" -- -- alter table(:users) do -- modify :email, :citext, null: false -- end -+ execute "ALTER TABLE users ALTER COLUMN email TYPE citext;" - end - end From ed228206464bb120234a31c357b45bfe9142682f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 23 Jan 2021 14:13:58 +0100 Subject: [PATCH 656/664] lammps: stable_22Aug2018 -> stable_29Oct2020 --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 51ce64115ea5..4f5423863a28 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -12,14 +12,14 @@ let packages = [ in stdenv.mkDerivation rec { # LAMMPS has weird versioning converted to ISO 8601 format - version = "stable_22Aug2018"; + version = "stable_29Oct2020"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = version; - sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj"; + sha256 = "1rmi9r5wj2z49wg43xyhqn9sm37n95cyli3g7vrqk3ww35mmh21q"; }; passthru = { From dd9bc408afaf8771982c12a7f5be61919883c967 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 23 Jan 2021 14:21:10 +0100 Subject: [PATCH 657/664] lammps: update GPL2 license field --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 4f5423863a28..c377d961820e 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). ''; - homepage = "http://lammps.sandia.gov"; - license = licenses.gpl2; + homepage = "https://lammps.sandia.gov"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.costrouc ]; }; From a38d9eee54dd8d2e8179308454fe142af988ac3f Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 07:29:34 +0900 Subject: [PATCH 658/664] vscode-extentions.kahole.magit: init 0.6.13 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 09365d188698..341999c81952 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -660,6 +660,18 @@ let }; }; + kahole.magit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "magit"; + publisher = "kahole"; + version = "0.6.13"; + sha256 = "sha256-/SeGQV0UEqBk69cAmUXFc/OfPxNssvzZqa7NmAMQD1k="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; From adebd58bd993240c4d60df47c447d0b1908b8a64 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 07:37:03 +0900 Subject: [PATCH 659/664] vscode-extensions.bodil.file-browser: init 0.2.10 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 341999c81952..ee3cece33f09 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -135,6 +135,18 @@ let }; }; + bodil.file-browser = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "file-browser"; + publisher = "bodil"; + version = "0.2.10"; + sha256 = "sha256-RW4vm0Hum9AeN4Rq7MSJOIHnALU0L1tBLKjaRLA2hL8="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; From 90cd733c3224525309c035f9bc174e4679f6bbe0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 07:43:37 +0900 Subject: [PATCH 660/664] vscode-extensions.vspacecode.vspacecode: init 0.9.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ee3cece33f09..c66c7855d6ce 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1116,6 +1116,18 @@ let }; }; + VSpaceCode.vspacecode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vspacecode"; + publisher = "VSpaceCode"; + version = "0.9.1"; + sha256 = "sha256-/qJKYXR0DznqwF7XuJsz+OghIBzdWjm6dAlaRX4wdRU="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + xaver.clang-format = buildVscodeMarketplaceExtension { mktplcRef = { name = "clang-format"; From 3def6f1bd41b8effc331e512bbd30588033da990 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 07:56:48 +0900 Subject: [PATCH 661/664] vscode-extensions.tiehuis.zig: init 0.2.5 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c66c7855d6ce..9de2c431e5f7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1040,6 +1040,19 @@ let }; }; + tiehuis.zig = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "zig"; + publisher = "tiehuis"; + version = "0.2.5"; + sha256 = "sha256-P8Sep0OtdchTfnudxFNvIK+SW++TyibGVI9zd+B5tu4="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + timonwong.shellcheck = buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; From 00b135a30a57286d0dbf164fc5fb81a9e8222008 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 11:58:44 +0900 Subject: [PATCH 662/664] vscode-extensions.jackebecker.elixir-ls: init 0.7.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 9de2c431e5f7..b95f5735da43 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -607,6 +607,18 @@ let }; }; + JakeBecker.elixir-ls = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elixir-ls"; + publisher = "JakeBecker"; + version = "0.7.0"; + sha256 = "sha256-kFrkElD7qC1SpOx1rpcHW1D2hybHCf7cqvIO7JfPuMc="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; From 16a47f259713cc34518fe9df0a62f18022e9011d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 2 Jun 2021 14:12:36 +0200 Subject: [PATCH 663/664] terraform-providers.aws: 3.39.0 -> 3.43.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4171aa4da2a..929c3a27c67f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.39.0", - "sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg", - "vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb", - "version": "3.39.0" + "rev": "v3.43.0", + "sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj", + "vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk", + "version": "3.43.0" }, "azuread": { "owner": "hashicorp", From 9453ad371c7c3be52859dd2ba493be0e892ded5b Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 2 Jun 2021 20:38:13 +0900 Subject: [PATCH 664/664] vscode-extensions.vspacecode.whichkey: init 0.8.5 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b95f5735da43..4e7713bdc5fd 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1153,6 +1153,18 @@ let }; }; + VSpaceCode.whichkey = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "whichkey"; + publisher = "VSpaceCode"; + version = "0.8.5"; + sha256 = "sha256-p5fukIfk/tZFQrkf6VuT4fjmeGtKAqHDh6r6ky847ks="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + xaver.clang-format = buildVscodeMarketplaceExtension { mktplcRef = { name = "clang-format";