diff --git a/third_party/nixpkgs/.github/STALE-BOT.md b/third_party/nixpkgs/.github/STALE-BOT.md
index 3b1599baeb..7b3f013710 100644
--- a/third_party/nixpkgs/.github/STALE-BOT.md
+++ b/third_party/nixpkgs/.github/STALE-BOT.md
@@ -7,11 +7,12 @@
## Suggestions for PRs
-1. If it is unfinished but you plan to finish it, please mark it as a draft.
-2. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
-3. To get things rolling again, rebase the PR against the target branch and address valid comments.
-4. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
-5. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
+1. GitHub sometimes doesn't notify people who commented / reviewed a PR previously, when you (force) push commits. If you have addressed the reviews you can [officially ask for a review](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from those who commented to you or anyone else.
+2. If it is unfinished but you plan to finish it, please mark it as a draft.
+3. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
+4. To get things rolling again, rebase the PR against the target branch and address valid comments.
+5. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
+6. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
## Suggestions for issues
diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md
new file mode 100644
index 0000000000..d4cab056c7
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md
@@ -0,0 +1,70 @@
+# Fetchers {#chap-pkgs-fetchers}
+
+When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
+
+The two fetcher primitives are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.
+
+```nix
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "hello";
+ src = fetchurl {
+ url = "http://www.example.org/hello.tar.gz";
+ sha256 = "1111111111111111111111111111111111111111111111111111";
+ };
+}
+```
+
+The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
+
+`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
+
+
+Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.
+
+## `fetchsvn`
+
+Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha256`.
+
+## `fetchgit`
+
+Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`.
+
+## `fetchfossil`
+
+Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `sha256`.
+
+## `fetchcvs`
+
+Used with CVS. Expects `cvsRoot`, `tag`, and `sha256`.
+
+## `fetchhg`
+
+Used with Mercurial. Expects `url`, `rev`, and `sha256`.
+
+A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
+
+## `fetchFromGitHub`
+
+`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred.
+
+## `fetchFromGitLab`
+
+This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
+
+## `fetchFromGitiles`
+
+This is used with Gitiles repositories. The arguments expected are similar to fetchgit.
+
+## `fetchFromBitbucket`
+
+This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above.
+
+## `fetchFromSavannah`
+
+This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
+
+## `fetchFromRepoOrCz`
+
+This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
diff --git a/third_party/nixpkgs/doc/builders/fetchers.xml b/third_party/nixpkgs/doc/builders/fetchers.xml
deleted file mode 100644
index f07c310dcd..0000000000
--- a/third_party/nixpkgs/doc/builders/fetchers.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-
- Fetchers
-
- When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way.
-
-
- The two fetcher primitives are fetchurl and fetchzip . Both of these have two required arguments, a URL and a hash. The hash is typically sha256 , although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use sha256 . This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.
-
-
-
- The main difference between fetchurl and fetchzip is in how they store the contents. fetchurl will store the unaltered contents of the URL within the Nix store. fetchzip on the other hand will decompress the archive for you, making files and directories directly accessible in the future. fetchzip can only be used with archives. Despite the name, fetchzip is not limited to .zip files and can also be used with any tarball.
-
-
- fetchpatch works very similarly to fetchurl with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
-
-
- Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward names based on the name of the command used with the VCS system. Because they give you a working repository, they act most like fetchzip .
-
-
-
-
- fetchsvn
-
-
-
- Used with Subversion. Expects url to a Subversion directory, rev , and sha256 .
-
-
-
-
-
- fetchgit
-
-
-
- Used with Git. Expects url to a Git repo, rev , and sha256 . rev in this case can be full the git commit id (SHA1 hash) or a tag name like refs/tags/v1.0 .
-
-
-
-
-
- fetchfossil
-
-
-
- Used with Fossil. Expects url to a Fossil archive, rev , and sha256 .
-
-
-
-
-
- fetchcvs
-
-
-
- Used with CVS. Expects cvsRoot , tag , and sha256 .
-
-
-
-
-
- fetchhg
-
-
-
- Used with Mercurial. Expects url , rev , and sha256 .
-
-
-
-
-
- A number of fetcher functions wrap part of fetchurl and fetchzip . They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
-
-
-
-
- fetchFromGitHub
-
-
-
- fetchFromGitHub expects four arguments. owner is a string corresponding to the GitHub user or organization that controls this repository. repo corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as owner /repo . rev corresponds to the Git commit hash or tag (e.g v1.0 ) that will be downloaded from Git. Finally, sha256 corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but sha256 is currently preferred.
-
-
-
-
-
- fetchFromGitLab
-
-
-
- This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
-
-
-
-
-
- fetchFromGitiles
-
-
-
- This is used with Gitiles repositories. The arguments expected
- are similar to fetchgit.
-
-
-
-
-
- fetchFromBitbucket
-
-
-
- This is used with BitBucket repositories. The arguments expected are very similar to fetchFromGitHub above.
-
-
-
-
-
- fetchFromSavannah
-
-
-
- This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
-
-
-
-
-
- fetchFromRepoOrCz
-
-
-
- This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
-
-
-
-
-
diff --git a/third_party/nixpkgs/doc/builders/packages/firefox.section.md b/third_party/nixpkgs/doc/builders/packages/firefox.section.md
index 28fa3f0dbd..acf31e188c 100644
--- a/third_party/nixpkgs/doc/builders/packages/firefox.section.md
+++ b/third_party/nixpkgs/doc/builders/packages/firefox.section.md
@@ -9,7 +9,7 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th
myFirefox = wrapFirefox firefox-unwrapped {
nixExtensions = [
(fetchFirefoxAddon {
- name = "ublock";
+ name = "ublock"; # Has to be unique!
url = "https://addons.mozilla.org/firefox/downloads/file/3679754/ublock_origin-1.31.0-an+fx.xpi";
sha256 = "1h768ljlh3pi23l27qp961v1hd0nbj2vasgy11bmcrlqp40zgvnr";
})
@@ -42,7 +42,7 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th
If `nixExtensions != null` then all manually installed addons will be uninstalled from your browser profile.
To view available enterprise policies visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
or type into the Firefox url bar: `about:policies#documentation`.
-Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed.
+Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings.
## Troubleshooting {#sec-firefox-troubleshooting}
If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode.
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml
index c7a4aa9f47..732560ec19 100644
--- a/third_party/nixpkgs/doc/builders/packages/index.xml
+++ b/third_party/nixpkgs/doc/builders/packages/index.xml
@@ -14,11 +14,11 @@
-
+
-
+
diff --git a/third_party/nixpkgs/doc/builders/packages/locales.section.md b/third_party/nixpkgs/doc/builders/packages/locales.section.md
new file mode 100644
index 0000000000..e5a0370048
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/packages/locales.section.md
@@ -0,0 +1,5 @@
+# Locales {#locales}
+
+To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
+
+On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
diff --git a/third_party/nixpkgs/doc/builders/packages/locales.xml b/third_party/nixpkgs/doc/builders/packages/locales.xml
deleted file mode 100644
index 44fdef034e..0000000000
--- a/third_party/nixpkgs/doc/builders/packages/locales.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
- Locales
-
-
- To allow simultaneous use of packages linked against different versions of glibc with different locale archive formats Nixpkgs patches glibc to rely on LOCALE_ARCHIVE environment variable.
-
-
-
- On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the LOCALE_ARCHIVE variable pointing to ${glibcLocales}/lib/locale/locale-archive . The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters allLocales and locales of the package.
-
-
diff --git a/third_party/nixpkgs/doc/builders/packages/steam.section.md b/third_party/nixpkgs/doc/builders/packages/steam.section.md
new file mode 100644
index 0000000000..e33f1192f7
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/packages/steam.section.md
@@ -0,0 +1,69 @@
+# Steam {#sec-steam}
+
+## Steam in Nix {#sec-steam-nix}
+
+Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME.
+
+Nix problems and constraints:
+
+- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.
+- We don't have the dynamic loader in `/lib`.
+- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.
+- The steam binary cannot be patched, it's also checked.
+
+The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
+
+## How to play {#sec-steam-play}
+
+Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
+
+## Troubleshooting {#sec-steam-troub}
+
+- **Steam fails to start. What do I do?**
+ Try to run
+
+ ```ShellSession
+ strace steam
+ ```
+
+ to see what is causing steam to fail.
+
+- **Using the FOSS Radeon or nouveau (nvidia) drivers**
+
+ - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore.
+ - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error
+ ```
+ steam.sh: line 713: 7842 Segmentation fault (core dumped)
+ ```
+ have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269).
+
+- **Java**
+
+ 1. There is no java in steam chrootenv by default. If you get a message like
+
+ ```
+ /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
+ ```
+
+ You need to add
+
+ ```nix
+ steam.override { withJava = true; };
+ ```
+
+## steam-run {#sec-steam-run}
+
+The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add
+
+```nix
+pkgs.steam.override ({
+ nativeOnly = true;
+ newStdcpp = true;
+ }).run
+```
+
+to your configuration, rebuild, and run the game with
+
+```
+steam-run ./foo
+```
diff --git a/third_party/nixpkgs/doc/builders/packages/steam.xml b/third_party/nixpkgs/doc/builders/packages/steam.xml
deleted file mode 100644
index 59673328ba..0000000000
--- a/third_party/nixpkgs/doc/builders/packages/steam.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-
- Steam
-
-
- Steam in Nix
-
-
- Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME.
-
-
-
- Nix problems and constraints:
-
-
-
- We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python .
-
-
-
-
- We don't have the dynamic loader in /lib .
-
-
-
-
- The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam.
-
-
-
-
- The steam binary cannot be patched, it's also checked.
-
-
-
-
-
-
- The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
-
-
-
-
- How to play
-
-
- Use programs.steam.enable = true; if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
-
-
-
-
- Troubleshooting
-
-
-
-
-
- Steam fails to start. What do I do?
-
-
-
- Try to run
-strace steam
- to see what is causing steam to fail.
-
-
-
-
-
- Using the FOSS Radeon or nouveau (nvidia) drivers
-
-
-
-
-
- The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore.
-
-
-
-
- Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error
-steam.sh: line 713: 7842 Segmentation fault (core dumped)
- have a look at this pull request.
-
-
-
-
-
-
-
- Java
-
-
-
-
-
- There is no java in steam chrootenv by default. If you get a message like
-/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
- You need to add
- steam.override { withJava = true; };
- to your configuration.
-
-
-
-
-
-
-
-
-
-
- steam-run
-
-
- The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add
-pkgs.(steam.override {
- nativeOnly = true;
- newStdcpp = true;
- }).run
- to your configuration, rebuild, and run the game with
-steam-run ./foo
-
-
-
diff --git a/third_party/nixpkgs/doc/builders/special.xml b/third_party/nixpkgs/doc/builders/special.xml
index 15fdba9a04..8902ce5c81 100644
--- a/third_party/nixpkgs/doc/builders/special.xml
+++ b/third_party/nixpkgs/doc/builders/special.xml
@@ -5,6 +5,6 @@
This chapter describes several special builders.
-
-
+
+
diff --git a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
new file mode 100644
index 0000000000..512a31cae0
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
@@ -0,0 +1,45 @@
+# buildFHSUserEnv {#sec-fhs-environments}
+
+`buildFHSUserEnv` provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound `/nix/store`, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are:
+
+- `name`
+ Environment name.
+- `targetPkgs`
+ Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.
+- `multiPkgs`
+ Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default.
+- `extraBuildCommands`
+ Additional commands to be executed for finalizing the directory structure.
+- `extraBuildCommandsMulti`
+ Like `extraBuildCommands`, but executed only on multilib architectures.
+- `extraOutputsToInstall`
+ Additional derivation outputs to be linked for both target and multi-architecture packages.
+- `extraInstallCommands`
+ Additional commands to be executed for finalizing the derivation with runner script.
+- `runScript`
+ A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`.
+
+One can create a simple environment using a `shell.nix` like that:
+
+```nix
+{ pkgs ? import {} }:
+
+(pkgs.buildFHSUserEnv {
+ name = "simple-x11-env";
+ targetPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]) ++ (with pkgs.xorg;
+ [ libX11
+ libXcursor
+ libXrandr
+ ]);
+ multiPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]);
+ runScript = "bash";
+}).env
+```
+
+Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported.
diff --git a/third_party/nixpkgs/doc/builders/special/fhs-environments.xml b/third_party/nixpkgs/doc/builders/special/fhs-environments.xml
deleted file mode 100644
index e7b81e97a2..0000000000
--- a/third_party/nixpkgs/doc/builders/special/fhs-environments.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
- buildFHSUserEnv
-
-
- buildFHSUserEnv provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound /nix/store , so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are:
-
-
-
-
-
- name
-
-
-
- Environment name.
-
-
-
-
-
- targetPkgs
-
-
-
- Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.
-
-
-
-
-
- multiPkgs
-
-
-
- Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default.
-
-
-
-
-
- extraBuildCommands
-
-
-
- Additional commands to be executed for finalizing the directory structure.
-
-
-
-
-
- extraBuildCommandsMulti
-
-
-
- Like extraBuildCommands , but executed only on multilib architectures.
-
-
-
-
-
- extraOutputsToInstall
-
-
-
- Additional derivation outputs to be linked for both target and multi-architecture packages.
-
-
-
-
-
- extraInstallCommands
-
-
-
- Additional commands to be executed for finalizing the derivation with runner script.
-
-
-
-
-
- runScript
-
-
-
- A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to bash .
-
-
-
-
-
-
- One can create a simple environment using a shell.nix like that:
-
-
- {} }:
-
-(pkgs.buildFHSUserEnv {
- name = "simple-x11-env";
- targetPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]) ++ (with pkgs.xorg;
- [ libX11
- libXcursor
- libXrandr
- ]);
- multiPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]);
- runScript = "bash";
-}).env
-]]>
-
-
- Running nix-shell would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change runScript to the application path, e.g. ./bin/start.sh -- relative paths are supported.
-
-
diff --git a/third_party/nixpkgs/doc/builders/special/mkshell.section.md b/third_party/nixpkgs/doc/builders/special/mkshell.section.md
new file mode 100644
index 0000000000..1feb75cbd6
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/special/mkshell.section.md
@@ -0,0 +1,15 @@
+# pkgs.mkShell {#sec-pkgs-mkShell}
+
+`pkgs.mkShell` is a special kind of derivation that is only useful when using it combined with `nix-shell`. It will in fact fail to instantiate when invoked with `nix-build`.
+
+## Usage {#sec-pkgs-mkShell-usage}
+
+```nix
+{ pkgs ? import {} }:
+pkgs.mkShell {
+ # this will make all the build inputs from hello and gnutar
+ # available to the shell environment
+ inputsFrom = with pkgs; [ hello gnutar ];
+ buildInputs = [ pkgs.gnumake ];
+}
+```
diff --git a/third_party/nixpkgs/doc/builders/special/mkshell.xml b/third_party/nixpkgs/doc/builders/special/mkshell.xml
deleted file mode 100644
index cef65d06b8..0000000000
--- a/third_party/nixpkgs/doc/builders/special/mkshell.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- pkgs.mkShell
-
-
- pkgs.mkShell is a special kind of derivation that is only useful when using it combined with nix-shell . It will in fact fail to instantiate when invoked with nix-build .
-
-
-
- Usage
-
- {} }:
-pkgs.mkShell {
- # this will make all the build inputs from hello and gnutar
- # available to the shell environment
- inputsFrom = with pkgs; [ hello gnutar ];
- buildInputs = [ pkgs.gnumake ];
-}
-]]>
-
-
diff --git a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md
new file mode 100644
index 0000000000..c39803fbe3
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md
@@ -0,0 +1,52 @@
+# Trivial builders {#chap-trivial-builders}
+
+Nixpkgs provides a couple of functions that help with building derivations. The most important one, `stdenv.mkDerivation`, has already been documented above. The following functions wrap `stdenv.mkDerivation`, making it easier to use in certain cases.
+
+## `runCommand` {#trivial-builder-runCommand}
+
+This takes three arguments, `name`, `env`, and `buildCommand`. `name` is just the name that Nix will append to the store path in the same way that `stdenv.mkDerivation` uses its `name` attribute. `env` is an attribute set specifying environment variables that will be set for this derivation. These attributes are then passed to the wrapped `stdenv.mkDerivation`. `buildCommand` specifies the commands that will be run to create this derivation. Note that you will need to create `$out` for Nix to register the command as successful.
+
+An example of using `runCommand` is provided below.
+
+```nix
+(import {}).runCommand "my-example" {} ''
+ echo My example command is running
+
+ mkdir $out
+
+ echo I can write data to the Nix store > $out/message
+
+ echo I can also run basic commands like:
+
+ echo ls
+ ls
+
+ echo whoami
+ whoami
+
+ echo date
+ date
+''
+```
+
+## `runCommandCC` {#trivial-builder-runCommandCC}
+
+This works just like `runCommand`. The only difference is that it also provides a C compiler in `buildCommand`'s environment. To minimize your dependencies, you should only use this if you are sure you will need a C compiler as part of running your command.
+
+## `runCommandLocal` {#trivial-builder-runCommandLocal}
+
+Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
+
+::: {.note}
+This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.
+:::
+
+## `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin` {#trivial-builder-writeText}
+
+These functions write `text` to the Nix store. This is useful for creating scripts from Nix expressions. `writeTextFile` takes an attribute set and expects two arguments, `name` and `text`. `name` corresponds to the name used in the Nix store path. `text` will be the contents of the file. You can also set `executable` to true to make this file have the executable bit set.
+
+Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, `writeScript`, and `writeScriptBin`. These are convenience functions over `writeTextFile`.
+
+## `symlinkJoin` {#trivial-builder-symlinkJoin}
+
+This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
diff --git a/third_party/nixpkgs/doc/builders/trivial-builders.xml b/third_party/nixpkgs/doc/builders/trivial-builders.xml
deleted file mode 100644
index 94948c57b9..0000000000
--- a/third_party/nixpkgs/doc/builders/trivial-builders.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
- Trivial builders
-
- Nixpkgs provides a couple of functions that help with building derivations. The most important one, stdenv.mkDerivation , has already been documented above. The following functions wrap stdenv.mkDerivation , making it easier to use in certain cases.
-
-
-
-
- runCommand
-
-
-
- This takes three arguments, name , env , and buildCommand . name is just the name that Nix will append to the store path in the same way that stdenv.mkDerivation uses its name attribute. env is an attribute set specifying environment variables that will be set for this derivation. These attributes are then passed to the wrapped stdenv.mkDerivation . buildCommand specifies the commands that will be run to create this derivation. Note that you will need to create $out for Nix to register the command as successful.
-
-
- An example of using runCommand is provided below.
-
-
-(import <nixpkgs> {}).runCommand "my-example" {} ''
- echo My example command is running
-
- mkdir $out
-
- echo I can write data to the Nix store > $out/message
-
- echo I can also run basic commands like:
-
- echo ls
- ls
-
- echo whoami
- whoami
-
- echo date
- date
-''
-
-
-
-
-
- runCommandCC
-
-
-
- This works just like runCommand . The only difference is that it also provides a C compiler in buildCommand ’s environment. To minimize your dependencies, you should only use this if you are sure you will need a C compiler as part of running your command.
-
-
-
-
-
- runCommandLocal
-
-
-
- Variant of runCommand that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
-
-
- This sets allowSubstitutes to false , so only use runCommandLocal if you are certain the user will always have a builder for the system of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the system is usually the same as builtins.currentSystem .
-
-
-
-
-
- writeTextFile , writeText , writeTextDir , writeScript , writeScriptBin
-
-
-
- These functions write text to the Nix store. This is useful for creating scripts from Nix expressions. writeTextFile takes an attribute set and expects two arguments, name and text . name corresponds to the name used in the Nix store path. text will be the contents of the file. You can also set executable to true to make this file have the executable bit set.
-
-
- Many more commands wrap writeTextFile including writeText , writeTextDir , writeScript , and writeScriptBin . These are convenience functions over writeTextFile .
-
-
-
-
-
- symlinkJoin
-
-
-
- This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, name , and paths . name is the name used in the Nix store path for the created derivation. paths is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
-
-
-
-
-
diff --git a/third_party/nixpkgs/doc/languages-frameworks/php.section.md b/third_party/nixpkgs/doc/languages-frameworks/php.section.md
index 763beeb593..5977363323 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/php.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/php.section.md
@@ -135,3 +135,21 @@ Example of building `composer` with additional extensions:
enabled ++ (with all; [ imagick redis ]))
).packages.composer
```
+
+### Overriding PHP packages {#ssec-php-user-guide-overriding-packages}
+
+`php-packages.nix` form a scope, allowing us to override the packages defined within. For example, to apply a patch to a `mysqlnd` extension, you can simply pass an overlay-style function to `php`’s `packageOverrides` argument:
+
+```nix
+php.override {
+ packageOverrides = final: prev: {
+ extensions = prev.extensions // {
+ mysqlnd = prev.extensions.mysqlnd.overrideAttrs (attrs: {
+ patches = attrs.patches or [] ++ [
+ …
+ ];
+ });
+ };
+ };
+}
+```
diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml
index 2c75bd4ec0..8cecb01fc2 100644
--- a/third_party/nixpkgs/doc/manual.xml
+++ b/third_party/nixpkgs/doc/manual.xml
@@ -18,13 +18,13 @@
-
+
Builders
-
-
+
+
diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md
new file mode 100644
index 0000000000..d7a07a621b
--- /dev/null
+++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md
@@ -0,0 +1,197 @@
+# Cross-compilation {#chap-cross}
+
+## Introduction {#sec-cross-intro}
+
+"Cross-compilation" means compiling a program on one machine for another type of machine. For example, a typical use of cross-compilation is to compile programs for embedded devices. These devices often don't have the computing power and memory to compile their own programs. One might think that cross-compilation is a fairly niche concern. However, there are significant advantages to rigorously distinguishing between build-time and run-time environments! Significant, because the benefits apply even when one is developing and deploying on the same machine. Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and Nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
+
+This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation.
+
+
+## Packaging in a cross-friendly manner {#sec-cross-packaging}
+
+### Platform parameters {#ssec-cross-platform-parameters}
+
+Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html). We distinguish between 3 types of platforms when building a derivation: _build_, _host_, and _target_. In summary, _build_ is the platform on which a package is being built, _host_ is the platform on which it will run. The third attribute, _target_, is relevant only for certain specific compilers and build tools.
+
+In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like:
+
+```nix
+{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
+```
+
+`buildPlatform`
+
+: The "build platform" is the platform on which a package is built. Once someone has a built package, or pre-built binary package, the build platform should not matter and can be ignored.
+
+`hostPlatform`
+
+: The "host platform" is the platform on which a package will be run. This is the simplest platform to understand, but also the one with the worst name.
+
+`targetPlatform`
+
+: The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages.
+
+: The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. The task of specifying this single "target platform" is thus pushed to build time of the compiler. The root cause of this is that the compiler (which will be run on the host) and the standard library/runtime (which will be run on the target) are built by a single build process.
+
+: There is no fundamental need to think about a single target ahead of time like this. If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. An example of such a tool is LLVM.
+
+: Although the existence of a "target platform" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is.
+
+The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. You can see examples of ones used in practice in `lib.systems.examples`; note how they are not all very consistent. For now, here are few fields can count on them containing:
+
+`system`
+
+: This is a two-component shorthand for the platform. Examples of this would be "x86_64-darwin" and "i686-linux"; see `lib.systems.doubles` for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform (`[cpu]-[os]`). This format has built-in support in Nix, such as the `builtins.currentSystem` impure string.
+
+`config`
+
+: This is a 3- or 4- component shorthand for the platform. Examples of this would be `x86_64-unknown-linux-gnu` and `aarch64-apple-darwin14`. This is a standard format called the "LLVM target triple", as they are pioneered by LLVM. In the 4-part form, this corresponds to `[cpu]-[vendor]-[os]-[abi]`. This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. This needs a better name than `config`!
+
+`parsed`
+
+: This is a Nix representation of a parsed LLVM target triple with white-listed components. This can be specified directly, or actually parsed from the `config`. See `lib.systems.parse` for the exact representation.
+
+`libc`
+
+: This is a string identifying the standard C library used. Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. It should probably be refactored to use the module system, like `parse`.
+
+`is*`
+
+: These predicates are defined in `lib.systems.inspect`, and slapped onto every platform. They are superior to the ones in `stdenv` as they force the user to be explicit about which platform they are inspecting. Please use these instead of those.
+
+`platform`
+
+: This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). See `lib.systems.platforms` for examples—there's hopefully one in there that will work verbatim for each platform that is working. Please help us triage these flags and give them better homes!
+
+### Theory of dependency categorization {#ssec-cross-dependency-categorization}
+
+::: note
+This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to `mkDerivation`, see . For a description of how everything is implemented, see .
+:::
+
+In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms.
+
+A run time dependency between two packages requires that their host platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": The package dependency exists while both packages are running on a single host platform.
+
+A build time dependency, however, has a shift in platforms between the depending package and the depended-on package. "build time dependency" means that to build the depending package we need to be able to run the depended-on's package. The depending package's build platform is therefore equal to the depended-on package's host platform.
+
+If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed `buildInputs` and `nativeBuildInputs` have covered these simpler cases for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them.
+
+Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source languages' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler.
+
+Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:
+
+
+#### Possible dependency types
+| Dependency's host platform | Dependency's target platform |
+| -- | -- |
+| build | build |
+| build | host |
+| build | target |
+| host | host |
+| host | target |
+| target | target |
+
+
+Some examples will make this table clearer. Suppose there's some package that is being built with a `(build, host, target)` platform triple of `(foo, bar, baz)`. If it has a build-time library dependency, that would be a "host → build" dependency with a triple of `(foo, foo, *)` (the target platform is irrelevant). If it needs a compiler to be built, that would be a "build → host" dependency with a triple of `(foo, foo, *)` (the target platform is irrelevant). That compiler, would be built with another compiler, also "build → host" dependency, with a triple of `(foo, foo, foo)`.
+
+### Cross packaging cookbook {#ssec-cross-cookbook}
+
+Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list!
+
+#### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment}
+Add the following to your `mkDerivation` invocation.
+```nix
+depsBuildBuild = [ buildPackages.stdenv.cc ];
+```
+
+#### My package fails to find `ar`. {#cross-qa-fails-to-find-ar}
+Many packages assume that an unprefixed `ar` is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
+
+#### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code}
+
+Add the following to your `mkDerivation` invocation.
+```nix
+doCheck = stdenv.hostPlatform == stdenv.buildPlatfrom;
+```
+
+## Cross-building packages {#sec-cross-usage}
+
+Nixpkgs can be instantiated with `localSystem` alone, in which case there is no cross-compiling and everything is built by and for that system, or also with `crossSystem`, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, `lib.systems.examples` has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
+
+```ShellSession
+$ nix-build '' --arg crossSystem '(import ).systems.examples.fooBarBaz' -A whatever
+```
+
+::: note
+Eventually we would like to make these platform examples an unnecessary convenience so that
+
+```ShellSession
+$ nix-build '' --arg crossSystem '{ config = "---"; }' -A whatever
+```
+
+works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue [\#34274](https://github.com/NixOS/nixpkgs/issues/34274) tracks this inconvenience along with its root cause in crufty configuration options.
+:::
+
+While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of `system`, `config`, and `parsed` is needed to infer the other two. Additionally, `libc` will be inferred from `parse`. Finally, `localSystem.system` is also _impurely_ inferred based on the platform evaluation occurs. This means it is often not necessary to pass `localSystem` at all, as in the command-line example in the previous paragraph.
+
+::: note
+Many sources (manual, wiki, etc) probably mention passing `system`, `platform`, along with the optional `crossSystem` to Nixpkgs: `import { system = ..; platform = ..; crossSystem = ..; }`. Passing those two instead of `localSystem` is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
+:::
+
+One would think that `localSystem` and `crossSystem` overlap horribly with the three `*Platforms` (`buildPlatform`, `hostPlatform,` and `targetPlatform`; see `stage.nix` or the manual). Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or `buildPackages`, the three platforms will be defined as one of `localSystem` or `crossSystem`, with the former replacing the latter as one traverses build-time dependencies. A last simple difference is that `crossSystem` should be null when one doesn't want to cross-compile, while the `*Platform`s are always non-null. `localSystem` is always non-null.
+
+## Cross-compilation infrastructure {#sec-cross-infra}
+
+### Implementation of dependencies {#ssec-cross-dependency-implementation}
+
+The categories of dependencies developed in are specified as lists of derivations given to `mkDerivation`, as documented in . In short, each list of dependencies for "host → target" of "foo → bar" is called `depsFooBar`, with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `depsFooBar` is automatically taken from `pkgsFooBar`. (These `pkgsFooBar`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time.
+
+Now, for most of Nixpkgs's history, there were no `pkgsFooBar` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
+
+But before that, there was just `pkgs`, even though both `buildInputs` and `nativeBuildInputs` existed. \[Cross barely worked, and those were implemented with some hacks on `mkDerivation` to override dependencies.\] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever `callPackage` gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, _and_ take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
+
+To make this work, we "splice" together the six `pkgsFooBar` package sets and have `callPackage` actually take its arguments from that. This is currently implemented in `pkgs/top-level/splice.nix`. `mkDerivation` then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet.
+
+### Bootstrapping {#ssec-bootstrapping}
+
+Each of the package sets described above come from a single bootstrapping stage. While `pkgs/top-level/default.nix`, coordinates the composition of stages at a high level, `pkgs/top-level/stage.nix` "ties the knot" (creates the fixed point) of each stage. The package sets are defined per-stage however, so they can be thought of as edges between stages (the nodes) in a graph. Compositions like `pkgsBuildTarget.targetPackages` can be thought of as paths to this graph.
+
+While there are many package sets, and thus many edges, the stages can also be arranged in a linear chain. In other words, many of the edges are redundant as far as connectivity is concerned. This hinges on the type of bootstrapping we do. Currently for cross it is:
+
+1. `(native, native, native)`
+
+2. `(native, native, foreign)`
+
+3. `(native, foreign, foreign)`
+
+In each stage, `pkgsBuildHost` refers to the previous stage, `pkgsBuildBuild` refers to the one before that, and `pkgsHostTarget` refers to the current one, and `pkgsTargetTarget` refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. `pkgsBuildTarget` and `pkgsHostHost` are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in `pkgs/stdenv/booter.nix`, and secondarily aliases in `pkgs/top-level/stage.nix`.
+
+::: note
+The native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored in the previous paragraph.
+:::
+
+If one looks at the 3 platform triples, one can see that they overlap such that one could put them together into a chain like:
+```
+(native, native, native, foreign, foreign)
+```
+If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple:
+```
+(native..., native, native, native, foreign, foreign, foreign...)
+```
+On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host".
+
+
+::: note
+It is much better to refer to `buildPackages` than `targetPackages`, or more broadly package sets that do not mention "target". There are three reasons for this.
+
+First, it is because bootstrapping stages do not have a unique `targetPackages`. For example a `(x86-linux, x86-linux, arm-linux)` and `(x86-linux, x86-linux, x86-windows)` package set both have a `(x86-linux, x86-linux, x86-linux)` package set. Because there is no canonical `targetPackages` for such a native (`build == host == target`) package set, we set their `targetPackages`
+
+Second, it is because this is a frequent source of hard-to-follow "infinite recursions" / cycles. When only package sets that don't mention target are used, the package set forms a directed acyclic graph. This means that all cycles that exist are confined to one stage. This means they are a lot smaller, and easier to follow in the code or a backtrace. It also means they are present in native and cross builds alike, and so more likely to be caught by CI and other users.
+
+Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible.
+:::
+
+::: note
+If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.
+:::
diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.xml b/third_party/nixpkgs/doc/stdenv/cross-compilation.xml
deleted file mode 100644
index 690578b78c..0000000000
--- a/third_party/nixpkgs/doc/stdenv/cross-compilation.xml
+++ /dev/null
@@ -1,394 +0,0 @@
-
- Cross-compilation
-
- Introduction
-
-
- "Cross-compilation" means compiling a program on one machine for another type of machine. For example, a typical use of cross-compilation is to compile programs for embedded devices. These devices often don't have the computing power and memory to compile their own programs. One might think that cross-compilation is a fairly niche concern. However, there are significant advantages to rigorously distinguishing between build-time and run-time environments! Significant, because the benefits apply even when one is developing and deploying on the same machine. Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
-
-
-
- This chapter will be organized in three parts. First, it will describe the basics of how to package software in a way that supports cross-compilation. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it will describe the internal infrastructure supporting cross-compilation.
-
-
-
-
- Packaging in a cross-friendly manner
-
-
- Platform parameters
-
-
- Nixpkgs follows the conventions of GNU autoconf. We distinguish between 3 types of platforms when building a derivation: build , host , and target . In summary, build is the platform on which a package is being built, host is the platform on which it will run. The third attribute, target , is relevant only for certain specific compilers and build tools.
-
-
-
- In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform , hostPlatform , and targetPlatform . They are always defined as attributes in the standard environment. That means one can access them like:
-{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
- .
-
-
-
-
-
- buildPlatform
-
-
-
- The "build platform" is the platform on which a package is built. Once someone has a built package, or pre-built binary package, the build platform should not matter and can be ignored.
-
-
-
-
-
- hostPlatform
-
-
-
- The "host platform" is the platform on which a package will be run. This is the simplest platform to understand, but also the one with the worst name.
-
-
-
-
-
- targetPlatform
-
-
-
- The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages.
-
-
- The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. The task of specifying this single "target platform" is thus pushed to build time of the compiler. The root cause of this is that the compiler (which will be run on the host) and the standard library/runtime (which will be run on the target) are built by a single build process.
-
-
- There is no fundamental need to think about a single target ahead of time like this. If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. An example of such a tool is LLVM.
-
-
- Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is.
-
-
-
-
-
-
- The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. You can see examples of ones used in practice in lib.systems.examples ; note how they are not all very consistent. For now, here are few fields can count on them containing:
-
-
-
-
-
- system
-
-
-
- This is a two-component shorthand for the platform. Examples of this would be "x86_64-darwin" and "i686-linux"; see lib.systems.doubles for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform ([cpu]-[os] ). This format has built-in support in Nix, such as the builtins.currentSystem impure string.
-
-
-
-
-
- config
-
-
-
- This is a 3- or 4- component shorthand for the platform. Examples of this would be x86_64-unknown-linux-gnu and aarch64-apple-darwin14 . This is a standard format called the "LLVM target triple", as they are pioneered by LLVM. In the 4-part form, this corresponds to [cpu]-[vendor]-[os]-[abi] . This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. This needs a better name than config !
-
-
-
-
-
- parsed
-
-
-
- This is a Nix representation of a parsed LLVM target triple with white-listed components. This can be specified directly, or actually parsed from the config . See lib.systems.parse for the exact representation.
-
-
-
-
-
- libc
-
-
-
- This is a string identifying the standard C library used. Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. It should probably be refactored to use the module system, like parse .
-
-
-
-
-
- is*
-
-
-
- These predicates are defined in lib.systems.inspect , and slapped onto every platform. They are superior to the ones in stdenv as they force the user to be explicit about which platform they are inspecting. Please use these instead of those.
-
-
-
-
-
- platform
-
-
-
- This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform that is working. Please help us triage these flags and give them better homes!
-
-
-
-
-
-
-
- Theory of dependency categorization
-
-
-
- This is a rather philosophical description that isn't very Nixpkgs-specific. For an overview of all the relevant attributes given to mkDerivation , see . For a description of how everything is implemented, see .
-
-
-
-
- In this section we explore the relationship between both runtime and build-time dependencies and the 3 Autoconf platforms.
-
-
-
- A run time dependency between two packages requires that their host platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": The package dependency exists while both packages are running on a single host platform.
-
-
-
- A build time dependency, however, has a shift in platforms between the depending package and the depended-on package. "build time dependency" means that to build the depending package we need to be able to run the depended-on's package. The depending package's build platform is therefore equal to the depended-on package's host platform.
-
-
-
- If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed buildInputs and nativeBuildInputs have covered these simpler build-time and run-time (respectively) changes for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them.
-
-
-
- Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source langauges' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler.
-
-
-
- Putting this all together, that means we have dependencies in the form "host → target", in at most the following six combinations:
-
- Possible dependency types
-
-
- Dependency's host platform
- Dependency's target platform
-
-
-
-
- build
- build
-
-
- build
- host
-
-
- build
- target
-
-
- host
- host
-
-
- host
- target
-
-
- target
- target
-
-
-
-
-
-
- Some examples will make this table clearer. Suppose there's some package that is being built with a (build, host, target) platform triple of (foo, bar, baz) . If it has a build-time library dependency, that would be a "host → build" dependency with a triple of (foo, foo, *) (the target platform is irrelevant). If it needs a compiler to be built, that would be a "build → host" dependency with a triple of (foo, foo, *) (the target platform is irrelevant). That compiler, would be built with another compiler, also "build → host" dependency, with a triple of (foo, foo, foo) .
-
-
-
-
- Cross packaging cookbook
-
-
- Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list!
-
-
-
-
-
-
- What if my package's build system needs to build a C program to be run under the build environment?
-
-
-
-
-depsBuildBuild = [ buildPackages.stdenv.cc ];
- Add it to your mkDerivation invocation.
-
-
-
-
-
-
- My package fails to find ar .
-
-
-
-
- Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed ar .
-
-
-
-
-
-
- My package's testsuite needs to run host platform code.
-
-
-
-
-doCheck = stdenv.hostPlatform == stdenv.buildPlatfrom;
- Add it to your mkDerivation invocation.
-
-
-
-
-
-
-
-
- Cross-building packages
-
-
- Nixpkgs can be instantiated with localSystem alone, in which case there is no cross-compiling and everything is built by and for that system, or also with crossSystem , in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
-
-nix-build '<nixpkgs>' --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever
-
-
-
-
- Eventually we would like to make these platform examples an unnecessary convenience so that
-
-nix-build '<nixpkgs>' --arg crossSystem '{ config = "<arch>-<os>-<vendor>-<abi>"; }' -A whatever
- works in the vast majority of cases. The problem today is dependencies on other sorts of configuration which aren't given proper defaults. We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options.
-
-
-
-
- While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. As discussed in the previous section, only one of system , config , and parsed is needed to infer the other two. Additionally, libc will be inferred from parse . Finally, localSystem.system is also impurely inferred based on the platform evaluation occurs. This means it is often not necessary to pass localSystem at all, as in the command-line example in the previous paragraph.
-
-
-
-
- Many sources (manual, wiki, etc) probably mention passing system , platform , along with the optional crossSystem to nixpkgs: import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; } . Passing those two instead of localSystem is still supported for compatibility, but is discouraged. Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
-
-
-
-
- One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform , hostPlatform, and targetPlatform ; see stage.nix or the manual). Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or buildPackages , the three platforms will be defined as one of localSystem or crossSystem , with the former replacing the latter as one traverses build-time dependencies. A last simple difference is that crossSystem should be null when one doesn't want to cross-compile, while the *Platform s are always non-null. localSystem is always non-null.
-
-
-
-
- Cross-compilation infrastructure
-
-
- Implementation of dependencies
-
-
- The categorizes of dependencies developed in are specified as lists of derivations given to mkDerivation , as documented in . In short, each list of dependencies for "host → target" of "foo → bar" is called depsFooBar , with exceptions for backwards compatibility that depsBuildHost is instead called nativeBuildInputs and depsHostTarget is instead called buildInputs . Nixpkgs is now structured so that each depsFooBar is automatically taken from pkgsFooBar . (These pkgsFooBar s are quite new, so there is no special case for nativeBuildInputs and buildInputs .) For example, pkgsBuildHost.gcc should be used at build-time, while pkgsHostTarget.gcc should be used at run-time.
-
-
-
- Now, for most of Nixpkgs's history, there were no pkgsFooBar attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just buildPackages , pkgs , and targetPackages . Those are now redefined as aliases to pkgsBuildHost , pkgsHostTarget , and pkgsTargetTarget . It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
-
-
-
- But before that, there was just pkgs , even though both buildInputs and nativeBuildInputs existed. [Cross barely worked, and those were implemented with some hacks on mkDerivation to override dependencies.] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever callPackage gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, and take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
-
-
-
- To make this work, we "splice" together the six pkgsFooBar package sets and have callPackage actually take its arguments from that. This is currently implemented in pkgs/top-level/splice.nix . mkDerivation then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet.
-
-
-
-
- Bootstrapping
-
-
- Each of the package sets described above come from a single bootstrapping stage. While pkgs/top-level/default.nix , coordinates the composition of stages at a high level, pkgs/top-level/stage.nix "ties the knot" (creates the fixed point) of each stage. The package sets are defined per-stage however, so they can be thought of as edges between stages (the nodes) in a graph. Compositions like pkgsBuildTarget.targetPackages can be thought of as paths to this graph.
-
-
-
- While there are many package sets, and thus many edges, the stages can also be arranged in a linear chain. In other words, many of the edges are redundant as far as connectivity is concerned. This hinges on the type of bootstrapping we do. Currently for cross it is:
-
-
-
- (native, native, native)
-
-
-
-
- (native, native, foreign)
-
-
-
-
- (native, foreign, foreign)
-
-
-
- In each stage, pkgsBuildHost refers to the previous stage, pkgsBuildBuild refers to the one before that, and pkgsHostTarget refers to the current one, and pkgsTargetTarget refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. pkgsBuildTarget and pkgsHostHost are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in pkgs/stdenv/booter.nix , and secondarily aliases in pkgs/top-level/stage.nix .
-
-
-
-
- Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
-
-
-
-
- If one looks at the 3 platform triples, one can see that they overlap such that one could put them together into a chain like:
-
-(native, native, native, foreign, foreign)
-
- If one imagines the saturating self references at the end being replaced with infinite stages, and then overlays those platform triples, one ends up with the infinite tuple:
-
-(native..., native, native, native, foreign, foreign, foreign...)
-
- On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstraping stage where build != host != target , more bootstrapping stages are needed since no sliding window providess the pesky pkgsBuildTarget package set since it skips the Canadian cross stage's "host".
-
-
-
-
- It is much better to refer to buildPackages than targetPackages , or more broadly package sets that do not mention "target". There are three reasons for this.
-
-
- First, it is because bootstrapping stages do not have a unique targetPackages . For example a (x86-linux, x86-linux, arm-linux) and (x86-linux, x86-linux, x86-windows) package set both have a (x86-linux, x86-linux, x86-linux) package set. Because there is no canonical targetPackages for such a native (build == host == target ) package set, we set their targetPackages
-
-
- Second, it is because this is a frequent source of hard-to-follow "infinite recursions" / cycles. When only package sets that don't mention target are used, the package set forms a directed acyclic graph. This means that all cycles that exist are confined to one stage. This means they are a lot smaller, and easier to follow in the code or a backtrace. It also means they are present in native and cross builds alike, and so more likely to be caught by CI and other users.
-
-
- Thirdly, it is because everything target-mentioning only exists to accommodate compilers with lousy build systems that insist on the compiler itself and standard library being built together. Of course that is bad because bigger derivations means longer rebuilds. It is also problematic because it tends to make the standard libraries less like other libraries than they could be, complicating code and build systems alike. Because of the other problems, and because of these innate disadvantages, compilers ought to be packaged another way where possible.
-
-
-
-
-
- If one explores Nixpkgs, they will see derivations with names like gccCross . Such *Cross derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with "Cross" in the name covered the build = host != target case, while the other covered the host = target , with build platform the same or not based on whether one was using its .nativeDrv or .crossDrv . This ugliness will disappear soon.
-
-
-
-
-
diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix
index 6e7cd62515..64f10a7f25 100644
--- a/third_party/nixpkgs/lib/licenses.nix
+++ b/third_party/nixpkgs/lib/licenses.nix
@@ -623,6 +623,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "Open Software License 3.0";
};
+ parity70 = spdx {
+ spdxId = "Parity-7.0.0";
+ fullName = "Parity Public License 7.0.0";
+ url = "https://paritylicense.com/versions/7.0.0.html";
+ };
+
php301 = spdx {
spdxId = "PHP-3.01";
fullName = "PHP License v3.01";
diff --git a/third_party/nixpkgs/lib/systems/architectures.nix b/third_party/nixpkgs/lib/systems/architectures.nix
index bfecaec1ae..8e3a56b0d7 100644
--- a/third_party/nixpkgs/lib/systems/architectures.nix
+++ b/third_party/nixpkgs/lib/systems/architectures.nix
@@ -12,6 +12,12 @@ rec {
broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ cannonlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ icelake-client = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ icelake-server = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ cascadelake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ cooperlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ tigerlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
# x86_64 AMD
btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ];
btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
@@ -21,6 +27,7 @@ rec {
bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ];
znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
+ znver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
# other
armv5te = [ ];
armv6 = [ ];
@@ -41,15 +48,38 @@ rec {
broadwell = [ "haswell" ] ++ inferiors.haswell;
skylake = [ "broadwell" ] ++ inferiors.broadwell;
skylake-avx512 = [ "skylake" ] ++ inferiors.skylake;
+
# x86_64 AMD
+ # TODO: fill this (need testing)
btver1 = [ ];
- btver2 = [ ]; # TODO: fill this (need testing)
- bdver1 = [ ]; # TODO: fill this (need testing)
- bdver2 = [ ]; # TODO: fill this (need testing)
- bdver3 = [ ]; # TODO: fill this (need testing)
- bdver4 = [ ]; # TODO: fill this (need testing)
- znver1 = [ ]; # TODO: fill this (need testing)
- znver2 = [ ]; # TODO: fill this (need testing)
+ btver2 = [ ];
+ bdver1 = [ ];
+ bdver2 = [ ];
+ bdver3 = [ ];
+ bdver4 = [ ];
+ # Regarding `skylake` as inferior of `znver1`, there are reports of
+ # successful usage by Gentoo users and Phoronix benchmarking of different
+ # `-march` targets.
+ #
+ # The GCC documentation on extensions used and wikichip documentation
+ # regarding supperted extensions on znver1 and skylake was used to create
+ # this partial order.
+ #
+ # Note:
+ #
+ # - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
+ # which no current AMD Zen michroarch support.
+ # - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
+ # current Intel microarch support.
+ #
+ # https://www.phoronix.com/scan.php?page=article&item=amd-znver3-gcc11&num=1
+ # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
+ # https://en.wikichip.org/wiki/amd/microarchitectures/zen
+ # https://en.wikichip.org/wiki/intel/microarchitectures/skylake
+ znver1 = [ "skylake" ] ++ inferiors.skylake;
+ znver2 = [ "znver1" ] ++ inferiors.znver1;
+ znver3 = [ "znver2" ] ++ inferiors.znver2;
+
# other
armv5te = [ ];
armv6 = [ ];
diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix
index f6832945a2..e31a8e65f2 100644
--- a/third_party/nixpkgs/lib/systems/default.nix
+++ b/third_party/nixpkgs/lib/systems/default.nix
@@ -83,7 +83,7 @@ rec {
if final.isAarch32 then "arm"
else if final.isAarch64 then "arm64"
else if final.isx86_32 then "x86"
- else if final.isx86_64 then "ia64"
+ else if final.isx86_64 then "x86"
else if final.isMips then "mips"
else final.parsed.cpu.name;
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 31093cc4d7..0fa804c1f9 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -100,6 +100,12 @@
githubId = 178750;
name = "Andreas Baldeau";
};
+ abathur = {
+ email = "travis.a.everett+nixpkgs@gmail.com";
+ github = "abathur";
+ githubId = 2548365;
+ name = "Travis A. Everett";
+ };
abbe = {
email = "ashish.is@lostca.se";
github = "wahjava";
@@ -183,7 +189,7 @@
name = "Adrien Devresse";
};
adisbladis = {
- email = "adis@blad.is";
+ email = "adisbladis@gmail.com";
github = "adisbladis";
githubId = 63286;
name = "Adam Hose";
@@ -574,6 +580,12 @@
githubId = 3808928;
name = "Anders Sildnes";
};
+ andys8 = {
+ email = "andys8@users.noreply.github.com";
+ github = "andys8";
+ githubId = 13085980;
+ name = "Andy";
+ };
aneeshusa = {
email = "aneeshusa@gmail.com";
github = "aneeshusa";
@@ -2477,6 +2489,12 @@
githubId = 984691;
name = "Evan Danaher";
};
+ edbentley = {
+ email = "hello@edbentley.dev";
+ github = "edbentley";
+ githubId = 15923595;
+ name = "Ed Bentley";
+ };
edcragg = {
email = "ed.cragg@eipi.xyz";
github = "nuxeh";
@@ -2893,6 +2911,16 @@
githubId = 11909469;
name = "Fabian Geiselhart";
};
+ fab = {
+ email = "mail@fabian-affolter.ch";
+ name = "Fabian Affolter";
+ github = "fabaff";
+ githubId = 116184;
+ keys = [{
+ longkeyid = "dsa1024/0xE23CD2DD36A4397F";
+ fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F";
+ }];
+ };
fabianhauser = {
email = "fabian.nixos@fh2.ch";
github = "fabianhauser";
@@ -4924,6 +4952,12 @@
githubId = 45168934;
name = "Louis Blin";
};
+ lucc = {
+ email = "lucc+nix@posteo.de";
+ github = "lucc";
+ githubId = 1104419;
+ name = "Lucas Hoffmann";
+ };
ldelelis = {
email = "ldelelis@est.frba.utn.edu.ar";
github = "ldelelis";
@@ -5210,6 +5244,10 @@
githubId = 10626;
name = "Andreas Wagner";
};
+ lrworth = {
+ email = "luke@worth.id.au";
+ name = "Luke Worth";
+ };
lschuermann = {
email = "leon.git@is.currently.online";
github = "lschuermann";
@@ -6695,6 +6733,12 @@
githubId = 1449319;
name = "Pacien Tran-Girard";
};
+ pacman99 = {
+ email = "pachum99@gmail.com";
+ github = "Pacman99";
+ githubId = 16345849;
+ name = "Parthiv Seetharaman";
+ };
paddygord = {
email = "pgpatrickgordon@gmail.com";
github = "paddygord";
@@ -7325,6 +7369,12 @@
githubId = 1758708;
name = "Răzvan Flavius Panda";
};
+ rb2k = {
+ email = "nix@marc-seeger.com";
+ github = "rb2k";
+ githubId = 9519;
+ name = "Marc Seeger";
+ };
rbasso = {
email = "rbasso@sharpgeeks.net";
github = "rbasso";
@@ -7361,6 +7411,12 @@
githubId = 816465;
name = "Redvers Davies";
};
+ reedrw = {
+ email = "reedrw5601@gmail.com";
+ github = "reedrw";
+ githubId = 21069876;
+ name = "Reed Williams";
+ };
refnil = {
email = "broemartino@gmail.com";
github = "refnil";
@@ -8475,6 +8531,12 @@
githubId = 638763;
name = "Stuart Moss";
};
+ stunkymonkey = {
+ email = "account@buehler.rocks";
+ github = "Stunkymonkey";
+ githubId = 1315818;
+ name = "Felix Bühler";
+ };
suhr = {
email = "suhr@i2pmail.org";
github = "suhr";
@@ -9063,6 +9125,12 @@
githubId = 483735;
name = "Dmitry Geurkov";
};
+ truh = {
+ email = "jakob-nixos@truh.in";
+ github = "truh";
+ githubId = 1183303;
+ name = "Jakob Klepp";
+ };
tscholak = {
email = "torsten.scholak@googlemail.com";
github = "tscholak";
@@ -9906,6 +9974,12 @@
githubId = 8100652;
name = "David Mell";
};
+ ztzg = {
+ email = "dd@crosstwine.com";
+ github = "ztzg";
+ githubId = 393108;
+ name = "Damien Diederen";
+ };
zx2c4 = {
email = "Jason@zx2c4.com";
github = "zx2c4";
diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix
index 5bacf9dda6..1305e0947c 100755
--- a/third_party/nixpkgs/maintainers/scripts/update.nix
+++ b/third_party/nixpkgs/maintainers/scripts/update.nix
@@ -34,7 +34,7 @@ let
/* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate.
- Type: packagesWithPath :: AttrPath → (AttrPath → derivation → bool) → (AttrSet | List) → List
+ Type: packagesWithPath :: AttrPath → (AttrPath → derivation → bool) → AttrSet → List
AttrPath :: [str]
The packages will be returned as a list of named pairs comprising of:
@@ -60,8 +60,6 @@ let
if path == rootPath || evaluatedPathContent.recurseForDerivations or false || evaluatedPathContent.recurseForRelease or false then
dedupResults (lib.mapAttrsToList (name: elem: packagesWithPathInner (path ++ [name]) elem) evaluatedPathContent)
else []
- else if lib.isList evaluatedPathContent then
- dedupResults (lib.imap0 (i: elem: packagesWithPathInner (path ++ [i]) elem) evaluatedPathContent)
else []
else [];
in
diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 1cffeed480..4957b70094 100644
--- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -83,7 +83,7 @@
VirtualBox settings (Machine / Settings / Shared Folders, then click on the
"Add" icon). Add the following to the
/etc/nixos/configuration.nix to auto-mount them. If you do
- not add "nofail" , the system will no boot properly. The
+ not add "nofail" , the system will not boot properly. The
same goes for disabling rngd which is normally used to get
randomness but this does not work in virtual machines.
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml
index 87f1228561..2331375c2c 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml
@@ -650,7 +650,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details.
boot.extraTTYs renamed to
- console.extraTTYs
+ console.extraTTYs .
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml
index afb09d7c5d..3da8080958 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1344,6 +1344,12 @@ CREATE ROLE postgres LOGIN SUPERUSER;
that makes it unsuitable to be a default app.
+
+
+ If you want to manage the configuration of wpa_supplicant outside of NixOS you must ensure that none of , or is being used or true .
+ Using any of those options will cause wpa_supplicant to be started with a NixOS generated configuration file instead of your own.
+
+
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml
index ffb00aa036..38262b5089 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml
@@ -265,6 +265,36 @@
located in /run/rspamd instead of /run .
+
+
+ Enabling the Tor client no longer silently also enables and
+ configures Privoxy, and the
+ services.tor.client.privoxy.enable option has
+ been removed. To enable Privoxy, and to configure it to use
+ Tor's faster port, use the following configuration:
+
+
+ = true;
+ = true;
+
+
+
+
+ The options services.slurm.dbdserver.storagePass
+ and services.slurm.dbdserver.configFile have been removed.
+ Use services.slurm.dbdserver.storagePassFile instead to provide the database password.
+ Extra config options can be given via the option services.slurm.dbdserver.extraConfig . The actual configuration file is created on the fly on startup of the service.
+ This avoids that the password gets exposed in the nix store.
+
+
+
+
+ Starting with version 1.7.0, the project formerly named CodiMD
+ is now named HedgeDoc .
+ New installations will no longer use the old name for users, state directories and such, this needs to be considered when moving state to a more recent NixOS installation.
+ Based on , existing installations will continue to work.
+
+
@@ -276,6 +306,19 @@
Other Notable Changes
+
+
+ The Mailman NixOS module (services.mailman ) has a new
+ option , defaulting
+ to true, that controls integration with Postfix.
+
+
+ If this option is disabled, default MTA config becomes not set and you
+ should set the options in services.mailman.settings.mta
+ according to the desired configuration as described in
+ Mailman documentation.
+
+
The default-version of nextcloud is nextcloud20 .
@@ -357,6 +400,13 @@
unbound-control without passing a custom configuration location.
+
+
+ The services.dnscrypt-proxy2 module now takes the upstream's example configuration and updates it with the user's settings.
+
+ An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch.
+
+
NixOS now defaults to the unified cgroup hierarchy (cgroupsv2).
@@ -370,6 +420,32 @@
and rebooting.
+
+
+ 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
+ for more information.
+
+
+
+
+ The zookeeper package does not provide
+ zooInspector.sh anymore, as that "contrib" has
+ been dropped from upstream releases.
+
+
+
+
+ now always ensures home directory permissions to be 0700 .
+ Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others.
+ The option's description was incorrect regarding ownership management and has been simplified greatly.
+
+
diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
index 0ad0cf1fef..3f50bb431c 100644
--- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix
+++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
@@ -18,9 +18,13 @@
bootSize ? "256M"
, # The files and directories to be placed in the target file system.
- # This is a list of attribute sets {source, target} where `source'
- # is the file system object (regular file or directory) to be
- # grafted in the file system at path `target'.
+ # This is a list of attribute sets {source, target, mode, user, group} where
+ # `source' is the file system object (regular file or directory) to be
+ # grafted in the file system at path `target', `mode' is a string containing
+ # the permissions that will be set (ex. "755"), `user' and `group' are the
+ # user and group name that will be set as owner of the files.
+ # `mode', `user', and `group' are optional.
+ # When setting one of `user' or `group', the other needs to be set too.
contents ? []
, # Type of partition table to use; either "legacy", "efi", or "none".
@@ -60,6 +64,11 @@
assert partitionTableType == "legacy" || partitionTableType == "legacy+gpt" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none";
# We use -E offset=X below, which is only supported by e2fsprogs
assert partitionTableType != "none" -> fsType == "ext4";
+# Either both or none of {user,group} need to be set
+assert lib.all
+ (attrs: ((attrs.user or null) == null)
+ == ((attrs.group or null) == null))
+ contents;
with lib;
@@ -148,6 +157,9 @@ let format' = format; in let
# !!! should use XML.
sources = map (x: x.source) contents;
targets = map (x: x.target) contents;
+ modes = map (x: x.mode or "''") contents;
+ users = map (x: x.user or "''") contents;
+ groups = map (x: x.group or "''") contents;
closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; };
@@ -174,22 +186,33 @@ let format' = format; in let
set -f
sources_=(${concatStringsSep " " sources})
targets_=(${concatStringsSep " " targets})
+ modes_=(${concatStringsSep " " modes})
set +f
for ((i = 0; i < ''${#targets_[@]}; i++)); do
source="''${sources_[$i]}"
target="''${targets_[$i]}"
+ mode="''${modes_[$i]}"
+ if [ -n "$mode" ]; then
+ rsync_chmod_flags="--chmod=$mode"
+ else
+ rsync_chmod_flags=""
+ fi
+ # Unfortunately cptofs only supports modes, not ownership, so we can't use
+ # rsync's --chown option. Instead, we change the ownerships in the
+ # VM script with chown.
+ rsync_flags="-a --no-o --no-g $rsync_chmod_flags"
if [[ "$source" =~ '*' ]]; then
# If the source name contains '*', perform globbing.
mkdir -p $root/$target
for fn in $source; do
- rsync -a --no-o --no-g "$fn" $root/$target/
+ rsync $rsync_flags "$fn" $root/$target/
done
else
mkdir -p $root/$(dirname $target)
if ! [ -e $root/$target ]; then
- rsync -a --no-o --no-g $source $root/$target
+ rsync $rsync_flags $source $root/$target
else
echo "duplicate entry $target -> $source"
exit 1
@@ -284,6 +307,21 @@ in pkgs.vmTools.runInLinuxVM (
# The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images
rm -f $mountPoint/etc/machine-id
+ # Set the ownerships of the contents. The modes are set in preVM.
+ # No globbing on targets, so no need to set -f
+ targets_=(${concatStringsSep " " targets})
+ users_=(${concatStringsSep " " users})
+ groups_=(${concatStringsSep " " groups})
+ for ((i = 0; i < ''${#targets_[@]}; i++)); do
+ target="''${targets_[$i]}"
+ user="''${users_[$i]}"
+ group="''${groups_[$i]}"
+ if [ -n "$user$group" ]; then
+ # We have to nixos-enter since we need to use the user and group of the VM
+ nixos-enter --root $mountPoint -- chown -R "$user:$group" "$target"
+ fi
+ done
+
umount -R /mnt
# Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal
diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix
index 13abfb9a11..6192be1cd0 100644
--- a/third_party/nixpkgs/nixos/lib/testing-python.nix
+++ b/third_party/nixpkgs/nixos/lib/testing-python.nix
@@ -67,6 +67,8 @@ rec {
LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
'';
+
+ passthru = driver.passthru;
};
@@ -76,6 +78,7 @@ rec {
, name ? "unnamed"
# Skip linting (mainly intended for faster dev cycles)
, skipLint ? false
+ , passthru ? {}
, ...
} @ t:
let
@@ -137,7 +140,7 @@ rec {
testScript = testScript';
preferLocalBuild = true;
testName = name;
- passthru = {
+ passthru = passthru // {
inherit nodes;
};
}
diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix
index f662ed62d3..b8d52d1a8f 100644
--- a/third_party/nixpkgs/nixos/modules/config/console.nix
+++ b/third_party/nixpkgs/nixos/modules/config/console.nix
@@ -90,20 +90,6 @@ in
'';
};
- extraTTYs = mkOption {
- default = [];
- type = types.listOf types.str;
- example = ["tty8" "tty9"];
- description = ''
- TTY (virtual console) devices, in addition to the consoles on
- which mingetty and syslogd run, that must be initialised.
- Only useful if you have some program that you want to run on
- some fixed console. For example, the NixOS installation CD
- opens the manual in a web browser on console 7, so it sets
- console.extraTTYs to ["tty7"] .
- '';
- };
-
useXkbConfig = mkOption {
type = types.bool;
default = false;
@@ -199,5 +185,9 @@ in
(mkRenamedOptionModule [ "i18n" "consoleUseXkbConfig" ] [ "console" "useXkbConfig" ])
(mkRenamedOptionModule [ "boot" "earlyVconsoleSetup" ] [ "console" "earlySetup" ])
(mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
+ (mkRemovedOptionModule [ "console" "extraTTYs" ] ''
+ Since NixOS switched to systemd (circa 2012), TTYs have been spawned on
+ demand, so there is no need to configure them manually.
+ '')
];
}
diff --git a/third_party/nixpkgs/nixos/modules/config/ldap.nix b/third_party/nixpkgs/nixos/modules/config/ldap.nix
index 1a5dbcd4e2..35813c168f 100644
--- a/third_party/nixpkgs/nixos/modules/config/ldap.nix
+++ b/third_party/nixpkgs/nixos/modules/config/ldap.nix
@@ -59,30 +59,28 @@ in
users.ldap = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable authentication against an LDAP server.";
- };
+ enable = mkEnableOption "authentication against an LDAP server";
loginPam = mkOption {
type = types.bool;
default = true;
- description = "Whether to include authentication against LDAP in login PAM";
+ description = "Whether to include authentication against LDAP in login PAM.";
};
nsswitch = mkOption {
type = types.bool;
default = true;
- description = "Whether to include lookup against LDAP in NSS";
+ description = "Whether to include lookup against LDAP in NSS.";
};
server = mkOption {
+ type = types.str;
example = "ldap://ldap.example.org/";
description = "The URL of the LDAP server.";
};
base = mkOption {
+ type = types.str;
example = "dc=example,dc=org";
description = "The distinguished name of the search base.";
};
@@ -129,7 +127,7 @@ in
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
- the end of the nslcd configuration file (nslcd.conf).
+ the end of the nslcd configuration file (nslcd.conf(5) ).
'' ;
} ;
@@ -180,7 +178,7 @@ in
description = ''
Specifies the time limit (in seconds) to use when connecting
to the directory server. This is distinct from the time limit
- specified in users.ldap.timeLimit and affects
+ specified in users.ldap.timeLimit and affects
the initial server connection only.
'';
};
@@ -197,7 +195,7 @@ in
actually contact the directory server, and it is possible that
a malformed configuration file will trigger reconnection. If
soft is specified, then
- nss_ldap will return immediately on server
+ nss_ldap will return immediately on server
failure. All hard reconnect policies block with exponential
backoff before retrying.
'';
@@ -209,10 +207,10 @@ in
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
- the end of the ldap configuration file (ldap.conf).
- If users.ldap.daemon is enabled, this
+ the end of the ldap configuration file (ldap.conf(5) ).
+ If users.ldap.daemon is enabled, this
configuration will not be used. In that case, use
- users.ldap.daemon.extraConfig instead.
+ users.ldap.daemon.extraConfig instead.
'' ;
};
@@ -240,9 +238,9 @@ in
'';
};
- system.nssModules = singleton (
+ system.nssModules = mkIf cfg.nsswitch (singleton (
if cfg.daemon.enable then nss_pam_ldapd else nss_ldap
- );
+ ));
system.nssDatabases.group = optional cfg.nsswitch "ldap";
system.nssDatabases.passwd = optional cfg.nsswitch "ldap";
@@ -276,7 +274,12 @@ in
} >"$conf"
mv -fT "$conf" /run/nslcd/nslcd.conf
'';
- restartTriggers = [ "/run/nslcd/nslcd.conf" ];
+
+ restartTriggers = [
+ nslcdConfig
+ cfg.bind.passwordFile
+ cfg.daemon.rootpwmodpwFile
+ ];
serviceConfig = {
ExecStart = "${nslcdWrapped}/bin/nslcd";
diff --git a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
index fd3affae89..7582371529 100644
--- a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
+++ b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
@@ -209,10 +209,11 @@ foreach my $u (@{$spec->{users}}) {
}
}
- # Create a home directory.
+ # Ensure home directory incl. ownership and permissions.
if ($u->{createHome}) {
make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
chown $u->{uid}, $u->{gid}, $u->{home};
+ chmod 0700, $u->{home};
}
if (defined $u->{passwordFile}) {
diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
index 72285fe631..a957633809 100644
--- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix
+++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
@@ -198,10 +198,8 @@ let
type = types.bool;
default = false;
description = ''
- If true, the home directory will be created automatically. If this
- option is true and the home directory already exists but is not
- owned by the user, directory owner and group will be changed to
- match the user.
+ Whether to create the home directory and ensure ownership as well as
+ permissions to match the user.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix
index b07edb0f6a..8cf3e5633d 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix
@@ -48,6 +48,7 @@ in {
rtl8192su-firmware
rt5677-firmware
rtl8723bs-firmware
+ rtl8761b-firmware
rtlwifi_new-firmware
zd1211fw
alsa-firmware
diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
index 405fbfa10d..43d20a556f 100644
--- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -143,6 +143,13 @@ let
LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
INITRD /boot/${config.system.boot.loader.initrdFile}
+
+ # A variant to boot with a serial console enabled
+ LABEL boot-serial
+ MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (serial console=ttyS0,115200n8)
+ LINUX /boot/${config.system.boot.loader.kernelFile}
+ APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} console=ttyS0,115200n8
+ INITRD /boot/${config.system.boot.loader.initrdFile}
'';
isolinuxMemtest86Entry = ''
diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index bef6cd2fb5..a5bc436be8 100644
--- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -33,7 +33,7 @@
kernel=u-boot-rpi3.bin
# Boot in 64-bit mode.
- arm_control=0x200
+ arm_64bit=1
# U-Boot used to need this to work, regardless of whether UART is actually used or not.
# TODO: check when/if this can be removed.
diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
index c8c5a46dfb..b811ae07eb 100644
--- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -223,7 +223,7 @@ in
# Figure out device names for the boot device and root filesystem.
rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
bootDevice=$(lsblk -npo PKNAME $rootPart)
- partNum=$(lsblk -npo MAJ:MIN $rootPart | awk -F: '{print $2}')
+ partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}')
# Resize the root partition and the filesystem to fit the disk
echo ",+," | sfdisk -N$partNum --no-reread $bootDevice
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
index 699fb55561..6b1f54beee 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/fwak7l5jjl0py4wldsqjbv7p7rdzql0b-nix-2.3.9";
- i686-linux = "/nix/store/jlqrx9zw3vkwcczndaar5ban1j8g519z-nix-2.3.9";
- aarch64-linux = "/nix/store/kzvpzlm12185hw27l5znrprgvcja54d0-nix-2.3.9";
- x86_64-darwin = "/nix/store/kanh3awpf370pxfnjfvkh2m343wr3hj0-nix-2.3.9";
+ x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10";
+ i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10";
+ aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10";
+ x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10";
}
diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix
index 92aa3be0a3..426281c941 100644
--- a/third_party/nixpkgs/nixos/modules/misc/locate.nix
+++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix
@@ -73,7 +73,72 @@ in {
pruneFS = mkOption {
type = listOf str;
- default = ["afs" "anon_inodefs" "auto" "autofs" "bdev" "binfmt" "binfmt_misc" "cgroup" "cifs" "coda" "configfs" "cramfs" "cpuset" "debugfs" "devfs" "devpts" "devtmpfs" "ecryptfs" "eventpollfs" "exofs" "futexfs" "ftpfs" "fuse" "fusectl" "gfs" "gfs2" "hostfs" "hugetlbfs" "inotifyfs" "iso9660" "jffs2" "lustre" "misc" "mqueue" "ncpfs" "nnpfs" "ocfs" "ocfs2" "pipefs" "proc" "ramfs" "rpc_pipefs" "securityfs" "selinuxfs" "sfs" "shfs" "smbfs" "sockfs" "spufs" "nfs" "NFS" "nfs4" "nfsd" "sshfs" "subfs" "supermount" "sysfs" "tmpfs" "ubifs" "udf" "usbfs" "vboxsf" "vperfctrfs" ];
+ default = [
+ "afs"
+ "anon_inodefs"
+ "auto"
+ "autofs"
+ "bdev"
+ "binfmt"
+ "binfmt_misc"
+ "cgroup"
+ "cifs"
+ "coda"
+ "configfs"
+ "cramfs"
+ "cpuset"
+ "debugfs"
+ "devfs"
+ "devpts"
+ "devtmpfs"
+ "ecryptfs"
+ "eventpollfs"
+ "exofs"
+ "futexfs"
+ "ftpfs"
+ "fuse"
+ "fusectl"
+ "fuse.sshfs"
+ "gfs"
+ "gfs2"
+ "hostfs"
+ "hugetlbfs"
+ "inotifyfs"
+ "iso9660"
+ "jffs2"
+ "lustre"
+ "misc"
+ "mqueue"
+ "ncpfs"
+ "nnpfs"
+ "ocfs"
+ "ocfs2"
+ "pipefs"
+ "proc"
+ "ramfs"
+ "rpc_pipefs"
+ "securityfs"
+ "selinuxfs"
+ "sfs"
+ "shfs"
+ "smbfs"
+ "sockfs"
+ "spufs"
+ "nfs"
+ "NFS"
+ "nfs4"
+ "nfsd"
+ "sshfs"
+ "subfs"
+ "supermount"
+ "sysfs"
+ "tmpfs"
+ "ubifs"
+ "udf"
+ "usbfs"
+ "vboxsf"
+ "vperfctrfs"
+ ];
description = ''
Which filesystem types to exclude from indexing
'';
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 33d2bc3dec..3b67a85749 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -654,6 +654,8 @@
./services/networking/hylafax/default.nix
./services/networking/i2pd.nix
./services/networking/i2p.nix
+ ./services/networking/icecream/scheduler.nix
+ ./services/networking/icecream/daemon.nix
./services/networking/iodine.nix
./services/networking/iperf3.nix
./services/networking/ircd-hybrid/default.nix
@@ -854,16 +856,15 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
- ./services/web-apps/codimd.nix
./services/web-apps/convos.nix
./services/web-apps/cryptpad.nix
./services/web-apps/documize.nix
./services/web-apps/dokuwiki.nix
./services/web-apps/engelsystem.nix
- ./services/web-apps/frab.nix
./services/web-apps/gerrit.nix
./services/web-apps/gotify-server.nix
./services/web-apps/grocy.nix
+ ./services/web-apps/hedgedoc.nix
./services/web-apps/icingaweb2/icingaweb2.nix
./services/web-apps/icingaweb2/module-monitoring.nix
./services/web-apps/ihatemoney
@@ -877,6 +878,7 @@
./services/web-apps/moodle.nix
./services/web-apps/nextcloud.nix
./services/web-apps/nexus.nix
+ ./services/web-apps/plantuml-server.nix
./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/matomo.nix
./services/web-apps/moinmoin.nix
diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix
index a87db475e0..c6f705bb2d 100644
--- a/third_party/nixpkgs/nixos/modules/rename.nix
+++ b/third_party/nixpkgs/nixos/modules/rename.nix
@@ -32,6 +32,7 @@ with lib;
(mkRemovedOptionModule ["services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
(mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
+ (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix
index 47f6bead7c..8e646ae156 100644
--- a/third_party/nixpkgs/nixos/modules/security/acme.nix
+++ b/third_party/nixpkgs/nixos/modules/security/acme.nix
@@ -104,7 +104,7 @@ let
mkHash = with builtins; val: substring 0 20 (hashString "sha256" val);
certDir = mkHash hashData;
domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}";
- othersHash = mkHash "${toString acmeServer} ${data.keyType}";
+ othersHash = mkHash "${toString acmeServer} ${data.keyType} ${data.email}";
accountDir = "/var/lib/acme/.lego/accounts/" + othersHash;
protocolOpts = if useDns then (
@@ -253,7 +253,8 @@ let
echo '${domainHash}' > domainhash.txt
# Check if we can renew
- if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' ]; then
+ # Certificates and account credentials must exist
+ if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a "$(ls -1 accounts)" ]; then
# When domains are updated, there's no need to do a full
# Lego run, but it's likely renew won't work if days is too low.
diff --git a/third_party/nixpkgs/nixos/modules/security/acme.xml b/third_party/nixpkgs/nixos/modules/security/acme.xml
index 17e94bc12f..517162d1a7 100644
--- a/third_party/nixpkgs/nixos/modules/security/acme.xml
+++ b/third_party/nixpkgs/nixos/modules/security/acme.xml
@@ -263,4 +263,28 @@ chmod 400 /var/lib/secrets/certs.secret
ones.
+
+ Fixing JWS Verification error
+
+
+ It is possible that your account credentials file may become corrupt and need
+ to be regnerated. In this scenario lego will produce the error JWS verification error .
+ The solution is to simply delete the associated accounts file and
+ re-run the affected service(s).
+
+
+
+# Find the accounts folder for the certificate
+systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*'
+export accountdir="$(!!)"
+# Move this folder to some place else
+mv /var/lib/acme/.lego/$accountdir{,.bak}
+# Recreate the folder using systemd-tmpfiles
+systemd-tmpfiles --create
+# Get a new account and reissue certificates
+# Note: Do this for all certs that share the same account email address
+systemctl start acme-example.com.service
+
+
+
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
index ba20b1b98d..e09e486164 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
@@ -66,7 +66,10 @@ in {
default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music'';
description = ''
- The directory or NFS/SMB network share where mpd reads music from.
+ The directory or NFS/SMB network share where MPD reads music from. If left
+ as the default value this directory will automatically be created before
+ the MPD server starts, otherwise the sysadmin is responsible for ensuring
+ the directory exists with appropriate ownership and permissions.
'';
};
@@ -75,7 +78,10 @@ in {
default = "${cfg.dataDir}/playlists";
defaultText = ''''${dataDir}/playlists'';
description = ''
- The directory where mpd stores playlists.
+ The directory where MPD stores playlists. If left as the default value
+ this directory will automatically be created before the MPD server starts,
+ otherwise the sysadmin is responsible for ensuring the directory exists
+ with appropriate ownership and permissions.
'';
};
@@ -94,8 +100,10 @@ in {
type = types.path;
default = "/var/lib/${name}";
description = ''
- The directory where MPD stores its state, tag cache,
- playlists etc.
+ The directory where MPD stores its state, tag cache, playlists etc. If
+ left as the default value this directory will automatically be created
+ before the MPD server starts, otherwise the sysadmin is responsible for
+ ensuring the directory exists with appropriate ownership and permissions.
'';
};
@@ -185,36 +193,42 @@ in {
};
};
- systemd.tmpfiles.rules = [
- "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
- "d '${cfg.playlistDirectory}' - ${cfg.user} ${cfg.group} - -"
- ];
-
systemd.services.mpd = {
after = [ "network.target" "sound.target" ];
description = "Music Player Daemon";
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
- serviceConfig = {
- User = "${cfg.user}";
- ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
- ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
- #!${pkgs.runtimeShell}
- set -euo pipefail
- cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
- '';
- Type = "notify";
- LimitRTPRIO = 50;
- LimitRTTIME = "infinity";
- ProtectSystem = true;
- NoNewPrivileges = true;
- ProtectKernelTunables = true;
- ProtectControlGroups = true;
- ProtectKernelModules = true;
- RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
- RestrictNamespaces = true;
- Restart = "always";
- };
+ serviceConfig = mkMerge [
+ {
+ User = "${cfg.user}";
+ ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
+ ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
+ #!${pkgs.runtimeShell}
+ set -euo pipefail
+ cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
+ '';
+ Type = "notify";
+ LimitRTPRIO = 50;
+ LimitRTTIME = "infinity";
+ ProtectSystem = true;
+ NoNewPrivileges = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ ProtectKernelModules = true;
+ RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
+ RestrictNamespaces = true;
+ Restart = "always";
+ }
+ (mkIf (cfg.dataDir == "/var/lib/${name}") {
+ StateDirectory = [ name ];
+ })
+ (mkIf (cfg.playlistDirectory == "/var/lib/${name}/playlists") {
+ StateDirectory = [ name "${name}/playlists" ];
+ })
+ (mkIf (cfg.musicDirectory == "/var/lib/${name}/music") {
+ StateDirectory = [ name "${name}/music" ];
+ })
+ ];
};
environment.etc."mpd.conf" = {
mode = "0640";
diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
index 705390a21d..302f058926 100644
--- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
@@ -34,13 +34,12 @@ let
${cfg.extraCgroupConfig}
'';
- slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf"
+ slurmdbdConf = pkgs.writeText "slurmdbd.conf"
''
DbdHost=${cfg.dbdserver.dbdHost}
SlurmUser=${cfg.user}
StorageType=accounting_storage/mysql
StorageUser=${cfg.dbdserver.storageUser}
- ${optionalString (cfg.dbdserver.storagePass != null) "StoragePass=${cfg.dbdserver.storagePass}"}
${cfg.dbdserver.extraConfig}
'';
@@ -95,26 +94,12 @@ in
'';
};
- storagePass = mkOption {
- type = types.nullOr types.str;
+ storagePassFile = mkOption {
+ type = with types; nullOr str;
default = null;
description = ''
- Database password. Note that this password will be publicable
- readable in the nix store. Use configFile
- to store the and config file and password outside the nix store.
- '';
- };
-
- configFile = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Path to slurmdbd.conf . The password for the database connection
- is stored in the config file. Use this option to specfify a path
- outside the nix store. If this option is unset a configuration file
- will be generated. See also:
- slurmdbd.conf
- 8 .
+ Path to file with database password. The content of this will be used to
+ create the password for the StoragePass option.
'';
};
@@ -122,7 +107,9 @@ in
type = types.lines;
default = "";
description = ''
- Extra configuration for slurmdbd.conf
+ Extra configuration for slurmdbd.conf See also:
+ slurmdbd.conf
+ 8 .
'';
};
};
@@ -292,6 +279,16 @@ in
};
+ imports = [
+ (mkRemovedOptionModule [ "services" "slurm" "dbdserver" "storagePass" ] ''
+ This option has been removed so that the database password is not exposed via the nix store.
+ Use services.slurm.dbdserver.storagePassFile to provide the database password.
+ '')
+ (mkRemovedOptionModule [ "services" "slurm" "dbdserver" "configFile" ] ''
+ This option has been removed. Use services.slurm.dbdserver.storagePassFile
+ and services.slurm.dbdserver.extraConfig instead.
+ '')
+ ];
###### implementation
@@ -386,23 +383,34 @@ in
'';
};
- systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) {
+ systemd.services.slurmdbd = let
+ # slurm strips the last component off the path
+ configPath = "$RUNTIME_DIRECTORY/slurmdbd.conf";
+ in mkIf (cfg.dbdserver.enable) {
path = with pkgs; [ wrappedSlurm munge coreutils ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "munged.service" "mysql.service" ];
requires = [ "munged.service" "mysql.service" ];
- # slurm strips the last component off the path
- environment.SLURM_CONF =
- if (cfg.dbdserver.configFile == null) then
- "${slurmdbdConf}/slurm.conf"
- else
- cfg.dbdserver.configFile;
+ preStart = ''
+ cp ${slurmdbdConf} ${configPath}
+ chmod 600 ${configPath}
+ chown ${cfg.user} ${configPath}
+ ${optionalString (cfg.dbdserver.storagePassFile != null) ''
+ echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \
+ >> ${configPath}
+ ''}
+ '';
+
+ script = ''
+ export SLURM_CONF=${configPath}
+ exec ${cfg.package}/bin/slurmdbd -D
+ '';
serviceConfig = {
- Type = "forking";
- ExecStart = "${cfg.package}/bin/slurmdbd";
+ RuntimeDirectory = "slurmdbd";
+ Type = "simple";
PIDFile = "/run/slurmdbd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix
index 4453a18299..4af0b9d44e 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix
+++ b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix
@@ -176,7 +176,7 @@ in
postStart = ''
if test -e "${cfg.dbpath}/.first_startup"; then
${optionalString (cfg.initialScript != null) ''
- ${mongodb}/bin/mongo -u root -p ${cfg.initialRootPassword} admin "${cfg.initialScript}"
+ ${mongodb}/bin/mongo ${optionalString (cfg.enableAuth) "-u root -p ${cfg.initialRootPassword}"} admin "${cfg.initialScript}"
''}
rm -f "${cfg.dbpath}/.first_startup"
fi
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix
index 6be255cebf..aa936ac09d 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix
@@ -23,19 +23,26 @@ in {
default = null;
description = "the thermald manual configuration file.";
};
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.thermald;
+ defaultText = "pkgs.thermald";
+ description = "Which thermald package to use.";
+ };
};
};
###### implementation
config = mkIf cfg.enable {
- services.dbus.packages = [ pkgs.thermald ];
+ services.dbus.packages = [ cfg.package ];
systemd.services.thermald = {
description = "Thermal Daemon Service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''
- ${pkgs.thermald}/sbin/thermald \
+ ${cfg.package}/sbin/thermald \
--no-daemon \
${optionalString cfg.debug "--loglevel=debug"} \
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
index a212adb734..63027f7744 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
@@ -205,7 +205,7 @@ in
extraRules = mkOption {
default = "";
example = ''
- KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
+ SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card"
'';
type = types.lines;
description = ''
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix
index 5c61cfbebf..bf19da3232 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -38,7 +38,7 @@ let
webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings);
# TODO: Should this be RFC42-ised so that users can set additional options without modifying the module?
- mtaConfig = pkgs.writeText "mailman-postfix.cfg" ''
+ postfixMtaConfig = pkgs.writeText "mailman-postfix.cfg" ''
[postfix]
postmap_command: ${pkgs.postfix}/bin/postmap
transport_file_type: hash
@@ -81,7 +81,7 @@ in {
enable = mkOption {
type = types.bool;
default = false;
- description = "Enable Mailman on this host. Requires an active Postfix installation.";
+ description = "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix).";
};
package = mkOption {
@@ -92,6 +92,20 @@ in {
description = "Mailman package to use";
};
+ enablePostfix = mkOption {
+ type = types.bool;
+ default = true;
+ example = false;
+ description = ''
+ Enable Postfix integration. Requires an active Postfix installation.
+
+ If you want to use another MTA, set this option to false and configure
+ settings in services.mailman.settings.mta.
+
+ Refer to the Mailman manual for more info.
+ '';
+ };
+
siteOwner = mkOption {
type = types.str;
example = "postmaster@example.org";
@@ -182,7 +196,7 @@ in {
pid_file = "/run/mailman/master.pid";
};
- mta.configuration = lib.mkDefault "${mtaConfig}";
+ mta.configuration = lib.mkDefault (if cfg.enablePostfix then "${postfixMtaConfig}" else throw "When Mailman Postfix integration is disabled, set `services.mailman.settings.mta.configuration` to the path of the config file required to integrate with your MTA.");
"archiver.hyperkitty" = lib.mkIf cfg.hyperkitty.enable {
class = "mailman_hyperkitty.Archiver";
@@ -211,14 +225,22 @@ in {
See .
'';
};
- in [
+ in (lib.optionals cfg.enablePostfix [
{ assertion = postfix.enable;
- message = "Mailman requires Postfix";
+ message = ''
+ Mailman's default NixOS configuration requires Postfix to be enabled.
+
+ If you want to use another MTA, set services.mailman.enablePostfix
+ to false and configure settings in services.mailman.settings.mta.
+
+ Refer to
+ for more info.
+ '';
}
(requirePostfixHash [ "relayDomains" ] "postfix_domains")
(requirePostfixHash [ "config" "transport_maps" ] "postfix_lmtp")
(requirePostfixHash [ "config" "local_recipient_maps" ] "postfix_lmtp")
- ];
+ ]);
users.users.mailman = {
description = "GNU Mailman";
@@ -275,7 +297,7 @@ in {
'';
}) ];
- services.postfix = {
+ services.postfix = lib.mkIf cfg.enablePostfix {
recipientDelimiter = "+"; # bake recipient addresses in mail envelopes via VERP
config = {
owner_request_special = "no"; # Mailman handles -owner addresses on its own
@@ -421,7 +443,7 @@ in {
inherit startAt;
restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
serviceConfig = {
- ExecStart = "${pythonEnv}/bin/mailman-web runjobs minutely";
+ ExecStart = "${pythonEnv}/bin/mailman-web runjobs ${name}";
User = cfg.webUser;
Group = "mailman";
WorkingDirectory = "/var/lib/mailman-web";
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml b/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml
index cbe50ed0b9..8da491ccbe 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml
+++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml
@@ -13,9 +13,9 @@
- Basic usage
+ Basic usage with Postfix
- For a basic configuration, the following settings are suggested:
+ For a basic configuration with Postfix as the MTA, the following settings are suggested:
{ config, ... }: {
services.postfix = {
enable = true;
@@ -56,4 +56,39 @@
necessary, but outside the scope of the Mailman module.
+
+ Using with other MTAs
+
+ Mailman also supports other MTA, though with a little bit more configuration. For example, to use Mailman with Exim, you can use the following settings:
+ { config, ... }: {
+ services = {
+ mailman = {
+ enable = true;
+ siteOwner = "mailman@example.org";
+ enablePostfix = false;
+ settings.mta = {
+ incoming = "mailman.mta.exim4.LMTP";
+ outgoing = "mailman.mta.deliver.deliver";
+ lmtp_host = "localhost";
+ lmtp_port = "8024";
+ smtp_host = "localhost";
+ smtp_port = "25";
+ configuration = "python:mailman.config.exim4";
+ };
+ };
+ exim = {
+ enable = true;
+ # You can configure Exim in a separate file to reduce configuration.nix clutter
+ config = builtins.readFile ./exim.conf;
+ };
+ };
+}
+
+
+ The exim config needs some special additions to work with Mailman. Currently
+ NixOS can't manage Exim config with such granularity. Please refer to
+ Mailman documentation
+ for more info on configuring Mailman for working with Exim.
+
+
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
index 319b3b6384..795a76f748 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
@@ -52,7 +52,7 @@ let
};
type = mkOption {
- type = types.enum [ "inet" "unix" "fifo" "pass" ];
+ type = types.enum [ "inet" "unix" "unix-dgram" "fifo" "pass" ];
default = "unix";
example = "inet";
description = "The type of the service";
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix
index f6af7c75eb..1d12e81a9e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix
@@ -76,6 +76,7 @@ in {
default = ''
zookeeper.root.logger=INFO, CONSOLE
log4j.rootLogger=INFO, CONSOLE
+ log4j.logger.org.apache.zookeeper.audit.Log4jAuditLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
@@ -128,11 +129,10 @@ in {
description = "Zookeeper Daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- environment = { ZOOCFGDIR = configDir; };
serviceConfig = {
ExecStart = ''
${pkgs.jre}/bin/java \
- -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \
+ -cp "${cfg.package}/lib/*:${configDir}" \
${escapeShellArgs cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
@@ -143,6 +143,7 @@ in {
};
preStart = ''
echo "${toString cfg.id}" > ${cfg.dataDir}/myid
+ mkdir -p ${cfg.dataDir}/version-2
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix
index 995afca96f..683dc0390c 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -37,10 +37,12 @@ let
"modemmanager"
"nextcloud"
"nginx"
+ "nginxlog"
"node"
"openvpn"
"postfix"
"postgres"
+ "py-air-control"
"redis"
"rspamd"
"rtl_433"
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix
new file mode 100644
index 0000000000..8c1f552d58
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.nginxlog;
+in {
+ port = 9117;
+ extraOpts = {
+ settings = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ All settings of nginxlog expressed as an Nix attrset.
+
+ Check the official documentation for the corresponding YAML
+ settings that can all be used here: https://github.com/martin-helmich/prometheus-nginxlog-exporter
+
+ The `listen` object is already generated by `port`, `listenAddress` and `metricsEndpoint` and
+ will be merged with the value of `settings` before writting it as JSON.
+ '';
+ };
+
+ metricsEndpoint = mkOption {
+ type = types.str;
+ default = "/metrics";
+ description = ''
+ Path under which to expose metrics.
+ '';
+ };
+ };
+
+ serviceOpts = let
+ listenConfig = {
+ listen = {
+ port = cfg.port;
+ address = cfg.listenAddress;
+ metrics_endpoint = cfg.metricsEndpoint;
+ };
+ };
+ completeConfig = pkgs.writeText "nginxlog-exporter.yaml" (builtins.toJSON (lib.recursiveUpdate listenConfig cfg.settings));
+ in {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-nginxlog-exporter}/bin/prometheus-nginxlog-exporter -config-file ${completeConfig}
+ '';
+ Restart="always";
+ ProtectSystem="full";
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
new file mode 100644
index 0000000000..d9ab99221d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.py-air-control;
+
+ workingDir = "/var/lib/${cfg.stateDir}";
+
+in
+{
+ port = 9896;
+ extraOpts = {
+ deviceHostname = mkOption {
+ type = types.str;
+ example = "192.168.1.123";
+ description = ''
+ The hostname of the air purification device from which to scrape the metrics.
+ '';
+ };
+ protocol = mkOption {
+ type = types.str;
+ default = "http";
+ description = ''
+ The protocol to use when communicating with the air purification device.
+ Available: [http, coap, plain_coap]
+ '';
+ };
+ stateDir = mkOption {
+ type = types.str;
+ default = "prometheus-py-air-control-exporter";
+ description = ''
+ Directory below /var/lib to store runtime data.
+ This directory will be created automatically using systemd's StateDirectory mechanism.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ DynamicUser = false;
+ StateDirectory = cfg.stateDir;
+ WorkingDirectory = workingDir;
+ ExecStart = ''
+ ${pkgs.python3Packages.py-air-control-exporter}/bin/py-air-control-exporter \
+ --host ${cfg.deviceHostname} \
+ --protocol ${cfg.protocol} \
+ --listen-port ${toString cfg.port} \
+ --listen-address ${cfg.listenAddress}
+ '';
+ Environment = [ "HOME=${workingDir}" ];
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
index 004d07064a..c68039c79e 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
@@ -108,7 +108,7 @@ in {
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
- RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
RestrictNamespaces = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix
index dda6121221..ff8a2ab307 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix
@@ -27,6 +27,16 @@ in
default = {};
};
+ upstreamDefaults = mkOption {
+ description = ''
+ Whether to base the config declared in services.dnscrypt-proxy2.settings on the upstream example config ( )
+
+ Disable this if you want to declare your dnscrypt config from scratch.
+ '';
+ type = types.bool;
+ default = true;
+ };
+
configFile = mkOption {
description = ''
Path to TOML config file. See:
@@ -38,7 +48,13 @@ in
json = builtins.toJSON cfg.settings;
passAsFile = [ "json" ];
} ''
- ${pkgs.remarshal}/bin/json2toml < $jsonPath > $out
+ ${if cfg.upstreamDefaults then ''
+ ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
+ ${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
+ '' else ''
+ cp $jsonPath config.json
+ ''}
+ ${pkgs.remarshal}/bin/json2toml < config.json > $out
'';
defaultText = literalExample "TOML file generated from services.dnscrypt-proxy2.settings";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix
new file mode 100644
index 0000000000..2975696f9c
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix
@@ -0,0 +1,155 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.icecream.daemon;
+in {
+
+ ###### interface
+
+ options = {
+
+ services.icecream.daemon = {
+
+ enable = mkEnableOption "Icecream Daemon";
+
+ openFirewall = mkOption {
+ type = types.bool;
+ description = ''
+ Whether to automatically open receive port in the firewall.
+ '';
+ };
+
+ openBroadcast = mkOption {
+ type = types.bool;
+ description = ''
+ Whether to automatically open the firewall for scheduler discovery.
+ '';
+ };
+
+ cacheLimit = mkOption {
+ type = types.ints.u16;
+ default = 256;
+ description = ''
+ Maximum size in Megabytes of cache used to store compile environments of compile clients.
+ '';
+ };
+
+ netName = mkOption {
+ type = types.str;
+ default = "ICECREAM";
+ description = ''
+ Network name to connect to. A scheduler with the same name needs to be running.
+ '';
+ };
+
+ noRemote = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Prevent jobs from other nodes being scheduled on this daemon.
+ '';
+ };
+
+ schedulerHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Explicit scheduler hostname, useful in firewalled environments.
+
+ Uses scheduler autodiscovery via broadcast if set to null.
+ '';
+ };
+
+ maxProcesses = mkOption {
+ type = types.nullOr types.ints.u16;
+ default = null;
+ description = ''
+ Maximum number of compile jobs started in parallel for this daemon.
+
+ Uses the number of CPUs if set to null.
+ '';
+ };
+
+ nice = mkOption {
+ type = types.int;
+ default = 5;
+ description = ''
+ The level of niceness to use.
+ '';
+ };
+
+ hostname = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Hostname of the daemon in the icecream infrastructure.
+
+ Uses the hostname retrieved via uname if set to null.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "icecc";
+ description = ''
+ User to run the icecream daemon as. Set to root to enable receive of
+ remote compile environments.
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.icecream;
+ defaultText = "pkgs.icecream";
+ type = types.package;
+ description = "Icecream package to use.";
+ };
+
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = "Additional command line parameters.";
+ example = [ "-v" ];
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 10245 ];
+ networking.firewall.allowedUDPPorts = mkIf cfg.openBroadcast [ 8765 ];
+
+ systemd.services.icecc-daemon = {
+ description = "Icecream compile daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ ExecStart = escapeShellArgs ([
+ "${getBin cfg.package}/bin/iceccd"
+ "-b" "$STATE_DIRECTORY"
+ "-u" "icecc"
+ (toString cfg.nice)
+ ]
+ ++ optionals (cfg.schedulerHost != null) ["-s" cfg.schedulerHost]
+ ++ optionals (cfg.netName != null) [ "-n" cfg.netName ]
+ ++ optionals (cfg.cacheLimit != null) [ "--cache-limit" (toString cfg.cacheLimit) ]
+ ++ optionals (cfg.maxProcesses != null) [ "-m" (toString cfg.maxProcesses) ]
+ ++ optionals (cfg.hostname != null) [ "-N" (cfg.hostname) ]
+ ++ optional cfg.noRemote "--no-remote"
+ ++ cfg.extraArgs);
+ DynamicUser = true;
+ User = "icecc";
+ Group = "icecc";
+ StateDirectory = "icecc";
+ RuntimeDirectory = "icecc";
+ AmbientCapabilities = "CAP_SYS_CHROOT";
+ CapabilityBoundingSet = "CAP_SYS_CHROOT";
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ emantor ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix
new file mode 100644
index 0000000000..4ccbf27015
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix
@@ -0,0 +1,101 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.icecream.scheduler;
+in {
+
+ ###### interface
+
+ options = {
+
+ services.icecream.scheduler = {
+ enable = mkEnableOption "Icecream Scheduler";
+
+ netName = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Network name for the icecream scheduler.
+
+ Uses the default ICECREAM if null.
+ '';
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8765;
+ description = ''
+ Server port to listen for icecream daemon requests.
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ description = ''
+ Whether to automatically open the daemon port in the firewall.
+ '';
+ };
+
+ openTelnet = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to open the telnet TCP port on 8766.
+ '';
+ };
+
+ persistentClientConnection = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to prevent clients from connecting to a better scheduler.
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.icecream;
+ defaultText = "pkgs.icecream";
+ type = types.package;
+ description = "Icecream package to use.";
+ };
+
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = "Additional command line parameters";
+ example = [ "-v" ];
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = mkMerge [
+ (mkIf cfg.openFirewall [ cfg.port ])
+ (mkIf cfg.openTelnet [ 8766 ])
+ ];
+
+ systemd.services.icecc-scheduler = {
+ description = "Icecream scheduling server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ ExecStart = escapeShellArgs ([
+ "${getBin cfg.package}/bin/icecc-scheduler"
+ "-p" (toString cfg.port)
+ ]
+ ++ optionals (cfg.netName != null) [ "-n" (toString cfg.netName) ]
+ ++ optional cfg.persistentClientConnection "-r"
+ ++ cfg.extraArgs);
+
+ DynamicUser = true;
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ emantor ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
index 6f1c4c48b4..074830fc35 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
@@ -135,6 +135,8 @@ in {
CacheDirectory = "knot-resolver";
CacheDirectoryMode = "0770";
};
+ # We don't mind running stop phase from wrong version. It seems less racy.
+ systemd.services."kresd@".stopIfChanged = false;
# Try cleaning up the previously default location of cache file.
# Note that /var/cache/* should always be safe to remove.
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix
index 1f41c720ad..e3b34cb0c6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix
@@ -8,15 +8,22 @@ let
cfg = config.services.privoxy;
- confFile = pkgs.writeText "privoxy.conf" ''
+ confFile = pkgs.writeText "privoxy.conf" (''
user-manual ${privoxy}/share/doc/privoxy/user-manual
confdir ${privoxy}/etc/
listen-address ${cfg.listenAddress}
enable-edit-actions ${if (cfg.enableEditActions == true) then "1" else "0"}
${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles}
${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles}
+ '' + optionalString cfg.enableTor ''
+ forward-socks4a / ${config.services.tor.client.socksListenAddressFaster} .
+ toggle 1
+ enable-remote-toggle 0
+ enable-edit-actions 0
+ enable-remote-http-toggle 0
+ '' + ''
${cfg.extraConfig}
- '';
+ '');
in
@@ -72,6 +79,15 @@ in
'';
};
+ enableTor = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to configure Privoxy to use Tor's faster SOCKS port,
+ suitable for HTTP.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "" ;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix
index 725bd9bf94..b6afd83a9a 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix
@@ -1,13 +1,156 @@
{ config, lib, pkgs, ... }:
with lib;
-
let
-
cfg = config.services.tinc;
-in
+ mkValueString = value:
+ if value == true then "yes"
+ else if value == false then "no"
+ else generators.mkValueStringDefault { } value;
+ toTincConf = generators.toKeyValue {
+ listsAsDuplicateKeys = true;
+ mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } "=";
+ };
+
+ tincConfType = with types;
+ let
+ valueType = oneOf [ bool str int ];
+ in
+ attrsOf (either valueType (listOf valueType));
+
+ addressSubmodule = {
+ options = {
+ address = mkOption {
+ type = types.str;
+ description = "The external IP address or hostname where the host can be reached.";
+ };
+
+ port = mkOption {
+ type = types.nullOr types.port;
+ default = null;
+ description = ''
+ The port where the host can be reached.
+
+ If no port is specified, the default Port is used.
+ '';
+ };
+ };
+ };
+
+ subnetSubmodule = {
+ options = {
+ address = mkOption {
+ type = types.str;
+ description = ''
+ The subnet of this host.
+
+ Subnets can either be single MAC, IPv4 or IPv6 addresses, in which case
+ a subnet consisting of only that single address is assumed, or they can
+ be a IPv4 or IPv6 network address with a prefix length.
+
+ IPv4 subnets are notated like 192.168.1.0/24, IPv6 subnets are notated
+ like fec0:0:0:1::/64. MAC addresses are notated like 0:1a:2b:3c:4d:5e.
+
+ Note that subnets like 192.168.1.1/24 are invalid.
+ '';
+ };
+
+ prefixLength = mkOption {
+ type = with types; nullOr (addCheck int (n: n >= 0 && n <= 128));
+ default = null;
+ description = ''
+ The prefix length of the subnet.
+
+ If null, a subnet consisting of only that single address is assumed.
+
+ This conforms to standard CIDR notation as described in RFC1519.
+ '';
+ };
+
+ weight = mkOption {
+ type = types.ints.unsigned;
+ default = 10;
+ description = ''
+ Indicates the priority over identical Subnets owned by different nodes.
+
+ Lower values indicate higher priority. Packets will be sent to the
+ node with the highest priority, unless that node is not reachable, in
+ which case the node with the next highest priority will be tried, and
+ so on.
+ '';
+ };
+ };
+ };
+
+ hostSubmodule = { config, ... }: {
+ options = {
+ addresses = mkOption {
+ type = types.listOf (types.submodule addressSubmodule);
+ default = [ ];
+ description = ''
+ The external address where the host can be reached. This will set this
+ host's settings.Address option.
+
+ This variable is only required if you want to connect to this host.
+ '';
+ };
+
+ subnets = mkOption {
+ type = types.listOf (types.submodule subnetSubmodule);
+ default = [ ];
+ description = ''
+ The subnets which this tinc daemon will serve. This will set this
+ host's settings.Subnet option.
+
+ Tinc tries to look up which other daemon it should send a packet to by
+ searching the appropriate subnet. If the packet matches a subnet, it
+ will be sent to the daemon who has this subnet in his host
+ configuration file.
+ '';
+ };
+
+ rsaPublicKey = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Legacy RSA public key of the host in PEM format, including start and
+ end markers.
+
+ This will be appended as-is in the host's configuration file.
+
+ The ed25519 public key can be specified using the
+ settings.Ed25519PublicKey option instead.
+ '';
+ };
+
+ settings = mkOption {
+ default = { };
+ type = types.submodule { freeformType = tincConfType; };
+ description = ''
+ Configuration for this host.
+
+ See
+ for supported values.
+ '';
+ };
+ };
+
+ config.settings = {
+ Address = mkDefault (map
+ (address: "${address.address} ${toString address.port}")
+ config.addresses);
+
+ Subnet = mkDefault (map
+ (subnet:
+ if subnet.prefixLength == null then "${subnet.address}#${toString subnet.weight}"
+ else "${subnet.address}/${toString subnet.prefixLength}#${toString subnet.weight}")
+ config.subnets);
+ };
+ };
+
+in
{
###### interface
@@ -18,7 +161,7 @@ in
networks = mkOption {
default = { };
- type = with types; attrsOf (submodule {
+ type = with types; attrsOf (submodule ({ config, ... }: {
options = {
extraConfig = mkOption {
@@ -26,6 +169,9 @@ in
type = types.lines;
description = ''
Extra lines to add to the tinc service configuration file.
+
+ Note that using the declarative service.tinc.networks.<name>.settings
+ option is preferred.
'';
};
@@ -69,6 +215,40 @@ in
hosts = mkOption {
default = { };
type = types.attrsOf types.lines;
+ description = ''
+ The name of the host in the network as well as the configuration for that host.
+ This name should only contain alphanumerics and underscores.
+
+ Note that using the declarative service.tinc.networks.<name>.hostSettings
+ option is preferred.
+ '';
+ };
+
+ hostSettings = mkOption {
+ default = { };
+ example = literalExample ''
+ {
+ host1 = {
+ addresses = [
+ { address = "192.168.1.42"; }
+ { address = "192.168.1.42"; port = 1655; }
+ ];
+ subnets = [ { address = "10.0.0.42"; } ];
+ rsaPublicKey = "...";
+ settings = {
+ Ed25519PublicKey = "...";
+ };
+ };
+ host2 = {
+ subnets = [ { address = "10.0.1.0"; prefixLength = 24; weight = 2; } ];
+ rsaPublicKey = "...";
+ settings = {
+ Compression = 10;
+ };
+ };
+ }
+ '';
+ type = types.attrsOf (types.submodule hostSubmodule);
description = ''
The name of the host in the network as well as the configuration for that host.
This name should only contain alphanumerics and underscores.
@@ -79,7 +259,7 @@ in
default = "tun";
type = types.enum [ "tun" "tap" ];
description = ''
- The type of virtual interface used for the network connection
+ The type of virtual interface used for the network connection.
'';
};
@@ -118,8 +298,44 @@ in
Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment.
'';
};
+
+ settings = mkOption {
+ default = { };
+ type = types.submodule { freeformType = tincConfType; };
+ example = literalExample ''
+ {
+ Interface = "custom.interface";
+ DirectOnly = true;
+ Mode = "switch";
+ }
+ '';
+ description = ''
+ Configuration of the Tinc daemon for this network.
+
+ See
+ for supported values.
+ '';
+ };
};
- });
+
+ config = {
+ hosts = mapAttrs
+ (hostname: host: ''
+ ${toTincConf host.settings}
+ ${host.rsaPublicKey}
+ '')
+ config.hostSettings;
+
+ settings = {
+ DeviceType = mkDefault config.interfaceType;
+ Name = mkDefault (if config.name == null then "$HOST" else config.name);
+ Ed25519PrivateKeyFile = mkIf (config.ed25519PrivateKeyFile != null) (mkDefault config.ed25519PrivateKeyFile);
+ PrivateKeyFile = mkIf (config.rsaPrivateKeyFile != null) (mkDefault config.rsaPrivateKeyFile);
+ ListenAddress = mkIf (config.listenAddress != null) (mkDefault config.listenAddress);
+ BindToAddress = mkIf (config.bindToAddress != null) (mkDefault config.bindToAddress);
+ };
+ };
+ }));
description = ''
Defines the tinc networks which will be started.
@@ -144,13 +360,7 @@ in
"tinc/${network}/tinc.conf" = {
mode = "0444";
text = ''
- Name = ${if data.name == null then "$HOST" else data.name}
- DeviceType = ${data.interfaceType}
- ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"}
- ${optionalString (data.rsaPrivateKeyFile != null) "PrivateKeyFile = ${data.rsaPrivateKeyFile}"}
- ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"}
- ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"}
- Interface = tinc.${network}
+ ${toTincConf ({ Interface = "tinc.${network}"; } // data.settings)}
${data.extraConfig}
'';
};
@@ -168,6 +378,7 @@ in
Type = "simple";
Restart = "always";
RestartSec = "3";
+ ExecReload = mkIf (versionAtLeast (getVersion data.package) "1.1pre") "${data.package}/bin/tinc -n ${network} reload";
ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
};
preStart = ''
@@ -221,4 +432,5 @@ in
};
+ meta.maintainers = with maintainers; [ minijackson ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix b/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix
index ebfba263cd..35ff67937f 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix
@@ -51,6 +51,6 @@ in
###### implementation
- config.powerManagement.powerDownCommands = lines;
+ config.powerManagement.powerUpCommands = lines;
}
diff --git a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
index e7a9cefdef..72de11a925 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
@@ -119,15 +119,17 @@ in {
# firewall rules before sshguard starts.
preStart = optionalString config.networking.firewall.enable ''
${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet
- ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP
+ '' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
+ ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP
'';
postStop = optionalString config.networking.firewall.enable ''
${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP
- ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
${pkgs.ipset}/bin/ipset -quiet destroy sshguard4
+ '' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
+ ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
${pkgs.ipset}/bin/ipset -quiet destroy sshguard6
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix
index 38dc378887..1cceee065b 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix
@@ -107,6 +107,9 @@ let
in
{
imports = [
+ (mkRemovedOptionModule [ "services" "tor" "client" "privoxy" "enable" ] ''
+ Use services.privoxy.enable and services.privoxy.enableTor instead.
+ '')
(mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
(mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
@@ -270,23 +273,6 @@ in
description = "List of suffixes to use with automapHostsOnResolve";
};
};
-
- privoxy.enable = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to enable and configure the system Privoxy to use Tor's
- faster port, suitable for HTTP.
-
- To have anonymity, protocols need to be scrubbed of identifying
- information, and this can be accomplished for HTTP by Privoxy.
-
- Privoxy can also be useful for KDE torification. A good setup would be:
- setting SOCKS proxy to the default Tor port, providing maximum
- circuit isolation where possible; and setting HTTP proxy to Privoxy
- to route HTTP traffic over faster, but less isolated port.
- '';
- };
};
relay = {
@@ -784,16 +770,5 @@ in
};
environment.systemPackages = [ cfg.package ];
-
- services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
- enable = true;
- extraConfig = ''
- forward-socks4a / ${cfg.client.socksListenAddressFaster} .
- toggle 1
- enable-remote-toggle 0
- enable-edit-actions 0
- enable-remote-http-toggle 0
- '';
- };
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/frab.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/frab.nix
deleted file mode 100644
index 1b5890d6b0..0000000000
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/frab.nix
+++ /dev/null
@@ -1,222 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.frab;
-
- package = pkgs.frab;
-
- databaseConfig = builtins.toJSON { production = cfg.database; };
-
- frabEnv = {
- RAILS_ENV = "production";
- RACK_ENV = "production";
- SECRET_KEY_BASE = cfg.secretKeyBase;
- FRAB_HOST = cfg.host;
- FRAB_PROTOCOL = cfg.protocol;
- FROM_EMAIL = cfg.fromEmail;
- RAILS_SERVE_STATIC_FILES = "1";
- } // cfg.extraEnvironment;
-
- frab-rake = pkgs.stdenv.mkDerivation {
- name = "frab-rake";
- buildInputs = [ package.env pkgs.makeWrapper ];
- phases = "installPhase fixupPhase";
- installPhase = ''
- mkdir -p $out/bin
- makeWrapper ${package.env}/bin/bundle $out/bin/frab-bundle \
- ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") frabEnv)} \
- --set PATH '${lib.makeBinPath (with pkgs; [ nodejs file imagemagick ])}:$PATH' \
- --set RAKEOPT '-f ${package}/share/frab/Rakefile' \
- --run 'cd ${package}/share/frab'
- makeWrapper $out/bin/frab-bundle $out/bin/frab-rake \
- --add-flags "exec rake"
- '';
- };
-
-in
-
-{
- options = {
- services.frab = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable the frab service.
- '';
- };
-
- host = mkOption {
- type = types.str;
- example = "frab.example.com";
- description = ''
- Hostname under which this frab instance can be reached.
- '';
- };
-
- protocol = mkOption {
- type = types.str;
- default = "https";
- example = "http";
- description = ''
- Either http or https, depending on how your Frab instance
- will be exposed to the public.
- '';
- };
-
- fromEmail = mkOption {
- type = types.str;
- default = "frab@localhost";
- description = ''
- Email address used by frab.
- '';
- };
-
- listenAddress = mkOption {
- type = types.str;
- default = "localhost";
- description = ''
- Address or hostname frab should listen on.
- '';
- };
-
- listenPort = mkOption {
- type = types.int;
- default = 3000;
- description = ''
- Port frab should listen on.
- '';
- };
-
- statePath = mkOption {
- type = types.str;
- default = "/var/lib/frab";
- description = ''
- Directory where frab keeps its state.
- '';
- };
-
- user = mkOption {
- type = types.str;
- default = "frab";
- description = ''
- User to run frab.
- '';
- };
-
- group = mkOption {
- type = types.str;
- default = "frab";
- description = ''
- Group to run frab.
- '';
- };
-
- secretKeyBase = mkOption {
- type = types.str;
- description = ''
- Your secret key is used for verifying the integrity of signed cookies.
- If you change this key, all old signed cookies will become invalid!
-
- Make sure the secret is at least 30 characters and all random,
- no regular words or you'll be exposed to dictionary attacks.
- '';
- };
-
- database = mkOption {
- type = types.attrs;
- default = {
- adapter = "sqlite3";
- database = "/var/lib/frab/db.sqlite3";
- pool = 5;
- timeout = 5000;
- };
- example = {
- adapter = "postgresql";
- database = "frab";
- host = "localhost";
- username = "frabuser";
- password = "supersecret";
- encoding = "utf8";
- pool = 5;
- };
- description = ''
- Rails database configuration for Frab as Nix attribute set.
- '';
- };
-
- extraEnvironment = mkOption {
- type = types.attrs;
- default = {};
- example = {
- FRAB_CURRENCY_UNIT = "€";
- FRAB_CURRENCY_FORMAT = "%n%u";
- EXCEPTION_EMAIL = "frab-owner@example.com";
- SMTP_ADDRESS = "localhost";
- SMTP_PORT = "587";
- SMTP_DOMAIN = "localdomain";
- SMTP_USER_NAME = "root";
- SMTP_PASSWORD = "toor";
- SMTP_AUTHENTICATION = "1";
- SMTP_NOTLS = "1";
- };
- description = ''
- Additional environment variables to set for frab for further
- configuration. See the frab documentation for more information.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ frab-rake ];
-
- users.users.${cfg.user} =
- { group = cfg.group;
- home = "${cfg.statePath}";
- isSystemUser = true;
- };
-
- users.groups.${cfg.group} = { };
-
- systemd.tmpfiles.rules = [
- "d '${cfg.statePath}/system/attachments' - ${cfg.user} ${cfg.group} - -"
- ];
-
- systemd.services.frab = {
- after = [ "network.target" "gitlab.service" ];
- wantedBy = [ "multi-user.target" ];
- environment = frabEnv;
-
- preStart = ''
- ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml
- ln -sf ${cfg.statePath}/system /run/frab/system
-
- if ! test -e "${cfg.statePath}/db-setup-done"; then
- ${frab-rake}/bin/frab-rake db:setup
- touch ${cfg.statePath}/db-setup-done
- else
- ${frab-rake}/bin/frab-rake db:migrate
- fi
- '';
-
- serviceConfig = {
- PrivateTmp = true;
- PrivateDevices = true;
- Type = "simple";
- User = cfg.user;
- Group = cfg.group;
- TimeoutSec = "300s";
- Restart = "on-failure";
- RestartSec = "10s";
- RuntimeDirectory = "frab";
- WorkingDirectory = "${package}/share/frab";
- ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " +
- "--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}";
- };
- };
-
- };
-}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix
index 568bdfd0c4..be2de638dd 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix
@@ -115,9 +115,9 @@ in {
user = "grocy";
group = "nginx";
- # PHP 7.3 is the only version which is supported/tested by upstream:
- # https://github.com/grocy/grocy/blob/v2.6.0/README.md#how-to-install
- phpPackage = pkgs.php73;
+ # PHP 7.4 is the only version which is supported/tested by upstream:
+ # https://github.com/grocy/grocy/blob/v3.0.0/README.md#how-to-install
+ phpPackage = pkgs.php74;
inherit (cfg.phpfpm) settings;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
similarity index 90%
rename from third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix
rename to third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
index 0fbc9ee820..3f646d7db0 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
@@ -3,10 +3,14 @@
with lib;
let
- cfg = config.services.codimd;
+ cfg = config.services.hedgedoc;
+
+ name = if versionAtLeast config.system.stateVersion "21.03"
+ then "hedgedoc"
+ else "codimd";
prettyJSON = conf:
- pkgs.runCommandLocal "codimd-config.json" {
+ pkgs.runCommandLocal "hedgedoc-config.json" {
nativeBuildInputs = [ pkgs.jq ];
} ''
echo '${builtins.toJSON conf}' | jq \
@@ -14,22 +18,26 @@ let
'';
in
{
- options.services.codimd = {
- enable = mkEnableOption "the CodiMD Markdown Editor";
+ imports = [
+ (mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ])
+ ];
+
+ options.services.hedgedoc = {
+ enable = mkEnableOption "the HedgeDoc Markdown Editor";
groups = mkOption {
type = types.listOf types.str;
default = [];
description = ''
- Groups to which the codimd user should be added.
+ Groups to which the user ${name} should be added.
'';
};
workDir = mkOption {
type = types.path;
- default = "/var/lib/codimd";
+ default = "/var/lib/${name}";
description = ''
- Working directory for the CodiMD service.
+ Working directory for the HedgeDoc service.
'';
};
@@ -38,17 +46,17 @@ in
domain = mkOption {
type = types.nullOr types.str;
default = null;
- example = "codimd.org";
+ example = "hedgedoc.org";
description = ''
- Domain name for the CodiMD instance.
+ Domain name for the HedgeDoc instance.
'';
};
urlPath = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/url/path/to/codimd";
+ example = "/url/path/to/hedgedoc";
description = ''
- Path under which CodiMD is accessible.
+ Path under which HedgeDoc is accessible.
'';
};
host = mkOption {
@@ -69,7 +77,7 @@ in
path = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/run/codimd.sock";
+ example = "/run/hedgedoc.sock";
description = ''
Specify where a UNIX domain socket should be placed.
'';
@@ -77,7 +85,7 @@ in
allowOrigin = mkOption {
type = types.listOf types.str;
default = [];
- example = [ "localhost" "codimd.org" ];
+ example = [ "localhost" "hedgedoc.org" ];
description = ''
List of domains to whitelist.
'';
@@ -201,7 +209,7 @@ in
'';
description = ''
Specify which database to use.
- CodiMD supports mysql, postgres, sqlite and mssql.
+ HedgeDoc supports mysql, postgres, sqlite and mssql.
See
https://sequelize.readthedocs.io/en/v3/ for more information.
Note: This option overrides db .
@@ -213,12 +221,12 @@ in
example = literalExample ''
{
dialect = "sqlite";
- storage = "/var/lib/codimd/db.codimd.sqlite";
+ storage = "/var/lib/${name}/db.${name}.sqlite";
}
'';
description = ''
Specify the configuration for sequelize.
- CodiMD supports mysql, postgres, sqlite and mssql.
+ HedgeDoc supports mysql, postgres, sqlite and mssql.
See
https://sequelize.readthedocs.io/en/v3/ for more information.
Note: This option overrides db .
@@ -227,7 +235,7 @@ in
sslKeyPath= mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/codimd/codimd.key";
+ example = "/var/lib/hedgedoc/hedgedoc.key";
description = ''
Path to the SSL key. Needed when useSSL is enabled.
'';
@@ -235,7 +243,7 @@ in
sslCertPath = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/codimd/codimd.crt";
+ example = "/var/lib/hedgedoc/hedgedoc.crt";
description = ''
Path to the SSL cert. Needed when useSSL is enabled.
'';
@@ -243,7 +251,7 @@ in
sslCAPath = mkOption {
type = types.listOf types.str;
default = [];
- example = [ "/var/lib/codimd/ca.crt" ];
+ example = [ "/var/lib/hedgedoc/ca.crt" ];
description = ''
SSL ca chain. Needed when useSSL is enabled.
'';
@@ -251,7 +259,7 @@ in
dhParamPath = mkOption {
type = types.nullOr types.str;
default = null;
- example = "/var/lib/codimd/dhparam.pem";
+ example = "/var/lib/hedgedoc/dhparam.pem";
description = ''
Path to the SSL dh params. Needed when useSSL is enabled.
'';
@@ -260,10 +268,10 @@ in
type = types.str;
default = "/tmp";
description = ''
- Path to the temp directory CodiMD should use.
+ Path to the temp directory HedgeDoc should use.
Note that serviceConfig.PrivateTmp is enabled for
- the CodiMD systemd service by default.
- (Non-canonical paths are relative to CodiMD's base directory)
+ the HedgeDoc systemd service by default.
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
defaultNotePath = mkOption {
@@ -271,7 +279,7 @@ in
default = "./public/default.md";
description = ''
Path to the default Note file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
docsPath = mkOption {
@@ -279,7 +287,7 @@ in
default = "./public/docs";
description = ''
Path to the docs directory.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
indexPath = mkOption {
@@ -287,7 +295,7 @@ in
default = "./public/views/index.ejs";
description = ''
Path to the index template file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
hackmdPath = mkOption {
@@ -295,7 +303,7 @@ in
default = "./public/views/hackmd.ejs";
description = ''
Path to the hackmd template file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
errorPath = mkOption {
@@ -304,7 +312,7 @@ in
defaultText = "./public/views/error.ejs";
description = ''
Path to the error template file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
prettyPath = mkOption {
@@ -313,7 +321,7 @@ in
defaultText = "./public/views/pretty.ejs";
description = ''
Path to the pretty template file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
slidePath = mkOption {
@@ -322,13 +330,13 @@ in
defaultText = "./public/views/slide.hbs";
description = ''
Path to the slide template file.
- (Non-canonical paths are relative to CodiMD's base directory)
+ (Non-canonical paths are relative to HedgeDoc's base directory)
'';
};
uploadsPath = mkOption {
type = types.str;
default = "${cfg.workDir}/uploads";
- defaultText = "/var/lib/codimd/uploads";
+ defaultText = "/var/lib/${name}/uploads";
description = ''
Path under which uploaded files are saved.
'';
@@ -766,7 +774,7 @@ in
type = types.str;
default = "";
description = ''
- LDAP field which is used as the username on CodiMD.
+ LDAP field which is used as the username on HedgeDoc.
By default useridField is used.
'';
};
@@ -774,7 +782,7 @@ in
type = types.str;
example = "uid";
description = ''
- LDAP field which is a unique identifier for users on CodiMD.
+ LDAP field which is a unique identifier for users on HedgeDoc.
'';
};
tlsca = mkOption {
@@ -840,7 +848,7 @@ in
requiredGroups = mkOption {
type = types.listOf types.str;
default = [];
- example = [ "Hackmd-users" "Codimd-users" ];
+ example = [ "Hedgedoc-Users" ];
description = ''
Required group names.
'';
@@ -883,7 +891,7 @@ in
environmentFile = mkOption {
type = with types; nullOr path;
default = null;
- example = "/var/lib/codimd/codimd.env";
+ example = "/var/lib/hedgedoc/hedgedoc.env";
description = ''
Environment file as defined in
systemd.exec 5
@@ -894,9 +902,9 @@ in
setting these variables accordingly in the environment file.
- # snippet of CodiMD-related config
- services.codimd.configuration.dbURL = "postgres://codimd:\''${DB_PASSWORD}@db-host:5432/codimddb";
- services.codimd.configuration.minio.secretKey = "$MINIO_SECRET_KEY";
+ # snippet of HedgeDoc-related config
+ services.hedgedoc.configuration.dbURL = "postgres://hedgedoc:\''${DB_PASSWORD}@db-host:5432/hedgedocdb";
+ services.hedgedoc.configuration.minio.secretKey = "$MINIO_SECRET_KEY";
@@ -906,15 +914,15 @@ in
Note that this file needs to be available on the host on which
- CodiMD is running.
+ HedgeDoc is running.
'';
};
package = mkOption {
type = types.package;
- default = pkgs.codimd;
+ default = pkgs.hedgedoc;
description = ''
- Package that provides CodiMD.
+ Package that provides HedgeDoc.
'';
};
};
@@ -924,20 +932,20 @@ in
{ assertion = cfg.configuration.db == {} -> (
cfg.configuration.dbURL != "" && cfg.configuration.dbURL != null
);
- message = "Database configuration for CodiMD missing."; }
+ message = "Database configuration for HedgeDoc missing."; }
];
- users.groups.codimd = {};
- users.users.codimd = {
- description = "CodiMD service user";
- group = "codimd";
+ users.groups.${name} = {};
+ users.users.${name} = {
+ description = "HedgeDoc service user";
+ group = name;
extraGroups = cfg.groups;
home = cfg.workDir;
createHome = true;
isSystemUser = true;
};
- systemd.services.codimd = {
- description = "CodiMD Service";
+ systemd.services.hedgedoc = {
+ description = "HedgeDoc Service";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
preStart = ''
@@ -947,14 +955,14 @@ in
'';
serviceConfig = {
WorkingDirectory = cfg.workDir;
- ExecStart = "${cfg.package}/bin/codimd";
+ ExecStart = "${cfg.package}/bin/hedgedoc";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [
"CMD_CONFIG_FILE=${cfg.workDir}/config.json"
"NODE_ENV=production"
];
Restart = "always";
- User = "codimd";
+ User = name;
PrivateTmp = true;
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index 53c2ab76fd..da019aa250 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
@@ -39,7 +39,7 @@ let
export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config"
$sudo \
${phpPackage}/bin/php \
- occ $*
+ occ "$@"
'';
inherit (config.system) stateVersion;
@@ -391,7 +391,9 @@ in {
$file = "${c.dbpassFile}";
if (!file_exists($file)) {
throw new \RuntimeException(sprintf(
- "Cannot start Nextcloud, dbpass file %s set by NixOS doesn't exist!",
+ "Cannot start Nextcloud, dbpass file %s set by NixOS doesn't seem to "
+ . "exist! Please make sure that the file exists and has appropriate "
+ . "permissions for user & group 'nextcloud'!",
$file
));
}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix
new file mode 100644
index 0000000000..a39f594c27
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix
@@ -0,0 +1,123 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.plantuml-server;
+
+in
+
+{
+ options = {
+ services.plantuml-server = {
+ enable = mkEnableOption "PlantUML server";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.plantuml-server;
+ description = "PlantUML server package to use";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "plantuml";
+ description = "User which runs PlantUML server.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "plantuml";
+ description = "Group which runs PlantUML server.";
+ };
+
+ home = mkOption {
+ type = types.str;
+ default = "/var/lib/plantuml";
+ description = "Home directory of the PlantUML server instance.";
+ };
+
+ listenHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Host to listen on.";
+ };
+
+ listenPort = mkOption {
+ type = types.int;
+ default = 8080;
+ description = "Port to listen on.";
+ };
+
+ plantumlLimitSize = mkOption {
+ type = types.int;
+ default = 4096;
+ description = "Limits image width and height.";
+ };
+
+ graphvizPackage = mkOption {
+ type = types.package;
+ default = pkgs.graphviz_2_32;
+ description = "Package containing the dot executable.";
+ };
+
+ plantumlStats = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Set it to on to enable statistics report (https://plantuml.com/statistics-report).";
+ };
+
+ httpAuthorization = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header.";
+ };
+
+ allowPlantumlInclude = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users.users.${cfg.user} = {
+ isSystemUser = true;
+ group = cfg.group;
+ home = cfg.home;
+ createHome = true;
+ };
+
+ users.groups.${cfg.group} = {};
+
+ systemd.services.plantuml-server = {
+ description = "PlantUML server";
+ wantedBy = [ "multi-user.target" ];
+ path = [ cfg.home ];
+ environment = {
+ PLANTUML_LIMIT_SIZE = builtins.toString cfg.plantumlLimitSize;
+ GRAPHVIZ_DOT = "${cfg.graphvizPackage}/bin/dot";
+ PLANTUML_STATS = if cfg.plantumlStats then "on" else "off";
+ HTTP_AUTHORIZATION = cfg.httpAuthorization;
+ ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false";
+ };
+ script = ''
+ ${pkgs.jre}/bin/java \
+ -jar ${pkgs.jetty}/start.jar \
+ --module=deploy,http,jsp \
+ jetty.home=${pkgs.jetty} \
+ jetty.base=${cfg.package} \
+ jetty.http.host=${cfg.listenHost} \
+ jetty.http.port=${builtins.toString cfg.listenPort}
+ '';
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ PrivateTmp = true;
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ truh ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index e9630d379f..62671e9d74 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -390,13 +390,24 @@ in
};
config = mkOption {
+ type = types.str;
default = "";
- description = "
- Verbatim nginx.conf configuration.
- This is mutually exclusive with the structured configuration
- via virtualHosts and the recommendedXyzSettings configuration
- options. See appendConfig for appending to the generated http block.
- ";
+ description = ''
+ Verbatim nginx.conf configuration.
+ This is mutually exclusive to any other config option for
+ nginx.conf except for
+
+
+
+
+
+
+
+
+
+ If additional verbatim config in addition to other options is needed,
+ should be used instead.
+ '';
};
appendConfig = mkOption {
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 8cc579af2c..a9b0b8dc23 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -238,6 +238,7 @@ in
kidletime
kimageformats
kinit
+ kirigami2 # In system profile for SDDM theme. TODO: wrapper.
kio
kjobwidgets
knewstuff
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix
index a39bb55b38..23b4d8ffb1 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,12 +9,7 @@ let
cfg = dmcfg.sddm;
xEnv = config.systemd.services.display-manager.environment;
- sddm = if config.services.xserver.desktopManager.lxqt.enable then
- # TODO: Move lxqt to libsForQt515
- pkgs.libsForQt514.sddm
- else
- pkgs.libsForQt5.sddm
- ;
+ sddm = pkgs.libsForQt5.sddm;
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix
index 3980203b94..6cd46cdf96 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix
@@ -39,6 +39,18 @@ in
displayManager.lightdm.enable = lib.mkForce false;
};
systemd.services.display-manager.enable = false;
+
+ # Other displayManagers log to /dev/null because they're services and put
+ # Xorg's stdout in the journal
+ #
+ # To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do
+ # not specify a log file when running X
+ services.xserver.logFile = mkDefault null;
+
+ # Implement xserverArgs via xinit's system-wide xserverrc
+ environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" ''
+ exec ${pkgs.xorg.xorgserver}/bin/X ${toString config.services.xserver.displayManager.xserverArgs} "$@"
+ '';
environment.systemPackages = with pkgs; [ xorg.xinit ];
};
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
index 9e971671c4..eb8c4c17e9 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
@@ -518,6 +518,19 @@ in
'';
};
+ logFile = mkOption {
+ type = types.nullOr types.str;
+ default = "/dev/null";
+ example = "/var/log/Xorg.0.log";
+ description = ''
+ Controls the file Xorg logs to.
+
+ The default of /dev/null is set so that systemd services (like displayManagers ) only log to the journal and don't create their own log files.
+
+ Setting this to null will not pass the -logfile argument to Xorg which allows it to log to its default logfile locations instead (see man Xorg ). You probably only want this behaviour when running Xorg manually (e.g. via startx ).
+ '';
+ };
+
verbose = mkOption {
type = types.nullOr types.int;
default = 3;
@@ -692,11 +705,10 @@ in
services.xserver.displayManager.xserverArgs =
[ "-config ${configFile}"
"-xkbdir" "${cfg.xkbDir}"
- # Log at the default verbosity level to stderr rather than /var/log/X.*.log.
- "-logfile" "/dev/null"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
+ ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"
++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
++ optional (!cfg.enableTCP) "-nolisten tcp"
++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
index 84bc9b7807..7fe8f4dfb7 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
with lib;
let
@@ -150,6 +150,9 @@ in
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.resolve1.service" ];
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
+ # Upstream bug: https://github.com/systemd/systemd/issues/18078
+ # systemd-resolved without libidn2 is broken
+ environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib";
};
environment.etc = {
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
index 0f5787a192..86bfde6349 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
@@ -308,7 +308,7 @@ let
# the initial RAM disk.
initialRamdisk = pkgs.makeInitrd {
name = "initrd-${kernel-name}";
- inherit (config.boot.initrd) compressor prepend;
+ inherit (config.boot.initrd) compressor compressorArgs prepend;
contents =
[ { object = bootStage1;
@@ -334,7 +334,9 @@ let
# Script to add secret files to the initrd at bootloader update time
initialRamdiskSecretAppender =
- pkgs.writeScriptBin "append-initrd-secrets"
+ let
+ compressorExe = initialRamdisk.compressorExecutableFunction pkgs;
+ in pkgs.writeScriptBin "append-initrd-secrets"
''
#!${pkgs.bash}/bin/bash -e
function usage {
@@ -376,7 +378,7 @@ let
}
(cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \
- ${config.boot.initrd.compressor} >> "$1"
+ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
'';
in
@@ -511,13 +513,28 @@ in
};
boot.initrd.compressor = mkOption {
- internal = true;
- default = "gzip -9n";
- type = types.str;
- description = "The compressor to use on the initrd image.";
+ default = "gzip";
+ type = types.unspecified; # We don't have a function type...
+ description = ''
+ The compressor to use on the initrd image. May be any of:
+
+
+ The name of one of the predefined compressors, see pkgs/build-support/kernel/initrd-compressor-meta.nix for the definitions.
+ A function which, given the nixpkgs package set, returns the path to a compressor tool, e.g. pkgs: "''${pkgs.pigz}/bin/pigz"
+ (not recommended, because it does not work when cross-compiling) the full path to a compressor tool, e.g. "''${pkgs.pigz}/bin/pigz"
+
+
+ The given program should read data from stdin and write it to stdout compressed.
+ '';
example = "xz";
};
+ boot.initrd.compressorArgs = mkOption {
+ default = null;
+ type = types.nullOr (types.listOf types.str);
+ description = "Arguments to pass to the compressor for the initrd image, or null to use the compressor's defaults.";
+ };
+
boot.initrd.secrets = mkOption
{ default = {};
type = types.attrsOf (types.nullOr types.path);
diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
index 23e1e611a7..088bffd7c5 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -93,7 +93,17 @@ in
(if i.useDHCP != null then i.useDHCP else false));
address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
- networkConfig.IPv6PrivacyExtensions = "kernel";
+ # IPv6PrivacyExtensions=kernel seems to be broken with networkd.
+ # Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of
+ # `tempAddress`:
+ networkConfig.IPv6PrivacyExtensions = {
+ # generate temporary addresses and use them by default
+ "default" = true;
+ # generate temporary addresses but keep using the standard EUI-64 ones by default
+ "enabled" = "prefer-public";
+ # completely disable temporary addresses
+ "disabled" = false;
+ }.${i.tempAddress};
linkConfig = optionalAttrs (i.macAddress != null) {
MACAddress = i.macAddress;
} // optionalAttrs (i.mtu != null) {
diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix
index 5f8a64702a..ea82adf09a 100644
--- a/third_party/nixpkgs/nixos/release-combined.nix
+++ b/third_party/nixpkgs/nixos/release-combined.nix
@@ -145,6 +145,7 @@ in rec {
(onFullSupported "nixos.tests.printing")
(onFullSupported "nixos.tests.proxy")
(onFullSupported "nixos.tests.sddm.default")
+ (onFullSupported "nixos.tests.shadow")
(onFullSupported "nixos.tests.simple")
(onFullSupported "nixos.tests.switchTest")
(onFullSupported "nixos.tests.udisks2")
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 807a4bcdd9..659e538b31 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -49,7 +49,10 @@ in
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
cage = handleTest ./cage.nix {};
cagebreak = handleTest ./cagebreak.nix {};
- cassandra = handleTest ./cassandra.nix {};
+ cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
+ cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; };
+ cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
+ cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
certmgr = handleTest ./certmgr.nix {};
@@ -60,7 +63,6 @@ in
clickhouse = handleTest ./clickhouse.nix {};
cloud-init = handleTest ./cloud-init.nix {};
cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
- codimd = handleTest ./codimd.nix {};
consul = handleTest ./consul.nix {};
containers-bridge = handleTest ./containers-bridge.nix {};
containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {};
@@ -88,6 +90,7 @@ in
docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
docker-registry = handleTest ./docker-registry.nix {};
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
+ docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
documize = handleTest ./documize.nix {};
dokuwiki = handleTest ./dokuwiki.nix {};
@@ -143,6 +146,7 @@ in
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
haproxy = handleTest ./haproxy.nix {};
hardened = handleTest ./hardened.nix {};
+ hedgedoc = handleTest ./hedgedoc.nix {};
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
# 9pnet_virtio used to mount /nix partition doesn't support
@@ -164,6 +168,7 @@ in
initrd-network-openvpn = handleTest ./initrd-network-openvpn {};
initrd-network-ssh = handleTest ./initrd-network-ssh {};
initrdNetwork = handleTest ./initrd-network.nix {};
+ initrd-secrets = handleTest ./initrd-secrets.nix {};
installer = handleTest ./installer.nix {};
iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};
@@ -195,6 +200,7 @@ in
lidarr = handleTest ./lidarr.nix {};
lightdm = handleTest ./lightdm.nix {};
limesurvey = handleTest ./limesurvey.nix {};
+ locate = handleTest ./locate.nix {};
login = handleTest ./login.nix {};
loki = handleTest ./loki.nix {};
lsd = handleTest ./lsd.nix {};
@@ -205,6 +211,7 @@ in
magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};
magnetico = handleTest ./magnetico.nix {};
mailcatcher = handleTest ./mailcatcher.nix {};
+ mailhog = handleTest ./mailhog.nix {};
mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {};
mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {};
matomo = handleTest ./matomo.nix {};
@@ -273,6 +280,7 @@ in
openssh = handleTest ./openssh.nix {};
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
+ image-contents = handleTest ./image-contents.nix {};
orangefs = handleTest ./orangefs.nix {};
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
osrm-backend = handleTest ./osrm-backend.nix {};
@@ -316,6 +324,7 @@ in
redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
restic = handleTest ./restic.nix {};
+ ripgrep = handleTest ./ripgrep.nix {};
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
@@ -331,6 +340,7 @@ in
scala = handleTest ./scala.nix {};
sddm = handleTest ./sddm.nix {};
service-runner = handleTest ./service-runner.nix {};
+ shadow = handleTest ./shadow.nix {};
shadowsocks = handleTest ./shadowsocks {};
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};
shiori = handleTest ./shiori.nix {};
@@ -371,6 +381,7 @@ in
telegraf = handleTest ./telegraf.nix {};
tiddlywiki = handleTest ./tiddlywiki.nix {};
timezone = handleTest ./timezone.nix {};
+ tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};
tor = handleTest ./tor.nix {};
# traefik test relies on docker-containers
@@ -404,6 +415,7 @@ in
xterm = handleTest ./xterm.nix {};
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
+ yq = handleTest ./yq.nix {};
zfs = handleTest ./zfs.nix {};
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
zoneminder = handleTest ./zoneminder.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/cassandra.nix b/third_party/nixpkgs/nixos/tests/cassandra.nix
index 05607956a9..bef3105f0a 100644
--- a/third_party/nixpkgs/nixos/tests/cassandra.nix
+++ b/third_party/nixpkgs/nixos/tests/cassandra.nix
@@ -1,7 +1,5 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, testPackage ? pkgs.cassandra, ... }:
let
- # Change this to test a different version of Cassandra:
- testPackage = pkgs.cassandra;
clusterName = "NixOS Automated-Test Cluster";
testRemoteAuth = lib.versionAtLeast testPackage.version "3.11";
@@ -47,7 +45,7 @@ let
};
in
{
- name = "cassandra";
+ name = "cassandra-${testPackage.version}";
meta = {
maintainers = with lib.maintainers; [ johnazoidberg ];
};
@@ -128,4 +126,8 @@ in
"nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'"
)
'';
+
+ passthru = {
+ inherit testPackage;
+ };
})
diff --git a/third_party/nixpkgs/nixos/tests/codimd.nix b/third_party/nixpkgs/nixos/tests/codimd.nix
deleted file mode 100644
index aa581dfeb5..0000000000
--- a/third_party/nixpkgs/nixos/tests/codimd.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
-{
- name = "codimd";
-
- meta = with lib.maintainers; {
- maintainers = [ willibutz ];
- };
-
- nodes = {
- codimdSqlite = { ... }: {
- services = {
- codimd = {
- enable = true;
- configuration.dbURL = "sqlite:///var/lib/codimd/codimd.db";
- };
- };
- };
-
- codimdPostgres = { ... }: {
- systemd.services.codimd.after = [ "postgresql.service" ];
- services = {
- codimd = {
- enable = true;
- configuration.dbURL = "postgres://codimd:\${DB_PASSWORD}@localhost:5432/codimddb";
-
- /*
- * Do not use pkgs.writeText for secrets as
- * they will end up in the world-readable Nix store.
- */
- environmentFile = pkgs.writeText "codimd-env" ''
- DB_PASSWORD=snakeoilpassword
- '';
- };
- postgresql = {
- enable = true;
- initialScript = pkgs.writeText "pg-init-script.sql" ''
- CREATE ROLE codimd LOGIN PASSWORD 'snakeoilpassword';
- CREATE DATABASE codimddb OWNER codimd;
- '';
- };
- };
- };
- };
-
- testScript = ''
- start_all()
-
- with subtest("CodiMD sqlite"):
- codimdSqlite.wait_for_unit("codimd.service")
- codimdSqlite.wait_for_open_port(3000)
- codimdSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new")
-
- with subtest("CodiMD postgres"):
- codimdPostgres.wait_for_unit("postgresql.service")
- codimdPostgres.wait_for_unit("codimd.service")
- codimdPostgres.wait_for_open_port(5432)
- codimdPostgres.wait_for_open_port(3000)
- codimdPostgres.wait_until_succeeds("curl -sSf http://localhost:3000/new")
- '';
-})
diff --git a/third_party/nixpkgs/nixos/tests/docker-tools-cross.nix b/third_party/nixpkgs/nixos/tests/docker-tools-cross.nix
new file mode 100644
index 0000000000..d433b5508f
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/docker-tools-cross.nix
@@ -0,0 +1,76 @@
+# Not everyone has a suitable remote builder set up, so the cross-compilation
+# tests that _include_ running the result are separate. That way, most people
+# can run the majority of the test suite without the extra setup.
+
+
+import ./make-test-python.nix ({ pkgs, ... }:
+let
+
+ remoteSystem =
+ if pkgs.system == "aarch64-linux"
+ then "x86_64-linux"
+ else "aarch64-linux";
+
+ remoteCrossPkgs = import ../.. /*nixpkgs*/ {
+ # NOTE: This is the machine that runs the build - local from the
+ # 'perspective' of the build script.
+ localSystem = remoteSystem;
+
+ # NOTE: Since this file can't control where the test will be _run_ we don't
+ # cross-compile _to_ a different system but _from_ a different system
+ crossSystem = pkgs.system;
+ };
+
+ hello1 = remoteCrossPkgs.dockerTools.buildImage {
+ name = "hello1";
+ tag = "latest";
+ contents = remoteCrossPkgs.hello;
+ };
+
+ hello2 = remoteCrossPkgs.dockerTools.buildLayeredImage {
+ name = "hello2";
+ tag = "latest";
+ contents = remoteCrossPkgs.hello;
+ };
+
+in {
+ name = "docker-tools";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ roberth ];
+ };
+
+ nodes = {
+ docker = { ... }: {
+ virtualisation = {
+ diskSize = 2048;
+ docker.enable = true;
+ };
+ };
+ };
+
+ testScript = ''
+ docker.wait_for_unit("sockets.target")
+
+ with subtest("Ensure cross compiled buildImage image can run."):
+ docker.succeed(
+ "docker load --input='${hello1}'"
+ )
+ assert "Hello, world!" in docker.succeed(
+ "docker run --rm ${hello1.imageName} hello",
+ )
+ docker.succeed(
+ "docker rmi ${hello1.imageName}",
+ )
+
+ with subtest("Ensure cross compiled buildLayeredImage image can run."):
+ docker.succeed(
+ "docker load --input='${hello2}'"
+ )
+ assert "Hello, world!" in docker.succeed(
+ "docker run --rm ${hello2.imageName} hello",
+ )
+ docker.succeed(
+ "docker rmi ${hello2.imageName}",
+ )
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix
index 3d1e39a379..8402ba68b7 100644
--- a/third_party/nixpkgs/nixos/tests/docker-tools.nix
+++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix
@@ -245,7 +245,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
+ "| ${pkgs.jq}/bin/jq -r .[].Architecture"
).strip()
- == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64v8"}"
+ == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"
)
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/hedgedoc.nix b/third_party/nixpkgs/nixos/tests/hedgedoc.nix
new file mode 100644
index 0000000000..657d49c555
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/hedgedoc.nix
@@ -0,0 +1,60 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+{
+ name = "hedgedoc";
+
+ meta = with lib.maintainers; {
+ maintainers = [ willibutz ];
+ };
+
+ nodes = {
+ hedgedocSqlite = { ... }: {
+ services = {
+ hedgedoc = {
+ enable = true;
+ configuration.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db";
+ };
+ };
+ };
+
+ hedgedocPostgres = { ... }: {
+ systemd.services.hedgedoc.after = [ "postgresql.service" ];
+ services = {
+ hedgedoc = {
+ enable = true;
+ configuration.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb";
+
+ /*
+ * Do not use pkgs.writeText for secrets as
+ * they will end up in the world-readable Nix store.
+ */
+ environmentFile = pkgs.writeText "hedgedoc-env" ''
+ DB_PASSWORD=snakeoilpassword
+ '';
+ };
+ postgresql = {
+ enable = true;
+ initialScript = pkgs.writeText "pg-init-script.sql" ''
+ CREATE ROLE hedgedoc LOGIN PASSWORD 'snakeoilpassword';
+ CREATE DATABASE hedgedocdb OWNER hedgedoc;
+ '';
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ with subtest("HedgeDoc sqlite"):
+ hedgedocSqlite.wait_for_unit("hedgedoc.service")
+ hedgedocSqlite.wait_for_open_port(3000)
+ hedgedocSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new")
+
+ with subtest("HedgeDoc postgres"):
+ hedgedocPostgres.wait_for_unit("postgresql.service")
+ hedgedocPostgres.wait_for_unit("hedgedoc.service")
+ hedgedocPostgres.wait_for_open_port(5432)
+ hedgedocPostgres.wait_for_open_port(3000)
+ hedgedocPostgres.wait_until_succeeds("curl -sSf http://localhost:3000/new")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/image-contents.nix b/third_party/nixpkgs/nixos/tests/image-contents.nix
new file mode 100644
index 0000000000..90908968a7
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/image-contents.nix
@@ -0,0 +1,51 @@
+# Tests the contents attribute of nixos/lib/make-disk-image.nix
+# including its user, group, and mode attributes.
+{ system ? builtins.currentSystem,
+ config ? {},
+ pkgs ? import ../.. { inherit system config; }
+}:
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+
+with import common/ec2.nix { inherit makeTest pkgs; };
+
+let
+ config = (import ../lib/eval-config.nix {
+ inherit system;
+ modules = [
+ ../modules/testing/test-instrumentation.nix
+ ../modules/profiles/qemu-guest.nix
+ {
+ fileSystems."/".device = "/dev/disk/by-label/nixos";
+ boot.loader.grub.device = "/dev/vda";
+ boot.loader.timeout = 0;
+ }
+ ];
+ }).config;
+ image = (import ../lib/make-disk-image.nix {
+ inherit pkgs config;
+ lib = pkgs.lib;
+ format = "qcow2";
+ contents = [{
+ source = pkgs.writeText "testFile" "contents";
+ target = "/testFile";
+ user = "1234";
+ group = "5678";
+ mode = "755";
+ }];
+ }) + "/nixos.qcow2";
+
+in makeEc2Test {
+ name = "image-contents";
+ inherit image;
+ userData = null;
+ script = ''
+ machine.start()
+ assert "content" in machine.succeed("cat /testFile")
+ fileDetails = machine.succeed("ls -l /testFile")
+ assert "1234" in fileDetails
+ assert "5678" in fileDetails
+ assert "rwxr-xr-x" in fileDetails
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/initrd-secrets.nix b/third_party/nixpkgs/nixos/tests/initrd-secrets.nix
new file mode 100644
index 0000000000..10dd908502
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/initrd-secrets.nix
@@ -0,0 +1,35 @@
+{ system ? builtins.currentSystem
+, config ? {}
+, pkgs ? import ../.. { inherit system config; }
+, lib ? pkgs.lib
+, testing ? import ../lib/testing-python.nix { inherit system pkgs; }
+}:
+let
+ secretInStore = pkgs.writeText "topsecret" "iamasecret";
+ testWithCompressor = compressor: testing.makeTest {
+ name = "initrd-secrets-${compressor}";
+
+ meta.maintainers = [ lib.maintainers.lheckemann ];
+
+ machine = { ... }: {
+ virtualisation.useBootLoader = true;
+ boot.initrd.secrets."/test" = secretInStore;
+ boot.initrd.postMountCommands = ''
+ cp /test /mnt-root/secret-from-initramfs
+ '';
+ boot.initrd.compressor = compressor;
+ # zstd compression is only supported from 5.9 onwards. Remove when 5.10 becomes default.
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed(
+ "cmp ${secretInStore} /secret-from-initramfs"
+ )
+ '';
+ };
+in lib.flip lib.genAttrs testWithCompressor [
+ "cat" "gzip" "bzip2" "xz" "lzma" "lzop" "pigz" "pixz" "zstd"
+]
diff --git a/third_party/nixpkgs/nixos/tests/kafka.nix b/third_party/nixpkgs/nixos/tests/kafka.nix
index 88e30b62ba..373e939c00 100644
--- a/third_party/nixpkgs/nixos/tests/kafka.nix
+++ b/third_party/nixpkgs/nixos/tests/kafka.nix
@@ -80,15 +80,6 @@ let
}) { inherit system; });
in with pkgs; {
- kafka_0_9 = makeKafkaTest "kafka_0_9" apacheKafka_0_9;
- kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
- kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
- kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0;
- kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1;
- kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
- kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
- kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
- kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
}
diff --git a/third_party/nixpkgs/nixos/tests/locate.nix b/third_party/nixpkgs/nixos/tests/locate.nix
new file mode 100644
index 0000000000..8818607f95
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/locate.nix
@@ -0,0 +1,62 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }:
+ let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
+ in {
+ name = "locate";
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chkno ];
+
+ nodes = rec {
+ a = {
+ environment.systemPackages = with pkgs; [ sshfs ];
+ fileSystems = lib.mkVMOverride {
+ "/ssh" = {
+ device = "alice@b:/";
+ fsType = "fuse.sshfs";
+ options = [
+ "allow_other"
+ "IdentityFile=/privkey"
+ "noauto"
+ "StrictHostKeyChecking=no"
+ "UserKnownHostsFile=/dev/null"
+ ];
+ };
+ };
+ services.locate = {
+ enable = true;
+ interval = "*:*:0/5";
+ };
+ };
+ b = {
+ services.openssh.enable = true;
+ users.users.alice = {
+ isNormalUser = true;
+ openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ # Set up sshfs mount
+ a.succeed(
+ "(umask 077; cat ${snakeOilPrivateKey} > /privkey)"
+ )
+ b.succeed("touch /file-on-b-machine")
+ b.wait_for_open_port(22)
+ a.succeed("mkdir /ssh")
+ a.succeed("mount /ssh")
+
+ # Core locatedb functionality
+ a.succeed("touch /file-on-a-machine-1")
+ a.wait_for_file("/var/cache/locatedb")
+ a.wait_until_succeeds("locate file-on-a-machine-1")
+
+ # Wait for a second update to make sure we're using a locatedb from a run
+ # that began after the sshfs mount
+ a.succeed("touch /file-on-a-machine-2")
+ a.wait_until_succeeds("locate file-on-a-machine-2")
+
+ # We shouldn't be able to see files on the other machine
+ a.fail("locate file-on-b-machine")
+ '';
+ })
diff --git a/third_party/nixpkgs/nixos/tests/lsd.nix b/third_party/nixpkgs/nixos/tests/lsd.nix
index fee8e95e14..e7525c97e3 100644
--- a/third_party/nixpkgs/nixos/tests/lsd.nix
+++ b/third_party/nixpkgs/nixos/tests/lsd.nix
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
lsd.succeed('echo "abc" > /tmp/foo')
- assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" /tmp/foo')
+ assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" -l /tmp/foo')
assert "lsd ${pkgs.lsd.version}" in lsd.succeed("lsd --version")
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/mailhog.nix b/third_party/nixpkgs/nixos/tests/mailhog.nix
new file mode 100644
index 0000000000..aece57178d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/mailhog.nix
@@ -0,0 +1,24 @@
+import ./make-test-python.nix ({ lib, ... }: {
+ name = "mailhog";
+ meta.maintainers = with lib.maintainers; [ jojosch ];
+
+ machine = { pkgs, ... }: {
+ services.mailhog.enable = true;
+
+ environment.systemPackages = with pkgs; [ swaks ];
+ };
+
+ testScript = ''
+ start_all()
+
+ machine.wait_for_unit("mailhog.service")
+ machine.wait_for_open_port("1025")
+ machine.wait_for_open_port("8025")
+ machine.succeed(
+ 'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
+ )
+ assert "this is the body of the email" in machine.succeed(
+ "curl --fail http://localhost:8025/api/v2/messages"
+ )
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/minecraft.nix b/third_party/nixpkgs/nixos/tests/minecraft.nix
index e0c35f2d27..3225ebac39 100644
--- a/third_party/nixpkgs/nixos/tests/minecraft.nix
+++ b/third_party/nixpkgs/nixos/tests/minecraft.nix
@@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
in ''
client.wait_for_x()
client.execute("su - alice -c minecraft-launcher &")
- client.wait_for_text("CONTINUE WITHOUT LOGIN")
+ client.wait_for_text("Create a new Microsoft account")
client.sleep(10)
client.screenshot("launcher")
'';
diff --git a/third_party/nixpkgs/nixos/tests/mpd.nix b/third_party/nixpkgs/nixos/tests/mpd.nix
index 60aef586ad..7af8640de7 100644
--- a/third_party/nixpkgs/nixos/tests/mpd.nix
+++ b/third_party/nixpkgs/nixos/tests/mpd.nix
@@ -27,10 +27,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
after = [ "mpd.service" ];
wantedBy = [ "default.target" ];
script = ''
- mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory}
cp ${track} ${musicDirectory}
- chown ${user}:${group} ${musicDirectory}/$(basename ${track})
'';
+ serviceConfig = {
+ User = user;
+ Group = group;
+ };
};
mkServer = { mpd, musicService, }:
diff --git a/third_party/nixpkgs/nixos/tests/plasma5.nix b/third_party/nixpkgs/nixos/tests/plasma5.nix
index 5a603f8cbf..7b17321e2e 100644
--- a/third_party/nixpkgs/nixos/tests/plasma5.nix
+++ b/third_party/nixpkgs/nixos/tests/plasma5.nix
@@ -35,6 +35,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
machine.wait_until_succeeds("pgrep plasmashell")
machine.wait_for_window("^Desktop ")
+ with subtest("Check that KDED is running"):
+ machine.succeed("pgrep kded5")
+
with subtest("Check that logging in has given the user ownership of devices"):
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
index 0b9957404f..ffa7f420c0 100644
--- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
+++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
@@ -444,6 +444,67 @@ let
'';
};
+ nginxlog = {
+ exporterConfig = {
+ enable = true;
+ group = "nginx";
+ settings = {
+ namespaces = [
+ {
+ name = "filelogger";
+ source = {
+ files = [ "/var/log/nginx/filelogger.access.log" ];
+ };
+ }
+ {
+ name = "syslogger";
+ source = {
+ syslog = {
+ listen_address = "udp://127.0.0.1:10000";
+ format = "rfc3164";
+ tags = ["nginx"];
+ };
+ };
+ }
+ ];
+ };
+ };
+ metricProvider = {
+ services.nginx = {
+ enable = true;
+ httpConfig = ''
+ server {
+ listen 80;
+ server_name filelogger.local;
+ access_log /var/log/nginx/filelogger.access.log;
+ }
+ server {
+ listen 81;
+ server_name syslogger.local;
+ access_log syslog:server=127.0.0.1:10000,tag=nginx,severity=info;
+ }
+ '';
+ };
+ };
+ exporterTest = ''
+ wait_for_unit("nginx.service")
+ wait_for_unit("prometheus-nginxlog-exporter.service")
+ wait_for_open_port(9117)
+ wait_for_open_port(80)
+ wait_for_open_port(81)
+ succeed("curl http://localhost")
+ execute("sleep 1")
+ succeed(
+ "curl -sSf http://localhost:9117/metrics | grep 'filelogger_http_response_count_total' | grep -q 1"
+ )
+ succeed("curl http://localhost:81")
+ execute("sleep 1")
+ succeed(
+ "curl -sSf http://localhost:9117/metrics | grep 'syslogger_http_response_count_total' | grep -q 1"
+ )
+ '';
+ };
+
node = {
exporterConfig = {
enable = true;
@@ -530,6 +591,21 @@ let
'';
};
+ py-air-control = {
+ nodeName = "py_air_control";
+ exporterConfig = {
+ enable = true;
+ deviceHostname = "127.0.0.1";
+ };
+ exporterTest = ''
+ wait_for_unit("prometheus-py-air-control-exporter.service")
+ wait_for_open_port(9896)
+ succeed(
+ "curl -sSf http://localhost:9896/metrics | grep -q 'py_air_control_sampling_error_total'"
+ )
+ '';
+ };
+
redis = {
exporterConfig = {
enable = true;
diff --git a/third_party/nixpkgs/nixos/tests/prometheus.nix b/third_party/nixpkgs/nixos/tests/prometheus.nix
index 6881c659e6..70ac78a4a4 100644
--- a/third_party/nixpkgs/nixos/tests/prometheus.nix
+++ b/third_party/nixpkgs/nixos/tests/prometheus.nix
@@ -36,6 +36,7 @@ in import ./make-test-python.nix {
nodes = {
prometheus = { pkgs, ... }: {
virtualisation.diskSize = 2 * 1024;
+ virtualisation.memorySize = 2048;
environment.systemPackages = [ pkgs.jq ];
networking.firewall.allowedTCPPorts = [ grpcPort ];
services.prometheus = {
@@ -132,6 +133,7 @@ in import ./make-test-python.nix {
store = { pkgs, ... }: {
virtualisation.diskSize = 2 * 1024;
+ virtualisation.memorySize = 2048;
environment.systemPackages = with pkgs; [ jq thanos ];
services.thanos.store = {
enable = true;
diff --git a/third_party/nixpkgs/nixos/tests/ripgrep.nix b/third_party/nixpkgs/nixos/tests/ripgrep.nix
new file mode 100644
index 0000000000..9f76290488
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/ripgrep.nix
@@ -0,0 +1,13 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "ripgrep";
+ meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+
+ nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; };
+
+ testScript = ''
+ ripgrep.succeed('echo "abc\nbcd\ncde" > /tmp/foo')
+ assert "bcd" in ripgrep.succeed("rg -N 'bcd' /tmp/foo")
+ assert "bcd\ncde" in ripgrep.succeed("rg -N 'cd' /tmp/foo")
+ assert "ripgrep ${pkgs.ripgrep.version}" in ripgrep.succeed("rg --version | head -1")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/shadow.nix b/third_party/nixpkgs/nixos/tests/shadow.nix
new file mode 100644
index 0000000000..0cc1d68114
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/shadow.nix
@@ -0,0 +1,102 @@
+let
+ password1 = "foobar";
+ password2 = "helloworld";
+ password3 = "bazqux";
+in import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "shadow";
+ meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+
+ nodes.shadow = { pkgs, ... }: {
+ environment.systemPackages = [ pkgs.shadow ];
+
+ users = {
+ mutableUsers = true;
+ users.emma = {
+ password = password1;
+ shell = pkgs.bash;
+ };
+ users.layla = {
+ password = password2;
+ shell = pkgs.shadow;
+ };
+ };
+ };
+
+ testScript = ''
+ shadow.wait_for_unit("multi-user.target")
+ shadow.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+
+ with subtest("Normal login"):
+ shadow.send_key("alt-f2")
+ shadow.wait_until_succeeds(f"[ $(fgconsole) = 2 ]")
+ shadow.wait_for_unit(f"getty@tty2.service")
+ shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'")
+ shadow.wait_until_tty_matches(2, "login: ")
+ shadow.send_chars("emma\n")
+ shadow.wait_until_tty_matches(2, "login: emma")
+ shadow.wait_until_succeeds("pgrep login")
+ shadow.sleep(2)
+ shadow.send_chars("${password1}\n")
+ shadow.send_chars("whoami > /tmp/1\n")
+ shadow.wait_for_file("/tmp/1")
+ assert "emma" in shadow.succeed("cat /tmp/1")
+
+ with subtest("Change password"):
+ shadow.send_key("alt-f3")
+ shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]")
+ shadow.wait_for_unit(f"getty@tty3.service")
+ shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty3'")
+ shadow.wait_until_tty_matches(3, "login: ")
+ shadow.send_chars("emma\n")
+ shadow.wait_until_tty_matches(3, "login: emma")
+ shadow.wait_until_succeeds("pgrep login")
+ shadow.sleep(2)
+ shadow.send_chars("${password1}\n")
+ shadow.send_chars("passwd\n")
+ shadow.sleep(2)
+ shadow.send_chars("${password1}\n")
+ shadow.sleep(2)
+ shadow.send_chars("${password3}\n")
+ shadow.sleep(2)
+ shadow.send_chars("${password3}\n")
+ shadow.sleep(2)
+ shadow.send_key("alt-f4")
+ shadow.wait_until_succeeds(f"[ $(fgconsole) = 4 ]")
+ shadow.wait_for_unit(f"getty@tty4.service")
+ shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty4'")
+ shadow.wait_until_tty_matches(4, "login: ")
+ shadow.send_chars("emma\n")
+ shadow.wait_until_tty_matches(4, "login: emma")
+ shadow.wait_until_succeeds("pgrep login")
+ shadow.sleep(2)
+ shadow.send_chars("${password1}\n")
+ shadow.wait_until_tty_matches(4, "Login incorrect")
+ shadow.wait_until_tty_matches(4, "login:")
+ shadow.send_chars("emma\n")
+ shadow.wait_until_tty_matches(4, "login: emma")
+ shadow.wait_until_succeeds("pgrep login")
+ shadow.sleep(2)
+ shadow.send_chars("${password3}\n")
+ shadow.send_chars("whoami > /tmp/2\n")
+ shadow.wait_for_file("/tmp/2")
+ assert "emma" in shadow.succeed("cat /tmp/2")
+
+ with subtest("Groups"):
+ assert "foobar" not in shadow.succeed("groups emma")
+ shadow.succeed("groupadd foobar")
+ shadow.succeed("usermod -a -G foobar emma")
+ assert "foobar" in shadow.succeed("groups emma")
+
+ with subtest("nologin shell"):
+ shadow.send_key("alt-f5")
+ shadow.wait_until_succeeds(f"[ $(fgconsole) = 5 ]")
+ shadow.wait_for_unit(f"getty@tty5.service")
+ shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty5'")
+ shadow.wait_until_tty_matches(5, "login: ")
+ shadow.send_chars("layla\n")
+ shadow.wait_until_tty_matches(5, "login: layla")
+ shadow.wait_until_succeeds("pgrep login")
+ shadow.send_chars("${password2}\n")
+ shadow.wait_until_tty_matches(5, "login:")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/slurm.nix b/third_party/nixpkgs/nixos/tests/slurm.nix
index a54c5d9db4..97e031a627 100644
--- a/third_party/nixpkgs/nixos/tests/slurm.nix
+++ b/third_party/nixpkgs/nixos/tests/slurm.nix
@@ -86,14 +86,16 @@ in {
dbd =
{ pkgs, ... } :
- {
+ let
+ passFile = pkgs.writeText "dbdpassword" "password123";
+ in {
networking.firewall.enable = false;
systemd.tmpfiles.rules = [
"f /etc/munge/munge.key 0400 munge munge - mungeverryweakkeybuteasytointegratoinatest"
];
services.slurm.dbdserver = {
enable = true;
- storagePass = "password123";
+ storagePassFile = "${passFile}";
};
services.mysql = {
enable = true;
diff --git a/third_party/nixpkgs/nixos/tests/tinc/default.nix b/third_party/nixpkgs/nixos/tests/tinc/default.nix
new file mode 100644
index 0000000000..31b675ad35
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/tinc/default.nix
@@ -0,0 +1,139 @@
+import ../make-test-python.nix ({ lib, ... }:
+ let
+ snakeoil-keys = import ./snakeoil-keys.nix;
+
+ hosts = lib.attrNames snakeoil-keys;
+
+ subnetOf = name: config:
+ let
+ subnets = config.services.tinc.networks.myNetwork.hostSettings.${name}.subnets;
+ in
+ (builtins.head subnets).address;
+
+ makeTincHost = name: { subnet, extraConfig ? { } }: lib.mkMerge [
+ {
+ subnets = [{ address = subnet; }];
+ settings = {
+ Ed25519PublicKey = snakeoil-keys.${name}.ed25519Public;
+ };
+ rsaPublicKey = snakeoil-keys.${name}.rsaPublic;
+ }
+ extraConfig
+ ];
+
+ makeTincNode = { config, ... }: name: extraConfig: lib.mkMerge [
+ {
+ services.tinc.networks.myNetwork = {
+ inherit name;
+ rsaPrivateKeyFile =
+ builtins.toFile "rsa.priv" snakeoil-keys.${name}.rsaPrivate;
+ ed25519PrivateKeyFile =
+ builtins.toFile "ed25519.priv" snakeoil-keys.${name}.ed25519Private;
+
+ hostSettings = lib.mapAttrs makeTincHost {
+ static = {
+ subnet = "10.0.0.11";
+ # Only specify the addresses in the node's vlans, Tinc does not
+ # seem to try each one, unlike the documentation suggests...
+ extraConfig.addresses = map
+ (vlan: { address = "192.168.${toString vlan}.11"; port = 655; })
+ config.virtualisation.vlans;
+ };
+ dynamic1 = { subnet = "10.0.0.21"; };
+ dynamic2 = { subnet = "10.0.0.22"; };
+ };
+ };
+
+ networking.useDHCP = false;
+
+ networking.interfaces."tinc.myNetwork" = {
+ virtual = true;
+ virtualType = "tun";
+ ipv4.addresses = [{
+ address = subnetOf name config;
+ prefixLength = 24;
+ }];
+ };
+
+ # Prevents race condition between NixOS service and tinc creating the
+ # interface.
+ # See: https://github.com/NixOS/nixpkgs/issues/27070
+ systemd.services."tinc.myNetwork" = {
+ after = [ "network-addresses-tinc.myNetwork.service" ];
+ requires = [ "network-addresses-tinc.myNetwork.service" ];
+ };
+
+ networking.firewall.allowedTCPPorts = [ 655 ];
+ networking.firewall.allowedUDPPorts = [ 655 ];
+ }
+ extraConfig
+ ];
+
+ in
+ {
+ name = "tinc";
+ meta.maintainers = with lib.maintainers; [ minijackson ];
+
+ nodes = {
+
+ static = { ... } @ args:
+ makeTincNode args "static" {
+ virtualisation.vlans = [ 1 2 ];
+
+ networking.interfaces.eth1.ipv4.addresses = [{
+ address = "192.168.1.11";
+ prefixLength = 24;
+ }];
+
+ networking.interfaces.eth2.ipv4.addresses = [{
+ address = "192.168.2.11";
+ prefixLength = 24;
+ }];
+ };
+
+
+ dynamic1 = { ... } @ args:
+ makeTincNode args "dynamic1" {
+ virtualisation.vlans = [ 1 ];
+ };
+
+ dynamic2 = { ... } @ args:
+ makeTincNode args "dynamic2" {
+ virtualisation.vlans = [ 2 ];
+ };
+
+ };
+
+ testScript = ''
+ start_all()
+
+ static.wait_for_unit("tinc.myNetwork.service")
+ dynamic1.wait_for_unit("tinc.myNetwork.service")
+ dynamic2.wait_for_unit("tinc.myNetwork.service")
+
+ # Static is accessible by the other hosts
+ dynamic1.succeed("ping -c5 192.168.1.11")
+ dynamic2.succeed("ping -c5 192.168.2.11")
+
+ # The other hosts are in separate vlans
+ dynamic1.fail("ping -c5 192.168.2.11")
+ dynamic2.fail("ping -c5 192.168.1.11")
+
+ # Each host can ping themselves through Tinc
+ static.succeed("ping -c5 10.0.0.11")
+ dynamic1.succeed("ping -c5 10.0.0.21")
+ dynamic2.succeed("ping -c5 10.0.0.22")
+
+ # Static is accessible by the other hosts through Tinc
+ dynamic1.succeed("ping -c5 10.0.0.11")
+ dynamic2.succeed("ping -c5 10.0.0.11")
+
+ # Static can access the other hosts through Tinc
+ static.succeed("ping -c5 10.0.0.21")
+ static.succeed("ping -c5 10.0.0.22")
+
+ # The other hosts in separate vlans can access each other through Tinc
+ dynamic1.succeed("ping -c5 10.0.0.22")
+ dynamic2.succeed("ping -c5 10.0.0.21")
+ '';
+ })
diff --git a/third_party/nixpkgs/nixos/tests/tinc/snakeoil-keys.nix b/third_party/nixpkgs/nixos/tests/tinc/snakeoil-keys.nix
new file mode 100644
index 0000000000..650e57d61d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/tinc/snakeoil-keys.nix
@@ -0,0 +1,157 @@
+{
+ static = {
+ ed25519Private = ''
+ -----BEGIN ED25519 PRIVATE KEY-----
+ IPR+ur5LfVdm6VlR1+FGIkbkL8Enkb9sejBa/JP6tXkg/vHoraIp70srb6jAUFm5
+ 3YbCJiBjLW3dy16qM5PovBoWtr5hoqYYA9dFLOys8FBUFFsIGfKhnbk7g25iwxbO
+ -----END ED25519 PRIVATE KEY-----
+ '';
+
+ ed25519Public = "AqV7aeIqKGGQfXxijMLfRAVRBLixnS45G5OoduIc8mD";
+
+ rsaPrivate = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEAxDHl0TIhhT2yH5rT+Q7MLnj+Ir8bbs3uaPqnzcxWzN1EfVP8
+ TWt5fSTrF2Dc78Kyu5ZNALrp7tUj0GZAegp1YeYJ28p3qTwCveywtCwbB4dI987S
+ yJwq95kE9aoyLa+cT99VwSTdb2YowQv2tWj/idxE3oJ+qZjy9tE5mysXm7jmTQDx
+ +U0XmNe6MHjKXc01Ener41u0ykJLeUfdgJ1zEyM2rQGtaHpIXfMT6kmxCaMcAMLg
+ YFpI38/1pQGQtROKdGOaUomx2m058bkMsJhTiBjESiLRDElRGxmMJ732crGJP0GR
+ ChJkaX/CnxHq7R0daZfwoTVHRu6N7WDbFQL5twIDAQABAoIBAQCM/fLTIHyYXRr5
+ vXFhxXGUYBz56W6UdWdEiAU5TwR92vFSQ53IIVlARtyvg0ui/b8mMcAKq0hb+03u
+ gN0LFyL+BKvHCLxvoRGzXTorcJrIET+t3jL6OchjANNgnDvNOytQ9wWQdKaxXLAi
+ 8y8LdXZWozXW1d6ikKjiGL+WNCSWIcq83ktSJZcohihptU9Un16FYQzdolSC8RtI
+ XyT7i1ye6hW/wJTJxqZ4taX3EPat85kXS234VGSqg9bb2A1yE+U8Rq37bf8AKldJ
+ NUQB3JyxnkYGJcqvzDmz139+744VWxDRvXDA5vU29LC6f8bGBvwEttD98QW+pgmB
+ 1NBU1Uo5AoGBAOzUk6k74h1RarwXaftjh/9Pures0CfNNnrkJApzFCh4bAoHNxq6
+ SSXqLcc/vvX2+YaZ72nn5YTo+JLQP6evM9oUaqRMAxa3nzoNCtF8U2r48UWmoUQE
+ aZCYbD3m7IVWFacCKRVaVTMZMTTicypSnXcbCSIEH8PRs9+L4jkHgql9AoGBANQT
+ TZECVhIaQnyRiKWlUE8G1QKzXIxjmfyirBe+ftlIG2XMXasAtQ4VRxpnorgqUnIH
+ BVrIbvRx21zlqwZbrZvyb1jHWRoyi1cqBPijpYBUm5LbV2jgHPhnfhRVqdD4CDKj
+ NQzIQrNymFaMWAoOQv/DE3g+Txr0fm9Ztu8ZRXZDAoGAHh3SQT0aPfwyhIS9t3gq
+ vS7YYa8aMVWJTgthAessbxERPB06xq1Vy/qBo8rZb9HeXV2J8n/I0iQGKDVPQvWm
+ tF7QSOBZrDPhjbJG4+jZesr5c5ADBfFBs1+OtDh/b11JF5nQu6RnHT5g4YbCemlT
+ GOhZOvgnSfGK3CyfsfzggskCgYEAmpKDK5kPUNxw70hH16v5L9Bj+zbt0qlZ+Ag8
+ 9IV1ATuMNJNTBitay6v4iidVM3QtaUzyuytxq5s87qW7FMRHcm2ueH+70ttaMiq/
+ OtZT74g7aDuUpy0KEIemHn4dauENYJMSPIHOE+sHW7WpCZNBhBcUHsUTdSsU6GX0
+ bqr1tO8CgYBpZdR2OoX/rn8nwjmtBOH38aPnCpaAfdI2Eq2Lg6DjksP6TBt53a+R
+ m1lk6Kt37BPPZQ85SBr7ywvDgUzfoD7uSmHujF2JUHPsdrg9nx7pNIGlW6DlS9OU
+ oNXGAJ/6/y6F8uDbToUfrwFq5tKMypEEa32kFtxb9f0XQ5fSgHrBEw==
+ -----END RSA PRIVATE KEY-----
+ '';
+
+ rsaPublic = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEAxDHl0TIhhT2yH5rT+Q7MLnj+Ir8bbs3uaPqnzcxWzN1EfVP8TWt5
+ fSTrF2Dc78Kyu5ZNALrp7tUj0GZAegp1YeYJ28p3qTwCveywtCwbB4dI987SyJwq
+ 95kE9aoyLa+cT99VwSTdb2YowQv2tWj/idxE3oJ+qZjy9tE5mysXm7jmTQDx+U0X
+ mNe6MHjKXc01Ener41u0ykJLeUfdgJ1zEyM2rQGtaHpIXfMT6kmxCaMcAMLgYFpI
+ 38/1pQGQtROKdGOaUomx2m058bkMsJhTiBjESiLRDElRGxmMJ732crGJP0GRChJk
+ aX/CnxHq7R0daZfwoTVHRu6N7WDbFQL5twIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+
+ dynamic1 = {
+ ed25519Private = ''
+ -----BEGIN ED25519 PRIVATE KEY-----
+ wHNC2IMXfYtL4ehdsCX154HBvlIZYEiTOnXtckWMUtEAiX9fu7peyBkp9q+yOy9c
+ xsNyssLL78lt0GoweCxlu3Sza2oBQAcwb+6tuv7P/bqzcG005uCwquyCz8LVymXA
+ -----END ED25519 PRIVATE KEY-----
+ '';
+
+ ed25519Public = "t0smNaAEAH8mver77+z/m6MnBNdurAsqrswM/Sls5FA";
+
+ rsaPrivate = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEApukYNGFNWvVlmx75LyOE7MEcd/ViV+yEyk+4cIBXYJ3Ouw+/
+ oEuh8ghQfsiUtbUPR6hPYhX2ZV8XGhuU2nAXVQV0sfZ8pdkbHQ6wHUqFcUIQAVvS
+ Wpm2DvZM8jkbCPP64/x5nukPwQ8VoNnb62rWGzbcj7rOeb7ndMK0TpX5Wwv8F297
+ nKTNCEDbK3DLTj3VD+QGnw6AoEt5i44vViAWZBXuHLHWTDC0Nq8GG+9TKODkEwt5
+ 4dgN2X9f+WTVAYhZT3SayHLqIFIMQunN89RpWwhHSW+JIRfAfuT1TbP+wA5ptDeI
+ ktCkJwWyv4hK6l800BJ9GW1nbId5LPa58ipaVwIDAQABAoIBAHcw3WgKVAMwWm57
+ n9ZZtwKapInFYYUIEYungj5UaBFGn+pVRLJjUDJWXaUr94YK1e6F8qpIpLufPBAY
+ wiN7CC5exwaOzlRgxUvqwTkpjkFiu6s8tuqb+baVjD0tKnEqSW+lS/R+2hEzhG5p
+ JPLoSB0HAFpjPC8UdJSctcWos3if3mvOGkGCKyTkrwaJgECDfD+lZ+NBIAiYLSps
+ jWLE+XlY1+nfPdLUQ+TRSv3IikJ/CWbvJLl9EE1tKhkY564KytwZrkIdJlc7NyRO
+ HpzhyMzHu1GLsr+OsBZByNNUxEPU+bzkDQluRXUSIUs9zZoBiCQr3o04qGPTEX9n
+ pNU60gECgYEA3Uf+c80eqzjDxv+O0YzC+9x6A+yMrV56siGkKRPMlrSqjX7iE2Yg
+ tUjD25kEvtaFuB3f/7zp3h4O/VLZgXreRtXHvdrfoyyJGHvHIyCGm8sw8CEWsKo4
+ 1LgZUzdPJRkXJq1zOgS0r1xsA1UDC4s02Ww2HwNeVWtmLUyCpA+B/ccCgYEAwRk9
+ tbe82eq1a85zZiPVXP2qvDH5+Vz9YiMky8xsBnoxmz2siR+NdvWBLcE2VDIY8MK1
+ 9a1dz2a7cAHQBrtWtACFVY4zvr69DumApjbQRClDYpJ42tp2VbzlMcUDIoKudRQV
+ CObhrE4w4yfVizXFyH9+4Tsg5NzVYuGg9fUJ/vECgYEAoRz7KouNqfMhsLF/5hkM
+ Gt9zw4mm/9ALm8kcwn/U9WHD0FQy/Rbd98BsQmaOavi80cqGvqhoyz2tgkqhbUHt
+ tzuOPDCxphgWFcqBupTDDYoLLruYzraRvGfyoIFj0coL7jBZ9kNY31l2l5J9LhmE
+ OE4utbP5Kk6RTagocpWL+x8CgYB48CwcIcWf3kZeDOFtuUeqhB1o3Qwox7rSuhwT
+ oCaQL/vdtNTY1PAu7zhGxdoXBYFlWS3JfxlgCoGedyQo8zAscJ8RpIx4DNIwAsLW
+ V0I9TnKry/zxZR30OOh7MV7zQFGvdjJubtwspJQt0QcHt1f2aRO4UOYbMMxcr9+1
+ 7BCkoQKBgQDBEtg1hx9zYGg1WN2TBSvh6NShi9S23r6IZ3Up8vz6Z2rcwB3UuhKi
+ xluI2ZFwM9s+7UOpaGC+hnc1aMHDEguYOPXoIzvebbYAdN4AkrsJ5d0r1GoEe64E
+ UXxrfuv5LeJ/vkUgWof+U3/jGOVvrjzi5y1xOC0r3kiSpMa85s1dhQ==
+ -----END RSA PRIVATE KEY-----
+ '';
+
+ rsaPublic = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEApukYNGFNWvVlmx75LyOE7MEcd/ViV+yEyk+4cIBXYJ3Ouw+/oEuh
+ 8ghQfsiUtbUPR6hPYhX2ZV8XGhuU2nAXVQV0sfZ8pdkbHQ6wHUqFcUIQAVvSWpm2
+ DvZM8jkbCPP64/x5nukPwQ8VoNnb62rWGzbcj7rOeb7ndMK0TpX5Wwv8F297nKTN
+ CEDbK3DLTj3VD+QGnw6AoEt5i44vViAWZBXuHLHWTDC0Nq8GG+9TKODkEwt54dgN
+ 2X9f+WTVAYhZT3SayHLqIFIMQunN89RpWwhHSW+JIRfAfuT1TbP+wA5ptDeIktCk
+ JwWyv4hK6l800BJ9GW1nbId5LPa58ipaVwIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+
+ dynamic2 = {
+ ed25519Private = ''
+ -----BEGIN ED25519 PRIVATE KEY-----
+ oUx9JdIstZLMj3ZPD8mP3ITsUscCTIXhNF3VKFUVi/ma5uk50/1vrEohfDraiMxj
+ gAWthpkhnFzUbp+YlOHE7/Z3h1a/br2/tk8DoZ5PV6ufoV1MaBlGdu+TZgeZou0t
+ -----END ED25519 PRIVATE KEY-----
+ '';
+
+ ed25519Public = "f2dYt2/2q9fLJ/AaW+Tlu7HaVNjWQpRnr/UGoXGqLdL";
+
+ rsaPrivate = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEAtQfijPX3BwOAs2Y0EuNjcBmsI90uYqNAonrFgTtcVwERIVE6
+ p6alSEakazhByujBg3jI8oPKC8eO0IJ7x/BWcgxqaw8hsPfJZFnRlwEcU5kK4c+j
+ UNS+hJOXp0x97T1edLpSFHDK9bZ2necblHKG5MsI4UsxEa+CZ0yoIybwWCDmYuya
+ PvE7CeNNa+CIOUbtPVoN4p/aBj0vZeerNBBuodNkglKRxj4l9wD9uOx4S9sdK5lu
+ q/rkxlViBoXRAshT+G2d/u/7/WPoiKB3QJcF33z8UfrlsTRnDDqOMSGisTPSv2LK
+ 4QLN4hWOGXAYQqZcxTkvvjl62mCDuoy0TM+CKQIDAQABAoIBAFKpMAxXf52nPswr
+ /dkmFVCpmE2kADsv+iJ21tpkpYxgw1aoRZUp5cyz3P3MaVZio4IJ1A/Ql6B7Vb3l
+ 5ulr170p6CnMdgDdlAsLbEV8T1foyOxFKHiPPBNDZXsR1WpPnGLGdRY6TqKV12HQ
+ lmpZRTkRcJOXBufhcTUD7r5mWFaUoZ7so6VxR4L4Tzcgv1Rl4S6jgnHOQdO6lj47
+ BaPjpBb+hplJ4wsRm91dQ7JApYq25XZwyxnBwQ2zAwb46wsuFxDPHlSc4wU7qTt6
+ x2omm33Xy2cm8L1XQhrassZzldSnAyaLBh9DC3+vFPLODDxdz5M2kpHujYYctRhv
+ CICMYJUCgYEA7mWVYuw0S8FNjaLx6n9Q1hr9d9vAFDd3NEaegH586xvhYNxf6n+C
+ 2zZloVLEsX0UnBU/6ZtLAUfxUIqlvDS2r1VjSYG5SNxM6/vyGl17Niu1jC8nzf7M
+ V1WtDCHhT4ikZCuNkAldtgI7CXVdCVO/fTqVhjk4hDblJo7VsCZSZysCgYEAwmXp
+ TwlDHapDqA8UxClZuxS8k+2hthny3ihRPCuT34yqAz074zYG97ZBKwIa4Lm1vnkc
+ mwU7yR2aK7IYeU4ScfWm1mLjkW5iaNV/sG7iTz/RP4mBAs3KSGmuhhz8sFWcXByU
+ IZyvMJvC+FpgJQJn/Xc8ZmdImvXlZd6k8v4/kfsCgYEA6VzFPB2OH63slb4w42SX
+ o86t2dtiDigxZxnN5GhtLdSP7borpigF10JLf/y+kCOpvhRLCQk8Bdf/z+C41iAf
+ yEhktbrnvfvwzHxHhSmHCAMHZ19trodCTiePCrZLkQhoK6o6nAmfEyDh26NoXE3/
+ v71OSyLOQRZfgDwHz7PjrBsCgYAe0zojpjxWP+FqjLmmQUhROgCNFGlIDuVMBOic
+ uexAznVG/ja42KBSNzwuLa9FYy1Gfr3idvn78g24UA1BbvfNyj4iUJv1O6OvK+uL
+ dom8N0pe4NbsMuWYhel+qqoG7AxXLtDuY4IEGy7XYr1MIQ2MS5PwSQBiUguGE7/k
+ KBy8cQKBgQCyC9R8VWJxQLqJxZGa9Ful01bSuntB5OLRfEjFCCuGiY/3Vj+mCiQL
+ GOfMOi2jrcnSNgUm0uevmiFCq9m7QiPiAcSYKXPWhsz/55jJIGcZy8bwyhZ2s2Mg
+ BGeZgj4RFORidqkt5g/KJz0+Wp6Ks4sLoCvOzkpeXvLzFVyzGkihrw==
+ -----END RSA PRIVATE KEY-----
+ '';
+
+ rsaPublic = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEAtQfijPX3BwOAs2Y0EuNjcBmsI90uYqNAonrFgTtcVwERIVE6p6al
+ SEakazhByujBg3jI8oPKC8eO0IJ7x/BWcgxqaw8hsPfJZFnRlwEcU5kK4c+jUNS+
+ hJOXp0x97T1edLpSFHDK9bZ2necblHKG5MsI4UsxEa+CZ0yoIybwWCDmYuyaPvE7
+ CeNNa+CIOUbtPVoN4p/aBj0vZeerNBBuodNkglKRxj4l9wD9uOx4S9sdK5luq/rk
+ xlViBoXRAshT+G2d/u/7/WPoiKB3QJcF33z8UfrlsTRnDDqOMSGisTPSv2LK4QLN
+ 4hWOGXAYQqZcxTkvvjl62mCDuoy0TM+CKQIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/uwsgi.nix b/third_party/nixpkgs/nixos/tests/uwsgi.nix
index 7f4945a880..5c0b294e2d 100644
--- a/third_party/nixpkgs/nixos/tests/uwsgi.nix
+++ b/third_party/nixpkgs/nixos/tests/uwsgi.nix
@@ -4,12 +4,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lnl7 ];
};
+
machine = { pkgs, ... }: {
services.uwsgi.enable = true;
- services.uwsgi.plugins = [ "python3" ];
+ services.uwsgi.plugins = [ "python3" "php" ];
services.uwsgi.instance = {
type = "emperor";
- vassals.hello = {
+ vassals.python = {
type = "normal";
master = true;
workers = 2;
@@ -25,6 +26,17 @@ import ./make-test-python.nix ({ pkgs, ... }:
'';
pythonPackages = self: with self; [ flask ];
};
+ vassals.php = {
+ type = "normal";
+ master = true;
+ workers = 2;
+ http-socket = ":8001";
+ http-socket-modifier1 = 14;
+ php-index = "index.php";
+ php-docroot = pkgs.writeTextDir "index.php" ''
+
+ '';
+ };
};
};
@@ -33,6 +45,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("uwsgi.service")
machine.wait_for_open_port(8000)
+ machine.wait_for_open_port(8001)
assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000")
+ assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8001")
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/yq.nix b/third_party/nixpkgs/nixos/tests/yq.nix
new file mode 100644
index 0000000000..7c0e8e3d05
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/yq.nix
@@ -0,0 +1,12 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "yq";
+ meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; };
+
+ nodes.yq = { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq yq ]; };
+
+ testScript = ''
+ assert "hello:\n foo: bar\n" in yq.succeed(
+ 'echo \'{"hello":{"foo":"bar"}}\' | yq -y .'
+ )
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/zookeeper.nix b/third_party/nixpkgs/nixos/tests/zookeeper.nix
index 42cf20b39c..2bcf5ff0fa 100644
--- a/third_party/nixpkgs/nixos/tests/zookeeper.nix
+++ b/third_party/nixpkgs/nixos/tests/zookeeper.nix
@@ -1,7 +1,12 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} :
+let
+
+ perlEnv = pkgs.perl.withPackages (p: [p.NetZooKeeper]);
+
+in {
name = "zookeeper";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ nequissimus ];
+ maintainers = [ nequissimus ztzg ];
};
nodes = {
@@ -30,5 +35,12 @@ import ./make-test-python.nix ({ pkgs, ...} : {
server.wait_until_succeeds(
"${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"
)
+
+ server.wait_until_succeeds(
+ "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->create(qw(/perl foo acl), ZOO_OPEN_ACL_UNSAFE) || die $z->get_error()'"
+ )
+ server.wait_until_succeeds(
+ "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->get(qw(/perl)) eq qw(foo) || die $z->get_error()'"
+ )
'';
})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix b/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
index 8b7629bc90..baeae7ae01 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
stdenv.mkDerivation rec {
- version = "20.02";
+ version = "20.12";
pname = "mma";
src = fetchurl {
url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
- sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv";
+ sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732";
};
buildInputs = [ makeWrapper python3 alsaUtils timidity ];
@@ -19,7 +19,7 @@
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'
- find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g'
+ find . -type f | xargs sed -i 's@/usr/bin/python3@${python3.interpreter}@g'
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix
index 49579e3329..314153bf26 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix
@@ -52,13 +52,13 @@
}:
stdenv.mkDerivation rec {
pname = "ardour";
- version = "6.3";
+ version = "6.5";
# don't fetch releases from the GitHub mirror, they are broken
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = version;
- sha256 = "050p1adgyirr790a3xp878pq3axqwzcmrk3drgm9z6v753h0xhcd";
+ sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
index 0c1690f146..d9d1a11ce1 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
@@ -10,6 +10,7 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
+ # On the update after all 1.4rc, qt5.15 will be supported.
version = "1.4.0rc1";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
index d7b9e5a635..405787e887 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
# Somehow this does not get set automatically
cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
+ postInstall = ''
+ install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
+ install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
+ install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml
+ '';
+
meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = "http://milkytracker.org";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
index 4355428056..6cbb8424d3 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
@@ -5,11 +5,11 @@
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Local";
- version = "3.1.1";
+ version = "3.2.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j";
+ sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
index dc936083ca..10a3b3b873 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
- version = "0.96.1";
+ version = "0.96.2";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
- sha256 = "0gpyr25q6g9b8f9hi6jx3p4ijl7xrrjc78vw1fyjd59a7690d7kr";
+ sha256 = "1vvc8295yadprfqpmk9i43ghymgsqxsg8zfx3p5i86a8xrdhd9vn";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
index f8adc522fc..33308ebc61 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
@@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "ncmpcpp";
- version = "0.8.2";
+ version = "0.9.1";
src = fetchurl {
- url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2";
- sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5";
+ url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2";
+ sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A featureful ncurses based MPD client inspired by ncmpc";
- homepage = "https://ncmpcpp.rybczak.net/";
+ homepage = "https://rybczak.net/ncmpcpp/";
+ changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
index 60fb40c5f7..a101988031 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.4";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "0vdg1ybzfj7xg8nmrb8q9vr8bpwcs52730v9v0413wjyxb7hcll2";
+ sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss";
};
- cargoSha256 = "0afaxx8dv7jn48934ba0r8kd1h8l3k00sl83v07a1xqmfcmil2qf";
+ cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
index 1932f239cf..1796927f52 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "NoiseTorch";
- version = "0.8.2";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "lawl";
repo = "NoiseTorch";
rev = version;
- sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf";
+ sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg";
};
- patches = [ ./version.patch ./embedlibrnnoise.patch ];
+ patches = [ ./version.patch ];
vendorSha256 = null;
@@ -21,6 +21,8 @@ buildGoModule rec {
buildInputs = [ rnnoise-plugin ];
+ postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'";
+
preBuild = ''
export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
go generate;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch b/third_party/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch
deleted file mode 100644
index b1782efb8b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go
-index 43daf80..0b3004b 100644
---- a/scripts/embedlibrnnoise.go
-+++ b/scripts/embedlibrnnoise.go
-@@ -8,7 +8,7 @@ import (
- )
-
- func main() {
-- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so")
-+ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN"))
- if err != nil {
- fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err)
- os.Exit(1)
diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
index fb6f59d0de..17d68c1e5d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix
@@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.5.2";
+ version = "2.5.5";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j";
+ sha256 = "0i97cfnfgg4g13ms8x3bq279s4r7jckxxrv3sdz7dxpcn6gkw35s";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix
index 8cb28dcfd5..4ac64afe85 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
+{ stdenv, mkDerivation, fetchFromGitHub
+, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras
+# Enable jack session support
+, jackSession ? false
+}:
mkDerivation rec {
- version = "0.6.3";
+ version = "0.9.0";
pname = "qjackctl";
# some dependencies such as killall have to be installed additionally
- src = fetchurl {
- url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
- sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x";
+ src = fetchFromGitHub {
+ owner = "rncbc";
+ repo = "qjackctl";
+ rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}";
+ sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr";
};
buildInputs = [
@@ -20,13 +26,19 @@ mkDerivation rec {
dbus
];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
- configureFlags = [ "--enable-jack-version" ];
+ cmakeFlags = [
+ "-DCONFIG_JACK_VERSION=1"
+ "-DCONFIG_JACK_SESSION=${toString jackSession}"
+ ];
meta = with stdenv.lib; {
description = "A Qt application to control the JACK sound server daemon";
- homepage = "http://qjackctl.sourceforge.net/";
+ homepage = "https://github.com/rncbc/qjackctl";
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix
index 961314088d..f2d5ae1c80 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix
@@ -1,35 +1,79 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2
-, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
-, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd
-, sord, sratom, stdenv, suil, wrapQtAppsHook }:
+{ alsaLib
+, aubio
+, cmake
+, dssi
+, fetchurl
+, flac
+, libjack2
+, ladspaH
+, ladspaPlugins
+, liblo
+, libmad
+, libsamplerate
+, libsndfile
+, libtool
+, libvorbis
+, lilv
+, lv2
+, mkDerivation
+, opusfile
+, pkg-config
+, qttools
+, qtbase
+, rubberband
+, serd
+, sord
+, sratom
+, stdenv
+, suil
+}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "qtractor";
- version = "0.9.18";
+ version = "0.9.19";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr";
+ sha256 = "sha256-98/trRZRvNRPEA4ASS81qp2rMevpo5TIrtsU1TYMuT0=";
};
nativeBuildInputs = [
- autoconf automake libtool pkgconfig qttools wrapQtAppsHook
+ cmake
+ libtool
+ pkg-config
+ qttools
];
- buildInputs =
- [ alsaLib dssi libjack2 ladspaH
- ladspaPlugins liblo libmad libsamplerate libsndfile libtool
- libvorbis lilv lv2 qtbase rubberband serd sord sratom
- suil
- ];
-
- enableParallelBuilding = true;
+ buildInputs = [
+ alsaLib
+ aubio
+ dssi
+ flac
+ libjack2
+ ladspaH
+ ladspaPlugins
+ liblo
+ libmad
+ libsamplerate
+ libsndfile
+ libtool
+ libvorbis
+ lilv
+ lv2
+ opusfile
+ qtbase
+ rubberband
+ serd
+ sord
+ sratom
+ suil
+ ];
meta = with stdenv.lib; {
description = "Audio/MIDI multi-track sequencer";
- homepage = "http://qtractor.sourceforge.net";
+ homepage = "https://qtractor.sourceforge.io";
license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
index b0f464cbfd..24f58a6c2c 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "go-ethereum";
- version = "1.9.24";
+ version = "1.9.25";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j";
+ sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd";
};
runVend = true;
- vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068";
+ vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
index 16f4aefe34..c25fd1b215 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
@@ -4,6 +4,7 @@
, qtbase, qtdeclarative, qtgraphicaleffects
, qtmultimedia, qtxmlpatterns
, qtquickcontrols, qtquickcontrols2
+, qtmacextras
, monero, miniupnpc, unbound, readline
, boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpgerror
@@ -27,13 +28,13 @@ in
stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.17.1.5";
+ version = "0.17.1.7";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0";
+ sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4";
};
nativeBuildInputs = [
@@ -49,7 +50,8 @@ stdenv.mkDerivation rec {
randomx libgcrypt libgpgerror
boost libunwind libsodium pcsclite
zeromq hidapi rapidjson
- ] ++ optionals trezorSupport [ libusb1 protobuf python3 ];
+ ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
+ ++ optionals stdenv.isDarwin [ qtmacextras ];
postUnpack = ''
# copy monero sources here
@@ -105,7 +107,6 @@ stdenv.mkDerivation rec {
homepage = "https://getmonero.org/";
license = licenses.bsd3;
platforms = platforms.all;
- badPlatforms = platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
index 2978d65e2e..3a25405371 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
@@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec {
pname = "monero";
- version = "0.17.1.5";
+ version = "0.17.1.7";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
- sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b";
+ sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix
index b8aa3de44d..cf0b60ab98 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "turbo-geth";
- version = "2020.12.01";
+ version = "2020.12.02";
src = fetchFromGitHub {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
- sha256 = "0l1qj10vhfkrk66zihz8m24pnyj8jbb65a7amvphp07r199swy2a";
+ sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q";
};
- vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr";
+ vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar";
runVend = true;
subPackages = [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
index e566661d36..4a0dbe8371 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.12.2";
+ version = "1.1.12.3";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
- sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r";
+ sha256 = "1x4gqmiwdp5bjq7c5hjch3srsvf73d92lswnp355l7l7cxh2hcsx";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
index 0afbecb84c..586e2343cd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
@@ -12,13 +12,13 @@ assert stdenv ? glibc;
# find the downloads needed for new versions
#
# to test:
-# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
+# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
let
platform_major = "4";
- platform_minor = "17";
+ platform_minor = "18";
year = "2020";
- month = "09";
+ month = "12";
timestamp = "${year}${month}021800";
gtk = gtk3;
in rec {
@@ -37,7 +37,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh";
+ sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ==";
};
};
@@ -49,7 +49,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y";
+ sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ==";
};
};
@@ -61,7 +61,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9";
+ sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg==";
};
};
@@ -86,7 +86,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k";
+ sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ==";
};
};
@@ -98,7 +98,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q";
+ sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ==";
};
};
@@ -110,7 +110,31 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1";
+ sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA==";
+ };
+ };
+
+ ### Eclipse IDE for RCP and RAP Developers
+
+ eclipse-rcp = buildEclipse {
+ name = "eclipse-rcp-${platform_major}.${platform_minor}";
+ description = "Eclipse IDE for RCP and RAP Developers";
+ src =
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
+ sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g==";
+ };
+ };
+
+ ### Eclipse IDE for Rust Developers
+
+ eclipse-rust = buildEclipse {
+ name = "eclipse-rust-${platform_major}.${platform_minor}";
+ description = "Eclipse IDE for Rust Developers";
+ src =
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
+ sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw==";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
index 43ab2a796e..0b58bc2106 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
@@ -255,12 +255,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
# find current version at https://www.eclipse.org/cdt/downloads.php
- version = "10.0.1";
+ version = "10.1.0";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip";
- sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5";
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip";
+ sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";
};
meta = with stdenv.lib; {
@@ -472,12 +472,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.17";
+ version = "4.18";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip";
- sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky";
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip";
+ sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a56cb73fb2..b473eb99c3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -193,10 +193,10 @@
elpaBuild {
pname = "ascii-art-to-unicode";
ename = "ascii-art-to-unicode";
- version = "1.12";
+ version = "1.13";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.12.el";
- sha256 = "1w9h2lyriafxj71r79774gh822cz8mry3gdfzyj6ym6v9mvqypna";
+ url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.el";
+ sha256 = "1c0jva3amhl9c5xc5yzdpi58c8m1djym4ccj31z6wmakq7npy07p";
};
packageRequires = [];
meta = {
@@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
- version = "12.2.4";
+ version = "12.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar";
- sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py";
+ url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar";
+ sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -294,7 +294,7 @@
license = lib.licenses.free;
};
}) {};
- bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bbdb";
ename = "bbdb";
@@ -303,7 +303,7 @@
url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bbdb.html";
license = lib.licenses.free;
@@ -328,10 +328,10 @@
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
- version = "0.1.2";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/bluetooth-0.1.2.el";
- sha256 = "1vp2vpyq0ybjni35ics1mg1kiwgvc7x12dlmvygy78sqp52sfkcv";
+ url = "https://elpa.gnu.org/packages/bluetooth-0.2.el";
+ sha256 = "1dq04p6ms0zx4awlypp4crkz7dzal4xg8ac7p8fqacz196rczssp";
};
packageRequires = [ dash emacs ];
meta = {
@@ -394,8 +394,8 @@
ename = "bug-hunter";
version = "1.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el";
- sha256 = "0xplsnmj144r90vxxkmpdxlaq6gyx4ca6iklq60wd0w05fw9q02x";
+ url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar";
+ sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21";
};
packageRequires = [ cl-lib seq ];
meta = {
@@ -542,10 +542,10 @@
elpaBuild {
pname = "compact-docstrings";
ename = "compact-docstrings";
- version = "0.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/compact-docstrings-0.1.el";
- sha256 = "1qmxn1i07nnzfckl06lg3xpvccx2hjgpypgc9v4pdihjfdwnifm5";
+ url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.el";
+ sha256 = "0qcxvcwpl263fs1zd6gmbqliwlpkw012p5ba6y05fpm9p10v600h";
};
packageRequires = [];
meta = {
@@ -642,8 +642,8 @@
ename = "counsel";
version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/counsel-0.13.1.el";
- sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli";
+ url = "https://elpa.gnu.org/packages/counsel-0.13.1.tar";
+ sha256 = "0m4dmhj33cxaapn9lf7bj1r680gi2wd7cw9xlssjklzvic29a6db";
};
packageRequires = [ emacs swiper ];
meta = {
@@ -655,10 +655,10 @@
elpaBuild {
pname = "cpio-mode";
ename = "cpio-mode";
- version = "0.16";
+ version = "0.17";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar";
- sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q";
+ url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
+ sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x";
};
packageRequires = [ emacs ];
meta = {
@@ -685,10 +685,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
- version = "1.12";
+ version = "1.13";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/csv-mode-1.12.tar";
- sha256 = "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j";
+ url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar";
+ sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -760,10 +760,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
- version = "0.25";
+ version = "0.27";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/debbugs-0.25.tar";
- sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni";
+ url = "https://elpa.gnu.org/packages/debbugs-0.27.tar";
+ sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv";
};
packageRequires = [ emacs soap-client ];
meta = {
@@ -895,10 +895,10 @@
elpaBuild {
pname = "djvu";
ename = "djvu";
- version = "1.1";
+ version = "1.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/djvu-1.1.el";
- sha256 = "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7";
+ url = "https://elpa.gnu.org/packages/djvu-1.1.1.el";
+ sha256 = "0z2qk1v4qkvcwl27ycqfb8vyszq5v6b8ci29b4la00yaki16p04i";
};
packageRequires = [];
meta = {
@@ -955,10 +955,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
- version = "0.6.18";
+ version = "0.6.21";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar";
- sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw";
+ url = "https://elpa.gnu.org/packages/ebdb-0.6.21.tar";
+ sha256 = "0pp190wr6z98kggmw9ls486f9vxfimdjdbqsp263qiyi21ws98if";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@@ -985,10 +985,10 @@
elpaBuild {
pname = "ebdb-i18n-chn";
ename = "ebdb-i18n-chn";
- version = "1.3";
+ version = "1.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.el";
- sha256 = "1w7xgagscyjxrw4xl8bz6wf7skvdvk5qdcp5p7kxl4r9nhjffj20";
+ url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el";
+ sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl";
};
packageRequires = [ ebdb pyim ];
meta = {
@@ -1015,10 +1015,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
- version = "20200224";
+ version = "20201013";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eev-20200224.tar";
- sha256 = "1r1wh001ikg34axihffrhzl0n8r0w42s2hac2jys8sil1hqvx306";
+ url = "https://elpa.gnu.org/packages/eev-20201013.tar";
+ sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8";
};
packageRequires = [ emacs ];
meta = {
@@ -1070,10 +1070,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
- version = "1.8.0";
+ version = "1.11.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el";
- sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w";
+ url = "https://elpa.gnu.org/packages/eldoc-1.11.0.el";
+ sha256 = "1py9l1vl7s90y5kfpglhy11jswam2gcrqap09h6wb5ldnyb8cgq2";
};
packageRequires = [ emacs ];
meta = {
@@ -1115,10 +1115,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
- version = "1.7";
+ version = "1.9";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar";
- sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz";
+ url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
+ sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
};
packageRequires = [];
meta = {
@@ -1126,16 +1126,16 @@
license = lib.licenses.free;
};
}) {};
- emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+ emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "emms";
ename = "emms";
- version = "5.42";
+ version = "6.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/emms-5.42.tar";
- sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj";
+ url = "https://elpa.gnu.org/packages/emms-6.2.tar";
+ sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/emms.html";
license = lib.licenses.free;
@@ -1202,10 +1202,10 @@
elpaBuild {
pname = "excorporate";
ename = "excorporate";
- version = "0.8.3";
+ version = "0.9.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/excorporate-0.8.3.tar";
- sha256 = "04bsbiwgfbfd501qvwh0iwyk0xh442kjfj73b3876idwj3p8alr5";
+ url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar";
+ sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j";
};
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
meta = {
@@ -1363,6 +1363,21 @@
license = lib.licenses.free;
};
}) {};
+ gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "gcmh";
+ ename = "gcmh";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/gcmh-0.2.1.el";
+ sha256 = "0a51bkkfdj3x26yalvk7v35rxbl3m1wk6n0f33zhrhl6i5fsrfin";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/gcmh.html";
+ license = lib.licenses.free;
+ };
+ }) {};
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ggtags";
@@ -1427,10 +1442,10 @@
elpaBuild {
pname = "gnorb";
ename = "gnorb";
- version = "1.6.7";
+ version = "1.6.9";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.6.7.tar";
- sha256 = "17pz6i51z298rk7j3rraw1gxlssn88yi4bbpzyxv9cs7y1lfy8ld";
+ url = "https://elpa.gnu.org/packages/gnorb-1.6.9.tar";
+ sha256 = "027qqcxd3531f0j6frwlnw542lis4xgsx0ss1mdwb6hqc5f0vaxm";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1479,10 +1494,10 @@
elpaBuild {
pname = "gnugo";
ename = "gnugo";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar";
- sha256 = "0xpjvs250gg71qwapdsb1hlc61gs0gpkjds01srf784fvyxx2gf1";
+ url = "https://elpa.gnu.org/packages/gnugo-3.1.1.tar";
+ sha256 = "035rgiz42q042h41l4cvf0hr8igy2vyn3s1hsl2pgh2dq2jjylv6";
};
packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
meta = {
@@ -1535,6 +1550,21 @@
license = lib.licenses.free;
};
}) {};
+ greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "greenbar";
+ ename = "greenbar";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/greenbar-1.1.el";
+ sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/greenbar.html";
+ license = lib.licenses.free;
+ };
+ }) {};
guess-language = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@@ -1636,10 +1666,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
- version = "7.1.2";
+ version = "7.1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar";
- sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1";
+ url = "https://elpa.gnu.org/packages/hyperbole-7.1.3.tar";
+ sha256 = "0bizibn4qgxqp89fyik6p47s9hss1g932mg8k7pznn3kkhj5c8rh";
};
packageRequires = [ emacs ];
meta = {
@@ -1707,6 +1737,26 @@
license = lib.licenses.free;
};
}) {};
+ ivy-posframe = callPackage ({ elpaBuild
+ , emacs
+ , fetchurl
+ , ivy
+ , lib
+ , posframe }:
+ elpaBuild {
+ pname = "ivy-posframe";
+ ename = "ivy-posframe";
+ version = "0.5.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el";
+ sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6";
+ };
+ packageRequires = [ emacs ivy posframe ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
+ license = lib.licenses.free;
+ };
+ }) {};
javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "javaimp";
@@ -1756,10 +1806,10 @@
elpaBuild {
pname = "json-mode";
ename = "json-mode";
- version = "0.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/json-mode-0.1.el";
- sha256 = "025bwpx7nc1qhdyf2yaqjdr6x1qr6q45776yvy427xdh4nbk054l";
+ url = "https://elpa.gnu.org/packages/json-mode-0.2.el";
+ sha256 = "16ph6v9snvlmclg9shnyck86dqvlj4lf8205dhqx4l8vmhfy3d14";
};
packageRequires = [ emacs ];
meta = {
@@ -1771,10 +1821,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
- version = "1.0.12";
+ version = "1.0.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el";
- sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad";
+ url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el";
+ sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6";
};
packageRequires = [ emacs ];
meta = {
@@ -1831,10 +1881,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
- version = "4.2.5";
+ version = "4.3.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar";
- sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw";
+ url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar";
+ sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi";
};
packageRequires = [ emacs ];
meta = {
@@ -1966,10 +2016,10 @@
elpaBuild {
pname = "markchars";
ename = "markchars";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/markchars-0.2.1.el";
- sha256 = "0dpq3brblcxjkcqv3xsmlsx5z9zbv94v0kg4j1sic3brz6hbl4lk";
+ url = "https://elpa.gnu.org/packages/markchars-0.2.2.el";
+ sha256 = "09a471c2mcjm6ia37xqz0573sy8f68d5ljgnmhrj0v455g1g44lj";
};
packageRequires = [];
meta = {
@@ -2071,10 +2121,10 @@
elpaBuild {
pname = "minimap";
ename = "minimap";
- version = "1.3";
+ version = "1.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/minimap-1.3.el";
- sha256 = "15azlmi6kk9pg1c4zrw952qsh9wq6ggqb4qqc84a7l67nhqb9bqp";
+ url = "https://elpa.gnu.org/packages/minimap-1.4.el";
+ sha256 = "09fm0ziy8cdzzw08l7l6p63dxz2a27p3laia2v51mvbva8177ls1";
};
packageRequires = [];
meta = {
@@ -2101,10 +2151,10 @@
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el";
- sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd";
+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
+ sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
};
packageRequires = [ emacs ];
meta = {
@@ -2116,10 +2166,10 @@
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el";
- sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif";
+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el";
+ sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn";
};
packageRequires = [ emacs ];
meta = {
@@ -2131,10 +2181,10 @@
elpaBuild {
pname = "multishell";
ename = "multishell";
- version = "1.1.5";
+ version = "1.1.9";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar";
- sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y";
+ url = "https://elpa.gnu.org/packages/multishell-1.1.9.tar";
+ sha256 = "0gi5qmx27v7kaczr9b3sic69br3l7mcws3sdrs8c14iipcyl5qhb";
};
packageRequires = [ cl-lib ];
meta = {
@@ -2301,16 +2351,16 @@
license = lib.licenses.free;
};
}) {};
- oauth2 = callPackage ({ elpaBuild, fetchurl, lib }:
+ oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
elpaBuild {
pname = "oauth2";
ename = "oauth2";
- version = "0.13";
+ version = "0.15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/oauth2-0.13.el";
- sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r";
+ url = "https://elpa.gnu.org/packages/oauth2-0.15.el";
+ sha256 = "0ij17g6i8d4cyzc8v6sy2qglwhzd767331gavll6d507krdh3ca3";
};
- packageRequires = [];
+ packageRequires = [ cl-lib nadvice ];
meta = {
homepage = "https://elpa.gnu.org/packages/oauth2.html";
license = lib.licenses.free;
@@ -2380,10 +2430,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "9.3.6";
+ version = "9.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-9.3.6.tar";
- sha256 = "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d";
+ url = "https://elpa.gnu.org/packages/org-9.4.tar";
+ sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6";
};
packageRequires = [];
meta = {
@@ -2395,10 +2445,10 @@
elpaBuild {
pname = "org-edna";
ename = "org-edna";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-edna-1.1.1.tar";
- sha256 = "1hfkdjbjnhbwb27vgs43ywl4kn2lqc037f4xppp2v0s97850za8r";
+ url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar";
+ sha256 = "1a022ssqpxbkp03n2bij78srwjx7kacpsgj9a6wbm0yn946hgjpz";
};
packageRequires = [ emacs org seq ];
meta = {
@@ -2406,14 +2456,29 @@
license = lib.licenses.free;
};
}) {};
+ org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
+ elpaBuild {
+ pname = "org-translate";
+ ename = "org-translate";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el";
+ sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/org-translate.html";
+ license = lib.licenses.free;
+ };
+ }) {};
orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "orgalist";
ename = "orgalist";
- version = "1.12";
+ version = "1.13";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/orgalist-1.12.el";
- sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd";
+ url = "https://elpa.gnu.org/packages/orgalist-1.13.el";
+ sha256 = "1wkxc5kcy1g4lx6pd78pa8znncjyl9zyhsvz7wpp56qmhq4hlav3";
};
packageRequires = [ emacs ];
meta = {
@@ -2545,10 +2610,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
- version = "0.3.52";
+ version = "0.3.65";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar";
- sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92";
+ url = "https://elpa.gnu.org/packages/phps-mode-0.3.65.tar";
+ sha256 = "18pqxwfmciz9d2w808mvspkcifrja85y2qjwmb6pbdnkj9dr6yad";
};
packageRequires = [ emacs ];
meta = {
@@ -2590,10 +2655,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
- version = "0.8.0";
+ version = "0.8.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/posframe-0.8.0.el";
- sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp";
+ url = "https://elpa.gnu.org/packages/posframe-0.8.3.el";
+ sha256 = "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g";
};
packageRequires = [ emacs ];
meta = {
@@ -2605,10 +2670,10 @@
elpaBuild {
pname = "project";
ename = "project";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/project-0.5.1.el";
- sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4";
+ url = "https://elpa.gnu.org/packages/project-0.5.2.el";
+ sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655";
};
packageRequires = [ emacs xref ];
meta = {
@@ -2650,10 +2715,10 @@
elpaBuild {
pname = "python";
ename = "python";
- version = "0.26.1";
+ version = "0.27";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/python-0.26.1.el";
- sha256 = "1dpw2w2nk6ggr8pz293qysjkiya3i7k25i447fbycjil59anzpb3";
+ url = "https://elpa.gnu.org/packages/python-0.27.el";
+ sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -2896,6 +2961,21 @@
license = lib.licenses.free;
};
}) {};
+ rec-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "rec-mode";
+ ename = "rec-mode";
+ version = "1.6";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar";
+ sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/rec-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
register-list = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "register-list";
@@ -2915,10 +2995,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
- version = "1.18";
+ version = "1.19";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/relint-1.18.tar";
- sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci";
+ url = "https://elpa.gnu.org/packages/relint-1.19.tar";
+ sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi";
};
packageRequires = [ emacs xr ];
meta = {
@@ -2981,10 +3061,10 @@
elpaBuild {
pname = "rudel";
ename = "rudel";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar";
- sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz";
+ url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar";
+ sha256 = "03hcvpp6ykavidwn5x48gs986w1i5icvh7ks6p74pdaagpgw4jmk";
};
packageRequires = [ cl-generic cl-lib cl-print emacs ];
meta = {
@@ -3041,10 +3121,10 @@
elpaBuild {
pname = "seq";
ename = "seq";
- version = "2.20";
+ version = "2.22";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/seq-2.20.tar";
- sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n";
+ url = "https://elpa.gnu.org/packages/seq-2.22.tar";
+ sha256 = "0zlqcbabzj8crg36ird2l74dbg5k7w1zf5iwva0h2dyvwyf9grma";
};
packageRequires = [];
meta = {
@@ -3067,6 +3147,21 @@
license = lib.licenses.free;
};
}) {};
+ shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "shell-command-plus";
+ ename = "shell-command+";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
+ sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+ license = lib.licenses.free;
+ };
+ }) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shen-mode";
@@ -3097,14 +3192,29 @@
license = lib.licenses.free;
};
}) {};
+ slime-volleyball = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "slime-volleyball";
+ ename = "slime-volleyball";
+ version = "1.1.7";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/slime-volleyball-1.1.7.tar";
+ sha256 = "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
+ license = lib.licenses.free;
+ };
+ }) {};
sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sm-c-mode";
ename = "sm-c-mode";
- version = "1.0";
+ version = "1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el";
- sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91";
+ url = "https://elpa.gnu.org/packages/sm-c-mode-1.1.el";
+ sha256 = "1k46628dkmg4bvd5f68lv5kjcjbgm2pd8jc0zhq9n70jwf5z2ip8";
};
packageRequires = [];
meta = {
@@ -3176,10 +3286,10 @@
elpaBuild {
pname = "soap-client";
ename = "soap-client";
- version = "3.1.5";
+ version = "3.2.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/soap-client-3.1.5.tar";
- sha256 = "0nnf075ywxmsfd6vmzk2yg3khx6sycl5l6qrgp5rqqmw0wzhxlh0";
+ url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar";
+ sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s";
};
packageRequires = [ cl-lib ];
meta = {
@@ -3232,6 +3342,21 @@
license = lib.licenses.free;
};
}) {};
+ sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "sql-beeline";
+ ename = "sql-beeline";
+ version = "0.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/sql-beeline-0.1.el";
+ sha256 = "0z2wdvvq1zdw90253s5i57lx8b59rjf7g7isns4yz29lwav04j3r";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
+ license = lib.licenses.free;
+ };
+ }) {};
sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sql-indent";
@@ -3251,10 +3376,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
- version = "3.1.11";
+ version = "3.1.12";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.11.tar";
- sha256 = "1xd09kfn7lqw6jzfkrn0p5agdpcz1z9zbazqigylpqfcywr5snhk";
+ url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.12.tar";
+ sha256 = "0fz49l63jfw9zy459f07bq2irdb8ispnx8m2c3wxwiim9yw5xnjg";
};
packageRequires = [ emacs ];
meta = {
@@ -3281,10 +3406,10 @@
elpaBuild {
pname = "svg";
ename = "svg";
- version = "1.0";
+ version = "1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/svg-1.0.el";
- sha256 = "1hh0x7sz2rqb7zdhcm2q9knr8nnwqrsbz1zfp29k8l1318li9f62";
+ url = "https://elpa.gnu.org/packages/svg-1.1.el";
+ sha256 = "0j69xsaj0d1pnxjfb5m0yf2vxbrcmr8i3g75km4dzbha46v4xxvg";
};
packageRequires = [ emacs ];
meta = {
@@ -3313,8 +3438,8 @@
ename = "swiper";
version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/swiper-0.13.1.el";
- sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y";
+ url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar";
+ sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1";
};
packageRequires = [ emacs ivy ];
meta = {
@@ -3420,10 +3545,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
- version = "2.4.4.1";
+ version = "2.4.4.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar";
- sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3";
+ url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar";
+ sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8";
};
packageRequires = [ emacs ];
meta = {
@@ -3480,10 +3605,10 @@
elpaBuild {
pname = "undo-tree";
ename = "undo-tree";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/undo-tree-0.7.4.el";
- sha256 = "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa";
+ url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el";
+ sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p";
};
packageRequires = [];
meta = {
@@ -3495,10 +3620,10 @@
elpaBuild {
pname = "uni-confusables";
ename = "uni-confusables";
- version = "0.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/uni-confusables-0.1.tar";
- sha256 = "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp";
+ url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar";
+ sha256 = "1lak9sr0h7hmc4qb7lzjqc1f88vjzbk8n76sspplfrizs3avg5ps";
};
packageRequires = [];
meta = {
@@ -3560,6 +3685,21 @@
license = lib.licenses.free;
};
}) {};
+ valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "valign";
+ ename = "valign";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/valign-3.0.0.el";
+ sha256 = "16f889x6yc1af2bmbly2lww4sy1s864ll75xdxp28i5m57gj25w8";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/valign.html";
+ license = lib.licenses.free;
+ };
+ }) {};
vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vcard";
@@ -3594,10 +3734,10 @@
elpaBuild {
pname = "vdiff";
ename = "vdiff";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el";
- sha256 = "197wszzhm2kbfvvlg3f0dzfs3lf4536yq5fd67k2rycj421fr9qz";
+ url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar";
+ sha256 = "1mgzfrzp6nbb4xv2zjqk4za2dv3r5645jasiwf45wzqq5wbrgq2c";
};
packageRequires = [ emacs hydra ];
meta = {
@@ -3674,10 +3814,10 @@
elpaBuild {
pname = "vlf";
ename = "vlf";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar";
- sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz";
+ url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar";
+ sha256 = "0hpri19z6b7dqmrj5ckp8sf0m0l72lkgahqzvfmwhgpgv2p81bny";
};
packageRequires = [];
meta = {
@@ -3704,10 +3844,10 @@
elpaBuild {
pname = "wcheck-mode";
ename = "wcheck-mode";
- version = "2019.6.17";
+ version = "2020.10.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/wcheck-mode-2019.6.17.el";
- sha256 = "0579a3p9swq0j0fca9s885kzv69y9lhhnqa6m4pzdgrr6pfrirqv";
+ url = "https://elpa.gnu.org/packages/wcheck-mode-2020.10.4.el";
+ sha256 = "0pi6gvyw80phmx0qzc5wdk5czv4m9cq1hs3l4s7r8rr91g2cqi3m";
};
packageRequires = [];
meta = {
@@ -3749,10 +3889,10 @@
elpaBuild {
pname = "webfeeder";
ename = "webfeeder";
- version = "1.0.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/webfeeder-1.0.0.tar";
- sha256 = "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64";
+ url = "https://elpa.gnu.org/packages/webfeeder-1.1.1.tar";
+ sha256 = "09caj12hfdfhlbcsmjyhw728w1f7yq13hdslh793yvfqv83ipvc4";
};
packageRequires = [ emacs ];
meta = {
@@ -3779,10 +3919,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
- version = "3.3.0";
+ version = "3.3.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/which-key-3.3.0.tar";
- sha256 = "0436hvqdn2jafgfwdr0m9mwz8k2swl661xnrkypyrwg66j9wi1qz";
+ url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
+ sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
};
packageRequires = [ emacs ];
meta = {
@@ -3919,10 +4059,10 @@
elpaBuild {
pname = "xr";
ename = "xr";
- version = "1.19";
+ version = "1.20";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xr-1.19.tar";
- sha256 = "1aa3iqh0r635jw8k89zh8y4am9d4hfrqpk9mrdh2b51invjn8llq";
+ url = "https://elpa.gnu.org/packages/xr-1.20.tar";
+ sha256 = "0i3vfsp110z60gabn9x9rv21fvm7nnr234mvmpp7gx4l4hpadvzy";
};
packageRequires = [ emacs ];
meta = {
@@ -3934,10 +4074,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xref-1.0.2.el";
- sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8";
+ url = "https://elpa.gnu.org/packages/xref-1.0.3.el";
+ sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3";
};
packageRequires = [ emacs ];
meta = {
@@ -4008,4 +4148,4 @@
license = lib.licenses.free;
};
}) {};
- }
\ No newline at end of file
+ }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix
index 852f395c4a..b4b9adfa61 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/emacs2nix.nix
@@ -4,8 +4,8 @@ let
src = pkgs.fetchgit {
url = "https://github.com/ttuegel/emacs2nix.git";
fetchSubmodules = true;
- rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c";
- sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh";
+ rev = "798542b34dc8d7f5c110119350bd9bafef9f8439";
+ sha256 = "1lna9z90sxjnanggjh2si018cfzp60xsrissnv9bbkc8wish1537";
};
in pkgs.mkShell {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 03e9923f73..5a02c97b6d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -252,12 +252,6 @@ let
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
- magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
- # searches for Git at build time
- nativeBuildInputs =
- (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
- });
-
magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -426,21 +420,36 @@ let
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
+ # upstream issue: missing file header
+ instapaper = markBroken super.instapaper;
+
# upstream issue: missing file header
jsfmt = markBroken super.jsfmt;
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
+ # upstream issue: doesn't build
+ magit-stgit = markBroken super.magit-stgit;
+
+ # upstream issue: missing file header
+ melancholy-theme = markBroken super.melancholy-theme;
+
# upstream issue: doesn't build
eterm-256color = markBroken super.eterm-256color;
+ # upstream issue: doesn't build
+ per-buffer-theme = markBroken super.per-buffer-theme;
+
# upstream issue: missing file header
qiita = markBroken super.qiita;
# upstream issue: missing file header
speech-tagger = markBroken super.speech-tagger;
+ # upstream issue: missing file header
+ sql-presto = markBroken super.sql-presto;
+
# upstream issue: missing file header
textmate = markBroken super.textmate;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
index b0eccbd888..23d36573bc 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20200817";
+ version = "20201207";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20200817.tar";
- sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d";
+ url = "https://orgmode.org/elpa/org-20201207.tar";
+ sha256 = "0hryicg3nbvc17ypwdcx08kl8samd979388hw7jwbp5sw3v95y0c";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20200817";
+ version = "20201207";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar";
- sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20201207.tar";
+ sha256 = "07xmnxrn63ini3c8hfrgv13b28dh91x2lpf875fhi5wz70w0a9s4";
};
packageRequires = [];
meta = {
@@ -30,4 +30,4 @@
license = lib.licenses.free;
};
}) {};
- }
\ No newline at end of file
+ }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 98346d4d82..a8d79b3d8c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,20 +31,20 @@
"url": "https://git.sr.ht/~zge/nullpointer-emacs",
"unstable": {
"version": [
- 20200521,
- 1352
+ 20201121,
+ 1210
],
- "commit": "16581d94a1e32677091f3721506a48177cc49e68",
- "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq"
+ "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c",
+ "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq"
},
"stable": {
"version": [
0,
- 3,
+ 4,
1
],
- "commit": "16581d94a1e32677091f3721506a48177cc49e68",
- "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq"
+ "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c",
+ "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq"
}
},
{
@@ -55,14 +55,14 @@
"repo": "AdamNiederer/0xc",
"unstable": {
"version": [
- 20190219,
- 117
+ 20201025,
+ 2105
],
"deps": [
"s"
],
- "commit": "167e93ce863381a58988655927042514d984ad49",
- "sha256": "0msx29il7c01njlc4pwxs3f3qcvyakgjcivxaa287jibf67yg0ph"
+ "commit": "eec4fb10b9288c0852f751cfb05d638664fa2411",
+ "sha256": "1s3jpnjb033siyi9jkychbbqxnh31k7h9prfx7hvs5zlddp15cqv"
}
},
{
@@ -80,6 +80,29 @@
"sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3"
}
},
+ {
+ "ename": "2bit",
+ "commit": "ef96a414470d59c68659f5a66b6244f35804e2d7",
+ "sha256": "0npkjj21hcngzp2cl9g42l259wrf66x5h4hnd96a4wv2v4a74w23",
+ "fetcher": "github",
+ "repo": "davep/2bit.el",
+ "unstable": {
+ "version": [
+ 20200926,
+ 1418
+ ],
+ "commit": "69b4ec1d6d2ad95c9e59dacb43224abbec7a8989",
+ "sha256": "086hxacbm2jjqak3b1dpnjhif2r3w3jvrrsg114224a26rwz49sm"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "commit": "1ce390483cf55a039a8bdad28d294ce068f31e75",
+ "sha256": "01w4mr663jzjfznm301br96ggnlw9pz35cx2zxdpn8h1qnb1b0l6"
+ }
+ },
{
"ename": "4clojure",
"commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13",
@@ -121,11 +144,11 @@
"repo": "plexus/a.el",
"unstable": {
"version": [
- 20180907,
- 953
+ 20201203,
+ 1927
],
- "commit": "18966975db7110d0aac726be95b593e2fc3d44ed",
- "sha256": "0d8ffpc8r7xial9q0miyxab6mbh9rm6sckvw9g10cgp8f1rrk7h4"
+ "commit": "3d341eb7813ee02b00ab28e11c915295bfd4b5a7",
+ "sha256": "1mc40rcm6364iyckcv9ppjwrs65w3y0zh3yl20dhk8yjilhygpqq"
},
"stable": {
"version": [
@@ -225,6 +248,29 @@
"sha256": "070c408bq5pliq0xbd1861l6db4sbfpnj3r6aknbqh2vb7l4yimb"
}
},
+ {
+ "ename": "abridge-diff",
+ "commit": "9e289182de96d10f020724ec81f2a32d8de0d915",
+ "sha256": "0sxcrg74xlkl84idz9acdvfqamsggdg4dhbdngsvq6cnj8m3j0rb",
+ "fetcher": "github",
+ "repo": "jdtsmith/abridge-diff",
+ "unstable": {
+ "version": [
+ 20200917,
+ 1754
+ ],
+ "commit": "3015630a2fcb2d0f8dc532da4549fad060579b8d",
+ "sha256": "1kwwnba9kvmknrkyznhi7ykkcacggi9q7haplbxf02l6a46652lv"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "449f0d688f3ee44e53f3c9b62595022c5aad8cc7",
+ "sha256": "05x8xn4ibdbfkj7908fn9jl4ga32asnzhyzz7ddfbm899vzzdqpx"
+ }
+ },
{
"ename": "abs-mode",
"commit": "aabccc4061e7764069796e12ee9688b67651cf70",
@@ -233,16 +279,16 @@
"repo": "abstools/abs-mode",
"unstable": {
"version": [
- 20200220,
- 1701
+ 20201021,
+ 958
],
"deps": [
"erlang",
"flymake",
"maude-mode"
],
- "commit": "2db38537e9c481c38477997467bc98ee00607d7a",
- "sha256": "006l73nacbr45y81ypj3x91nd1pnqppvgrlc6wmysma14lndazqx"
+ "commit": "9101779ef8861cb1f46d288946356e600359a4e0",
+ "sha256": "08ymmf030gsk7hfvbjp302micnz2fa087i6f44l2i7yz592myhsz"
},
"stable": {
"version": [
@@ -952,30 +998,30 @@
"repo": "xcwen/ac-php",
"unstable": {
"version": [
- 20190424,
- 222
+ 20200916,
+ 751
],
"deps": [
"ac-php-core",
"auto-complete",
"yasnippet"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd",
+ "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f"
},
"stable": {
"version": [
2,
3,
- 0
+ 1
],
"deps": [
"ac-php-core",
"auto-complete",
"yasnippet"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3",
+ "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn"
}
},
{
@@ -986,8 +1032,8 @@
"repo": "xcwen/ac-php",
"unstable": {
"version": [
- 20200516,
- 52
+ 20201015,
+ 903
],
"deps": [
"dash",
@@ -997,14 +1043,14 @@
"s",
"xcscope"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd",
+ "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f"
},
"stable": {
"version": [
2,
3,
- 0
+ 1
],
"deps": [
"dash",
@@ -1014,8 +1060,8 @@
"s",
"xcscope"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3",
+ "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn"
}
},
{
@@ -1064,8 +1110,8 @@
"auto-complete",
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -1212,25 +1258,20 @@
"repo": "tam17aki/ace-isearch",
"unstable": {
"version": [
- 20200420,
- 518
+ 20200912,
+ 754
],
- "commit": "58e4f1ad5cbbd2f86d161881d3f3ded3a3db984c",
- "sha256": "0mlswnyd89ir060kiinzlrh70mdy8nfm2zpwr9jj2p19hrslmc4r"
+ "commit": "422aaa50b6452c2399682782cbf23168ed4357c6",
+ "sha256": "1gx106znzb6wq72yixq3z8arj1hhh215yy3324shvjwgqkyc3xi8"
},
"stable": {
"version": [
- 0,
1,
- 4
+ 0,
+ 1
],
- "deps": [
- "ace-jump-mode",
- "avy",
- "helm-swoop"
- ],
- "commit": "7e041d058492c5c35ec70de0e7c5586043e7e5ec",
- "sha256": "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9"
+ "commit": "7defe3517f2be444a1479c0a18859d78da4919a5",
+ "sha256": "0l14hd4yqyrwf5iz4g9zdy8bd9rx64yp27hywjs32wm9dssdymvm"
}
},
{
@@ -1566,8 +1607,8 @@
20180527,
1701
],
- "commit": "65abd58e198458a8e46748c5962c41d80d60c4ea",
- "sha256": "0cb8kkhh43wg63abjx6d4x55f0l3r6ziqcaz8rz1zr12jffnac8z"
+ "commit": "75639cc7fe85392b5671a1e94dcedb409a949cae",
+ "sha256": "1bhzskg09pkiqdzlzlaf2p48vr2kqrzcmakyzllm4rin1g4j2wrq"
},
"stable": {
"version": [
@@ -1627,8 +1668,8 @@
"deps": [
"request"
],
- "commit": "86bb7249bd4b0c8ebaf749f69f00c8faeff11063",
- "sha256": "062m653pyzddwjf75a6clsdkihfg35b3phbbff6vdyymg77608f2"
+ "commit": "a9314331ba6ea846be9e1f7bded1e2e0ab70cd8e",
+ "sha256": "1mra53dnzz3n8ya9dd0fz8gr19f6jcfsl917xz81awnmxj38nbhq"
},
"stable": {
"version": [
@@ -1790,16 +1831,16 @@
"repo": "Wilfred/ag.el",
"unstable": {
"version": [
- 20190726,
- 9
+ 20201031,
+ 2202
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "bd81d68466e44301505629454dfc689b6c17d94b",
- "sha256": "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx"
+ "commit": "ed7e32064f92f1315cecbfc43f120bbc7508672c",
+ "sha256": "1lm51j99h1wn6djqjc5dwba6kvqwl8vvwwq7p0vdr250l470k90n"
},
"stable": {
"version": [
@@ -1815,6 +1856,35 @@
"sha256": "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx"
}
},
+ {
+ "ename": "agda2-mode",
+ "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c",
+ "sha256": "0vbi64fri02ziy68dvpq1y946w4n4mla8gh1cmldqq8x24l8ssdg",
+ "fetcher": "github",
+ "repo": "agda/agda",
+ "unstable": {
+ "version": [
+ 20200922,
+ 1231
+ ],
+ "deps": [
+ "annotation",
+ "eri"
+ ],
+ "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1",
+ "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 6,
+ 1,
+ 1
+ ],
+ "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71",
+ "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7"
+ }
+ },
{
"ename": "aggressive-fill-paragraph",
"commit": "982f5936f2d83222263df2886ca0b629076366bb",
@@ -1841,14 +1911,11 @@
"repo": "Malabarba/aggressive-indent-mode",
"unstable": {
"version": [
- 20200512,
- 1207
+ 20200824,
+ 2352
],
- "deps": [
- "cl-lib"
- ],
- "commit": "12a64b4e5c1a1e124baa74336738b6ae1972607f",
- "sha256": "1pkqjg30l9sjh5m8w4p8qrlw92sxr28c3d7mq6h8sfc8dkgivd33"
+ "commit": "b0ec0047aaae071ad1647159613166a253410a63",
+ "sha256": "0rz010ypy1rg8v6na05zs942ikzqg1l32inzpzqg2q2rnfa3wkx1"
},
"stable": {
"version": [
@@ -2264,14 +2331,14 @@
"repo": "domtronn/all-the-icons.el",
"unstable": {
"version": [
- 20200730,
- 1545
+ 20200923,
+ 1339
],
"deps": [
"memoize"
],
- "commit": "8c0228053dd6693d926970d89270094be52b0f75",
- "sha256": "08p2x6da4dp6imw6dg501kw68m4rhjfdbc6yn5ld29mazvv923zl"
+ "commit": "6917b08f64dd8487e23769433d6cb9ba11f4152f",
+ "sha256": "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68"
},
"stable": {
"version": [
@@ -2331,26 +2398,26 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20200612,
- 1642
+ 20201027,
+ 758
],
"deps": [
"all-the-icons"
],
- "commit": "8bb1a893e826e39ad4d7abc0add5dd6c33b18f29",
- "sha256": "02sbddvjys6bf8pcbg3pv5fc1f8b48vmx0bnfyqw1x04dyb8cdm7"
+ "commit": "c41e12033712969bfa2e3e9f1c62feae866a48ac",
+ "sha256": "0v8vqgblqf1yq3rgr3lxnzjqq22lvmkjhgpd78acxd6ivq8fzqs4"
},
"stable": {
"version": [
1,
- 2,
+ 3,
0
],
"deps": [
"all-the-icons"
],
- "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2",
- "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2"
+ "commit": "767b52186c1d9ef52f087f34a48af39c31e45b73",
+ "sha256": "1c1fkkwzxxa90fd5q5x6xlj48p8rhj4bs7h8wxx41w6wsggk2fm2"
}
},
{
@@ -2400,8 +2467,8 @@
"all-the-icons",
"ivy-rich"
],
- "commit": "e918b23d55313a7464d8cb5d45eb917249638e32",
- "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4"
+ "commit": "6428cb39729b7290368c5b95f563a320c98f972d",
+ "sha256": "0b9d1cs39j8x238s14b1smrhanapwai123dvpplmgb07wmrwwwwg"
},
"stable": {
"version": [
@@ -2627,6 +2694,21 @@
"sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x"
}
},
+ {
+ "ename": "amsreftex",
+ "commit": "dd75acba5595bb8238b0560f9da02ca9e5a1d949",
+ "sha256": "0mb6ibzbdpzk5mnv71h13rhazzp9bkw45kfs5c3zlwi0mjhk0mch",
+ "fetcher": "github",
+ "repo": "franburstall/amsreftex",
+ "unstable": {
+ "version": [
+ 20201004,
+ 2148
+ ],
+ "commit": "46bc6683e904e898de8bae831df9106cf8881163",
+ "sha256": "07464aijqx7hcksrl522586b48x614sxvjcxdhgz07pipd47r08i"
+ }
+ },
{
"ename": "amx",
"commit": "c55bfad05343b2b0f3150fd2b4adb07a1768c1c0",
@@ -2664,8 +2746,8 @@
"repo": "pythonic-emacs/anaconda-mode",
"unstable": {
"version": [
- 20200806,
- 436
+ 20200912,
+ 239
],
"deps": [
"dash",
@@ -2673,8 +2755,8 @@
"pythonic",
"s"
],
- "commit": "73266a48fa964d44268c3f3478597e553b9843f1",
- "sha256": "0b4zzkr73hmjg92vr348294xymrynw4j0x89jzklh2plizp0alcr"
+ "commit": "39b1cf88c8c459901630d248d6135d8644075648",
+ "sha256": "0nwrs6cw2dpl522rrdhzrka4fkcw4f2grxlz0mjwwlaxafd2zc3y"
},
"stable": {
"version": [
@@ -2808,10 +2890,10 @@
"repo": "emacsattic/angular-mode",
"unstable": {
"version": [
- 20200510,
- 1729
+ 20151201,
+ 2127
],
- "commit": "b24020768217f16b1b86aa236e9729b3d40e17b3",
+ "commit": "8720cde86af0f1859ccc8580571e8d0ad1c52cff",
"sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377"
},
"stable": {
@@ -2982,20 +3064,20 @@
"repo": "bastibe/annotate.el",
"unstable": {
"version": [
- 20200812,
- 1439
+ 20201123,
+ 1732
],
- "commit": "2bf7a7c1acb6768a590954c9bfef5f72ae8cc452",
- "sha256": "05zwfflsx69904jxlayalh3n3n9msl92zw2rk5kk17p9psjpv9yw"
+ "commit": "9320918b91c5ab3ee63f812a0479423233f95821",
+ "sha256": "16xffyf3ch7l644r50pdk7s82mppxhp5v7kz6m47gz81nnyd8kis"
},
"stable": {
"version": [
0,
- 7,
- 0
+ 8,
+ 3
],
- "commit": "99c45f553e7caef693506498d11e4b664b6f2946",
- "sha256": "154655p54xxsbr06lbbdpzzx4hif6542a4cf767qnichsz9cj75j"
+ "commit": "4cc32fc2fb403dd0c501ffe7c23ba13fd23fd6ec",
+ "sha256": "0wjrmy2qsndfg7lwql6xw5b88j468cz365jx1sgpsplkgm25xsk2"
}
},
{
@@ -3013,6 +3095,31 @@
"sha256": "18cav5wl3d0yq15273rqmdwvrgw96lmqiq9x5fxhf3wjb543mifl"
}
},
+ {
+ "ename": "annotation",
+ "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c",
+ "sha256": "0f73v077c1niwcjf5rngmbnlw5k9w1z19im24vhwbgq5k3fg5sx2",
+ "fetcher": "github",
+ "repo": "agda/agda",
+ "unstable": {
+ "version": [
+ 20200914,
+ 644
+ ],
+ "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1",
+ "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 6,
+ 1,
+ 1
+ ],
+ "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71",
+ "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7"
+ }
+ },
{
"ename": "annoying-arrows-mode",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -3081,15 +3188,15 @@
"repo": "k1LoW/emacs-ansible",
"unstable": {
"version": [
- 20200704,
- 1354
+ 20201001,
+ 838
],
"deps": [
"f",
"s"
],
- "commit": "b5ef59406604bc5027f4d816d90e633feef0149c",
- "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3"
+ "commit": "cf6b8f06c2628357fc2a72ea9817a2c2d0ebf690",
+ "sha256": "1pj7z6hsrh6ih1m6x3lbs2af6y30yazc44ahgkdvi00ckd48akqp"
},
"stable": {
"version": [
@@ -3259,19 +3366,19 @@
"repo": "emacsorphanage/anzu",
"unstable": {
"version": [
- 20200514,
- 1801
+ 20201203,
+ 529
],
- "commit": "7b8688c84d6032300d0c415182c7c1ad6cb7f819",
- "sha256": "09x4hhycnv4sc472fqv7z8jpjx8viap5hb143yri3wkwa15bqd3b"
+ "commit": "bdb3da5028935a4aea55c40769bc191a81afb54e",
+ "sha256": "1jfn5nm6r68wa0gn2k2zy6sdq6c8shw8x04ylzzm5cw7zm60jw0n"
},
"stable": {
"version": [
0,
- 63
+ 64
],
- "commit": "a5a22fd537cb3bd2194d1eecc91dca418bedf442",
- "sha256": "11k30174a0z738gcmvpvk8wxsnsdnaf4qphrz0aq8yy0k1pidav2"
+ "commit": "bdb3da5028935a4aea55c40769bc191a81afb54e",
+ "sha256": "1jfn5nm6r68wa0gn2k2zy6sdq6c8shw8x04ylzzm5cw7zm60jw0n"
}
},
{
@@ -3321,11 +3428,11 @@
"repo": "dieter-wilhelm/apdl-mode",
"unstable": {
"version": [
- 20200501,
- 1904
+ 20201024,
+ 1900
],
- "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a",
- "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9"
+ "commit": "178af26baac72890fca1904aa9e9c90bc1668a4c",
+ "sha256": "1mkhjp9i4zhbxj72915g6b976dz7jmzyn2ma9x6n85psi3v7ldk1"
},
"stable": {
"version": [
@@ -3345,11 +3452,11 @@
"repo": "wanderlust/apel",
"unstable": {
"version": [
- 20190407,
- 1056
+ 20201106,
+ 2221
],
- "commit": "d146ddbf8818e81d3577d5eee7825d377bec0c73",
- "sha256": "04ic76gzn3m4rnmm2xjc72vrxazxjvsjabd3lbxvwj6c1fb11fnw"
+ "commit": "4e3269b6e702db2dba48cf560563ac883e81e3bf",
+ "sha256": "1b4ljzq4qyslwxxl6n2izghbl20wwzxxvcq5wk111blnwap4kddw"
}
},
{
@@ -3605,11 +3712,11 @@
"repo": "motform/arduino-cli-mode",
"unstable": {
"version": [
- 20200812,
- 935
+ 20201001,
+ 1357
],
- "commit": "80c5aa6a29a192f9a9d3ba3d7fb7446b1281051a",
- "sha256": "1bj4vlvryk2k3920zc9pg9jca9385hji76nrx7avhd6jsjjm79mf"
+ "commit": "00893089344cfeef387e6da1844fa49d14ff4fa9",
+ "sha256": "1p37c18ax1nki5175xz2c75pjbsg5wsd3m6qaln9x0mj5hdgz860"
}
},
{
@@ -3734,14 +3841,14 @@
"repo": "lassik/emacs-ascii-table",
"unstable": {
"version": [
- 20200329,
- 1744
+ 20201019,
+ 700
],
"deps": [
"cl-lib"
],
- "commit": "572b62c8305b8c26082a17e15bc2f53066ddcb5a",
- "sha256": "1k1wfbwzn9gjv7hmc7ffr3r211vxrxassryar6gnajmj9xbzwcgi"
+ "commit": "4f68ad0b36c365c0652756691ab1703d0d46b4b4",
+ "sha256": "0f0ghwglxv2yil2cbzbhrvgk1p37jldfb974kpfwy6dg8m933rjf"
}
},
{
@@ -3865,8 +3972,8 @@
20200809,
501
],
- "commit": "36a10151e70e956e2f766ed9e65f4a9cfc8479b2",
- "sha256": "08glbksm13kgxvy17x0kg01x9cgnkz01yqqnlwzfaan0zbf6brdl"
+ "commit": "14f48de586b0977e3470f053b810d77b07ea427a",
+ "sha256": "16m67s2mpr2ak7vyc3dxzln3v5136b85dsirjkd2fm2n934q9h0r"
},
"stable": {
"version": [
@@ -3941,6 +4048,30 @@
"sha256": "1pvnwzp0i1s19cyyzrkcannhx1jizvylxsr7qcipfiy2kmf8sbhz"
}
},
+ {
+ "ename": "atl-long-lines",
+ "commit": "e3144a999d236d2718b4b7b94cfafe26c3e4aada",
+ "sha256": "0pb8ysvv2wi5vsv1wj1aac2khjwkjm4rvf70fa0cla4xmnnczxla",
+ "fetcher": "github",
+ "repo": "jcs-elpa/atl-long-lines",
+ "unstable": {
+ "version": [
+ 20201026,
+ 339
+ ],
+ "commit": "449596a61f551ba5f8f3ff731984316e3b99faba",
+ "sha256": "0r21mxadvx4scnmx76kqnqmnvw9mx1394dvs34i5mr02nal3vhsg"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
+ ],
+ "commit": "4d340ee74e1aa37a7204acddb8826684b57337c5",
+ "sha256": "15vrk0ns10rky1fxmz55dncsvzk11j8fvjdm43lkvsj11m14abs5"
+ }
+ },
{
"ename": "atl-markup",
"commit": "42025212ccfe998023f7eb563588be76282d53de",
@@ -3988,11 +4119,11 @@
"repo": "jonathanchu/atom-one-dark-theme",
"unstable": {
"version": [
- 20190705,
- 554
+ 20200831,
+ 342
],
- "commit": "623fc08252e30174401750a09168279571288c7f",
- "sha256": "09y4zh0i07vq8njvi4y1vmjqip057y3w2rhd7qzz6326bjz75cxk"
+ "commit": "321739d50b8a3b9152972134e83e69a67e12ee81",
+ "sha256": "0a6lx2pav0a0k6lfq8ar03z33dis29diq1gvxfdqwa3sayn6fbab"
},
"stable": {
"version": [
@@ -4044,8 +4175,8 @@
"repo": "jyp/attrap",
"unstable": {
"version": [
- 20200114,
- 1928
+ 20200908,
+ 1252
],
"deps": [
"dash",
@@ -4053,8 +4184,8 @@
"flycheck",
"s"
],
- "commit": "4cf3e4a16255997e7c3c39682a72866a0a37dd4b",
- "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"
+ "commit": "9c881548debcf59b8aadda0ef4abca3c9a68dd80",
+ "sha256": "01x2nwqzrnngvmw6zynh6xhfg3jx7l22mv3gndi5xzxqngqh137s"
},
"stable": {
"version": [
@@ -4079,14 +4210,14 @@
"repo": "tsuu32/auctex-cluttex",
"unstable": {
"version": [
- 20200531,
- 402
+ 20201029,
+ 1241
],
"deps": [
"auctex"
],
- "commit": "7e36dcb88c0021e48e7a095257e63e2913f75789",
- "sha256": "1wfsd7kcjm8inbhacsilngjqcwfn5alr02m4bcpv5w8gjyc0qwgx"
+ "commit": "e01f42ef4db28d284db010dbb590b197520f73d4",
+ "sha256": "0iq14adyry26n5c6i67fd6aiwlcw4a9shndljlvvzc7g82kdw7vl"
},
"stable": {
"version": [
@@ -4222,17 +4353,17 @@
},
{
"ename": "auth-source-pass",
- "commit": "5e268441634a6e58a00e577d6e2292fa226c11b8",
- "sha256": "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak",
+ "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4",
+ "sha256": "10l3kbffy08fh0krwvh4gn75k37criv2ma5hgkadvq1s2p5ps8r6",
"fetcher": "github",
- "repo": "DamienCassou/auth-password-store",
+ "repo": "DamienCassou/auth-source-pass",
"unstable": {
"version": [
- 20191126,
- 1242
+ 20201108,
+ 1043
],
- "commit": "ff4940c647786914b3cbef69103d96a4ea334111",
- "sha256": "1swrr8wjrfzjy3x11lfby2jckw5fgvpaywhg2pzmwwvf9mr9xzdg"
+ "commit": "aa7f17116ec3f760eb414d655ba20016b11a4a0e",
+ "sha256": "08q1dicdj4fgmn47mslinrl7wfnpix98xdwvhz78cvqhclb1662s"
},
"stable": {
"version": [
@@ -4252,11 +4383,11 @@
"repo": "ccrusius/auth-source-xoauth2",
"unstable": {
"version": [
- 20200817,
- 1604
+ 20200911,
+ 1554
],
- "commit": "b0386d4a12a88c5635b26eaa4c9e355fc84fb3f6",
- "sha256": "11i184s36ddxs06d8gq15nd0q59im8vfqnww3mvy35q12y6r8gpq"
+ "commit": "d3890eaa3a46dc89758ec6b789949e70ae782896",
+ "sha256": "1diflmg6sswz0xc1s9cygyg7y1ims8nqcyhs9yx5vn687gf82zlx"
},
"stable": {
"version": [
@@ -4309,26 +4440,26 @@
"repo": "emacscollective/auto-compile",
"unstable": {
"version": [
- 20191020,
- 1040
+ 20201122,
+ 1157
],
"deps": [
"packed"
],
- "commit": "3e92c5b1a94b0cf43f2d624180a1cb01df92afd8",
- "sha256": "1f270axx8cpl1fgrwaxjbwyhkacp1b9whmn9f3mjpwkr55ih7wgl"
+ "commit": "f8619d1616b523918323914ec77bfbee2c559781",
+ "sha256": "1qcszjjqkq811p8pafjx0knm4giv7dls4x1xamhzbndjz0d022kz"
},
"stable": {
"version": [
1,
- 5,
- 2
+ 6,
+ 1
],
"deps": [
"packed"
],
- "commit": "3e92c5b1a94b0cf43f2d624180a1cb01df92afd8",
- "sha256": "1f270axx8cpl1fgrwaxjbwyhkacp1b9whmn9f3mjpwkr55ih7wgl"
+ "commit": "f8619d1616b523918323914ec77bfbee2c559781",
+ "sha256": "1qcszjjqkq811p8pafjx0knm4giv7dls4x1xamhzbndjz0d022kz"
}
},
{
@@ -4339,15 +4470,15 @@
"repo": "auto-complete/auto-complete",
"unstable": {
"version": [
- 20170125,
- 245
+ 20201011,
+ 1341
],
"deps": [
"cl-lib",
"popup"
],
- "commit": "c0836fa0662095071e3c40237db611063e3c3ceb",
- "sha256": "1269k2q1hv1yixn7w32ani7g0zspiiwfmbywxi8lvh9hj0asbrsc"
+ "commit": "51a2ea092d280ec4956dc4a104467f8b83b5e0de",
+ "sha256": "0hp0z6s2a6y7gkwjarihqdlx897p4ji1ddz3a5167whp3wb2dfrn"
},
"stable": {
"version": [
@@ -4662,17 +4793,25 @@
},
{
"ename": "auto-highlight-symbol",
- "commit": "fdf73ee62f0a4e762e3a1aa94284abea8da8ce7c",
- "sha256": "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66",
+ "commit": "96293eb591e5f436efe8e9dc131d29ede292d2c3",
+ "sha256": "0n8acv58jkbqj00pi7d4g3nryvgvy52z0xg874jfh73d2f17dcdl",
"fetcher": "github",
- "repo": "gennad/auto-highlight-symbol",
+ "repo": "jcs-elpa/auto-highlight-symbol",
"unstable": {
"version": [
- 20130313,
- 943
+ 20201018,
+ 1340
],
- "commit": "26573de912d760e04321b350897aea70958cee8b",
- "sha256": "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c"
+ "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d",
+ "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 59
+ ],
+ "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d",
+ "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9"
}
},
{
@@ -4744,14 +4883,14 @@
"repo": "rranelli/auto-package-update.el",
"unstable": {
"version": [
- 20200421,
- 309
+ 20200826,
+ 2227
],
"deps": [
"dash"
],
- "commit": "cf7f7486ed699f2ed7cc8af950740aece0de6124",
- "sha256": "14sq8p3qbhlfmpisanjxpginiibngmb84mjga97aq5sgpxy38wix"
+ "commit": "c0df65ac9845ba2c7c9f53bbdbe013f1024f96f9",
+ "sha256": "0fy45psfsfsfrailiqv86bxsb3vxb36wyf7farb0zaxlrqay8qvd"
},
"stable": {
"version": [
@@ -4789,14 +4928,14 @@
"repo": "zonuexe/auto-read-only.el",
"unstable": {
"version": [
- 20200726,
- 1356
+ 20200827,
+ 1754
],
"deps": [
"cl-lib"
],
- "commit": "a6c493c5279d484c00ce7fe75dfd2e60101b97db",
- "sha256": "0wg6pl69k1hy69hgsqry5zahycr1n13avjfrw7g3sva71rqzkzrn"
+ "commit": "db209bf5b7f76f4c3dc4d0892fc6a24430779f29",
+ "sha256": "0zb8n97x5ji9clyls7k5pj7pq3yms82b6wgkww6djcabb26b5xb4"
}
},
{
@@ -4807,20 +4946,20 @@
"repo": "jcs-elpa/auto-rename-tag",
"unstable": {
"version": [
- 20200717,
- 814
+ 20201012,
+ 630
],
- "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9",
- "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9"
+ "commit": "88c5236280ff8212ff5c74f3e2e654c1a288dbf2",
+ "sha256": "0q584zrqyz8cc8ib5rll44qvf30xsrjnmdz7yipzqjbvciv6kh7g"
},
"stable": {
"version": [
0,
- 2,
- 9
+ 3,
+ 5
],
- "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9",
- "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9"
+ "commit": "88c5236280ff8212ff5c74f3e2e654c1a288dbf2",
+ "sha256": "0q584zrqyz8cc8ib5rll44qvf30xsrjnmdz7yipzqjbvciv6kh7g"
}
},
{
@@ -5003,8 +5142,8 @@
"deps": [
"cl-lib"
],
- "commit": "6c10b13c285cc4180dc64c1f89ead264e6786f53",
- "sha256": "02zjfv5365misiivjgjwwrp6bly7z81vnndkyrn6xzv88d2l2byv"
+ "commit": "9b068d979bad78aba8e8bef9f9e7c3bfecb34d2d",
+ "sha256": "0hvy616ssnkkgh78my4v8x29sr7j0vj7g2mam7v5rs5cczxr61xj"
}
},
{
@@ -5015,11 +5154,11 @@
"url": "https://git.sr.ht/~zge/autocrypt",
"unstable": {
"version": [
- 20200505,
- 1717
+ 20201115,
+ 912
],
- "commit": "d77140654405cabd007621606aca9beb512dff7a",
- "sha256": "0cr2q5dfvh85m6zlc2glssxj81py0hrvg9kh7bk6r33j0zygbr7r"
+ "commit": "050d4967162dff6de5ef480db8a22c5896d483c7",
+ "sha256": "1f5h7ln78rvjg428vpqddr4ahz8yxfsr471p1qib1kh3zahjy2iy"
}
},
{
@@ -5109,8 +5248,8 @@
20190331,
2230
],
- "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b",
- "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv"
+ "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740",
+ "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck"
}
},
{
@@ -5201,11 +5340,11 @@
"repo": "avkoval/avk-emacs-themes",
"unstable": {
"version": [
- 20191220,
- 625
+ 20201120,
+ 1316
],
- "commit": "e97ec20d07cc9093661f51853375063bcdc91993",
- "sha256": "14011k7rafibjpfd7g903a81pml176m7hxvvgd8a65vgqx52q4d3"
+ "commit": "d35a50520c0ddfcf04a0d72eb64fead68039e8d8",
+ "sha256": "15n2vqz6apfrb9bn48989knzyffjzp30100x4q96pk2xic1zixri"
}
},
{
@@ -5398,8 +5537,31 @@
20190930,
1517
],
- "commit": "1a75f88f53a2969fe821c31e6857861d0a0c0a5e",
- "sha256": "13ry0lhh8ss93h9c60gc02i28bwc70jb4fzqmvw778fk0shj8jxn"
+ "commit": "eadfb26b35802ae8164565581e4a9c4d0280a7b5",
+ "sha256": "1kh01yfzz565z0qdidvrl94cpfgsvf27n4k709j63xccbip0hp4a"
+ }
+ },
+ {
+ "ename": "axe",
+ "commit": "da1b2e7d1ea3ba2ce393373b42459538597ad571",
+ "sha256": "0qndp9007bb7khj0ncxasw2gy8d7isnpis8mh793qrxz76is5psq",
+ "fetcher": "github",
+ "repo": "cniles/axe",
+ "unstable": {
+ "version": [
+ 20201113,
+ 2237
+ ],
+ "deps": [
+ "dash",
+ "hmac",
+ "mimetypes",
+ "request",
+ "s",
+ "xmlgen"
+ ],
+ "commit": "f6fb37f6035605755be41d018ca8b70caa2bc75a",
+ "sha256": "10sb1a5r3ip1p7rckc2lzxbc5wv1fa3r10jqrsaz5y218rx3c2j6"
}
},
{
@@ -5410,11 +5572,11 @@
"url": "https://bitbucket.org/pdo/axiom-environment",
"unstable": {
"version": [
- 20200411,
- 1031
+ 20201118,
+ 1816
],
- "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
- "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
+ "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1",
+ "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585"
}
},
{
@@ -5637,6 +5799,24 @@
"sha256": "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j"
}
},
+ {
+ "ename": "baff",
+ "commit": "a366fdfb3594b5cf910aebc58a249699f1f956a4",
+ "sha256": "1s8s5yvr8c7a6yzlwa38a1slkqad5szq92k5wxygvfyw1ikwvkxg",
+ "fetcher": "github",
+ "repo": "dave-f/baff",
+ "unstable": {
+ "version": [
+ 20200824,
+ 1807
+ ],
+ "deps": [
+ "f"
+ ],
+ "commit": "7af72db9c6e542ed2b60952933113d0aa86728cf",
+ "sha256": "099jhbn65kw45yb8ahvrpmpqba1ffxbmxkkxs6iswfjcx2vdf23j"
+ }
+ },
{
"ename": "baidu-translate",
"commit": "c9cdf13f64a1de8c57dcb90229da0f62a8e14e7a",
@@ -5675,11 +5855,11 @@
"url": "https://git.sr.ht/~zge/bang",
"unstable": {
"version": [
- 20200811,
- 1008
+ 20200924,
+ 1601
],
- "commit": "e02338331463461a85144c0ce6b9b877bd3a7567",
- "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639"
+ "commit": "a2077ecf974fb8299fef0f008aa974d782245ec8",
+ "sha256": "1l9915ir87d3iabrz1af2hrk1yp1dmq1i763117aln5b5mbmvn5a"
},
"stable": {
"version": [
@@ -5737,11 +5917,11 @@
"repo": "ajsquared/bar-cursor",
"unstable": {
"version": [
- 20180227,
- 45
+ 20201204,
+ 2244
],
- "commit": "20cb59bedc3532a712fe7feeff3660ebd72a8107",
- "sha256": "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf"
+ "commit": "78f195b6db63459033c4f1c7e7add5d82f3ce424",
+ "sha256": "1g344fzfkq5z53vja68kv55l1x29v15q41qb08nqc9k4pvpwdvmp"
}
},
{
@@ -5767,11 +5947,11 @@
"repo": "belak/base16-emacs",
"unstable": {
"version": [
- 20200414,
- 2048
+ 20200929,
+ 2159
],
- "commit": "d68512c0856f57a19cd49d1034199836352c15a0",
- "sha256": "1h98ra53i7hc7zi9yjc6p29f70r04hivdczhw4imds13akq6j034"
+ "commit": "93b1513a9994355492314e809cdbfb0d21f1e30d",
+ "sha256": "0sw483bzm5ax07cyvjbm6qaji5m0xw4mzcgrxi5ki81i0y79x59q"
},
"stable": {
"version": [
@@ -5790,11 +5970,11 @@
"repo": "szermatt/emacs-bash-completion",
"unstable": {
"version": [
- 20200806,
- 1743
+ 20201011,
+ 916
],
- "commit": "d47edb9d4142a22746009c1f680df93a4fefd107",
- "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4"
+ "commit": "65e54c6f9c0ffebf94f7c505694bd249b9b53d32",
+ "sha256": "0aj110pmx6f11flmyk8ryj4mghjay2wbix945wisrlydlnl9jmmc"
},
"stable": {
"version": [
@@ -5843,8 +6023,8 @@
"f",
"flycheck"
],
- "commit": "0f75c944239960445f1e9c8a0b5f7a5b4d37ff89",
- "sha256": "0xmi27b3zs8bsvcf9405rg88cjz1x2nivj5pvy6gjy07r9dl7ngf"
+ "commit": "1d026b6ae70db9cde36596dcf46b101058a2e004",
+ "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h"
},
"stable": {
"version": [
@@ -5998,11 +6178,11 @@
"url": "https://git.savannah.nongnu.org/git/bbdb.git",
"unstable": {
"version": [
- 20200102,
- 403
+ 20200928,
+ 1749
],
- "commit": "45529e315ba861f9df2914f9b88d2f7b991d5595",
- "sha256": "0iim6394q02yw5rcyjs7ym16v9jbq5pwqsbpwc98ckg26063p3fi"
+ "commit": "d25c29822aff60ab44eb7b5e68e28bc7c2d5d9a9",
+ "sha256": "0sc2m1xxhw7rgzpk4bw4n3nivhv0byy8yflzvnaf9xkq7km7wv3z"
},
"stable": {
"version": [
@@ -6087,20 +6267,20 @@
},
{
"ename": "bbdb-vcard",
- "commit": "dd5d9027c49beae89f78d2a30dfa4bd070dff1bd",
- "sha256": "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj",
+ "commit": "fe7889550dd0004d2ed5e3099f538eef47d8fa4b",
+ "sha256": "1cg2xm8kcslfdvdz7xf1ln10mr157v6k5mz2fib0vn9r14z9rm57",
"fetcher": "github",
"repo": "tohojo/bbdb-vcard",
"unstable": {
"version": [
- 20190410,
- 2054
+ 20201016,
+ 1902
],
"deps": [
"bbdb"
],
- "commit": "853cbcd882be137a5488c70328c25f5982aca657",
- "sha256": "0r8xcxvzalf5g12mqy6w7yv34nxd8n2wcqa5ib06nf40n162nrwg"
+ "commit": "8d2fa496e58ded18f5eb589c1781adaf48a5f73f",
+ "sha256": "0ssmr4cyywqhr42fjmk5z3hb1z7ddbbz8y9sc5bzad7wncbybwbv"
},
"stable": {
"version": [
@@ -6237,11 +6417,11 @@
"stable": {
"version": [
2,
- 1,
+ 2,
0
],
- "commit": "0710e25138c1cec40ccf78d704741143c5bac735",
- "sha256": "1ic5z3qb5sc3mjrjdlg0rqm2l59a43gwnakagns4cilln2a3xdg8"
+ "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c",
+ "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35"
}
},
{
@@ -6317,8 +6497,8 @@
20200331,
1102
],
- "commit": "f0af19511831f3ade590879e7d1636387682a8e7",
- "sha256": "1sfj694a6yjc4qwkxn2yvnl8xp8rzrkdgnsaj8ncwdyaa50xgw78"
+ "commit": "1e16ccfd5c6560a83ae2926afe4a5076a541d3d6",
+ "sha256": "0dgwh3z1ni619kxpdxv8r2k0jhgj5h6ssxp6l8s26mhpmy1bkm6c"
}
},
{
@@ -6415,11 +6595,35 @@
"repo": "gilbertw1/better-jumper",
"unstable": {
"version": [
- 20200103,
- 1413
+ 20201008,
+ 2001
],
- "commit": "6d240032ca213ccb3347e25f26c29b6822bf03a7",
- "sha256": "0vdrdd0q4rlpyxgwbc31zz8f6sr7sy0gdw84sb1dy9bpq6qvdbdw"
+ "commit": "fe548d22c9228b60d9c8a2a452a6c2e03dfdf238",
+ "sha256": "0zcm80z3fq5185p676rcpdbhib2d6267j0jqp1wjj88pszyc035i"
+ }
+ },
+ {
+ "ename": "better-scroll",
+ "commit": "0cdedd3a03cb05d6a474a84626aacda7c90c9d6d",
+ "sha256": "1fqbcn867svyxmp8w7b5v9k81fm1mi5n8723sjvcf62q6q0qvyq5",
+ "fetcher": "github",
+ "repo": "jcs-elpa/better-scroll",
+ "unstable": {
+ "version": [
+ 20201013,
+ 1355
+ ],
+ "commit": "eaa8dae6f048fcff773f3cca2e3113c52ad0463f",
+ "sha256": "0r8g5gc454mnk6jbmdx56dfjkw57003c677csb30pf15fxnxp2r4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 4
+ ],
+ "commit": "eaa8dae6f048fcff773f3cca2e3113c52ad0463f",
+ "sha256": "0r8g5gc454mnk6jbmdx56dfjkw57003c677csb30pf15fxnxp2r4"
}
},
{
@@ -6604,8 +6808,8 @@
"a",
"pdf-tools"
],
- "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3",
- "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z"
+ "commit": "e086c59a14701cd041641b51c952fa704ee963df",
+ "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
}
},
{
@@ -6653,8 +6857,8 @@
"repo": "tmalsburg/helm-bibtex",
"unstable": {
"version": [
- 20200513,
- 852
+ 20200908,
+ 1017
],
"deps": [
"biblio",
@@ -6664,8 +6868,8 @@
"parsebib",
"s"
],
- "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35",
- "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5"
+ "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c",
+ "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix"
},
"stable": {
"version": [
@@ -6707,20 +6911,20 @@
"repo": "tarsius/bicycle",
"unstable": {
"version": [
- 20200723,
- 2222
+ 20201028,
+ 1854
],
- "commit": "799969a66192b27c6464fc2e0025f4089d70493b",
- "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba"
+ "commit": "e3fbc0737bb5f891e4d57d048bbc1fe17401f17f",
+ "sha256": "1jgrnd3yxaqgd3rxls41xxzfaq9hkmjk9wbdg06ak9h5xw4fi17j"
},
"stable": {
"version": [
0,
4,
- 2
+ 4
],
- "commit": "799969a66192b27c6464fc2e0025f4089d70493b",
- "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba"
+ "commit": "e3fbc0737bb5f891e4d57d048bbc1fe17401f17f",
+ "sha256": "1jgrnd3yxaqgd3rxls41xxzfaq9hkmjk9wbdg06ak9h5xw4fi17j"
}
},
{
@@ -6791,20 +6995,21 @@
"bind-key",
"key-chord"
],
- "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
- "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
},
"stable": {
"version": [
2,
- 4
+ 4,
+ 1
],
"deps": [
"bind-key",
"key-chord"
],
- "commit": "39a8b8812c2c9f6f0b299e6a04e504ef393694ce",
- "sha256": "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
}
},
{
@@ -6818,16 +7023,17 @@
20200805,
1727
],
- "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
- "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
},
"stable": {
"version": [
2,
- 4
+ 4,
+ 1
],
- "commit": "39a8b8812c2c9f6f0b299e6a04e504ef393694ce",
- "sha256": "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
}
},
{
@@ -6854,6 +7060,36 @@
"sha256": "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8"
}
},
+ {
+ "ename": "binder",
+ "commit": "b11447ece6105f59abec185b6ca809f488f2b864",
+ "sha256": "0hfg1rq4qhfqzxi5y51sjsqw069w15x1fkknqq8dwv8a7sjj6yaz",
+ "fetcher": "github",
+ "repo": "rnkn/binder",
+ "unstable": {
+ "version": [
+ 20201208,
+ 1429
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "bc63f9fdfe10fcf799abab3f8d8deb38c51e9f80",
+ "sha256": "1wcwb3m5i4z1dkkcj8xl1rlkkbf9scyx0mpdhi086dw70afrqwy3"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 3
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "8d479f1ad0573008e7f60dad2f6549c7d2f96598",
+ "sha256": "1wfbm3z4irgh22lrfkdf05y9y3ayl1jcmf2iqgncrj12j5a5jwa7"
+ }
+ },
{
"ename": "bing-dict",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -7140,6 +7376,21 @@
"sha256": "19y1fs5bzp2sqvh6svmj0cpvgq13zmsn852027hi11zvwi6dzqz8"
}
},
+ {
+ "ename": "block-nav",
+ "commit": "c2c21a3cf3bc42293efb65536f5b784efa66e5bf",
+ "sha256": "0p2zkbrdc0p0wmzqdvvbjfjr1ip8q6lfdifvwbczhjwxv3zqj827",
+ "fetcher": "github",
+ "repo": "nixin72/block-nav.el",
+ "unstable": {
+ "version": [
+ 20201005,
+ 202
+ ],
+ "commit": "d69acaa3d6c75bf4c518d8ab8896ad63580253fc",
+ "sha256": "14qnak1ynfzjlx8dp82dwmz2qhwrjyiz6zpaa7kpca4zgn8xgc5p"
+ }
+ },
{
"ename": "blockdiag-mode",
"commit": "2a0adb94f2a435e846944a1c544e6591b131a10e",
@@ -7157,10 +7408,10 @@
},
{
"ename": "blog-admin",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk",
+ "commit": "b71c4a6708302276940f5095fb5da163b15660d0",
+ "sha256": "1d9l2v3xz21xpjz71sbqbad6fmwdh8b4z7l4ayad35c4fwi1cwc7",
"fetcher": "github",
- "repo": "CodeFalling/blog-admin",
+ "repo": "xcodebuild/blog-admin",
"unstable": {
"version": [
20170923,
@@ -7207,11 +7458,11 @@
"repo": "joodland/bm",
"unstable": {
"version": [
- 20190807,
- 1217
+ 20201116,
+ 2341
],
- "commit": "8129428182e1b8a647d16fceb2d08cc0a2a5f3c7",
- "sha256": "048n596psrnvz5hi7i7vs0dyk6i6m9krzfh8fld95yggyyikf0iw"
+ "commit": "79b3543ca5efc02e4981d8fb987d2e869986511b",
+ "sha256": "0vbj0wn0apsxaxj428lkg2ga37pin0jqd3n51r7yrgj8s92qfacj"
},
"stable": {
"version": [
@@ -7238,8 +7489,8 @@
"dash",
"s"
],
- "commit": "536b332edc3b98cc97588c937c7368803ba5961c",
- "sha256": "0hbkh4fb1cb1fd7fq1999i9rffr2xc0l16b0m5sajcrsir3gq4nr"
+ "commit": "30122e2a6bfb00834e18363e7909182b2701ce82",
+ "sha256": "1kk98g2zlgz9s7r95986p7f9dch23r8dk78k2dgy07ifnqickvfx"
}
},
{
@@ -7303,14 +7554,14 @@
"repo": "kyleam/bog",
"unstable": {
"version": [
- 20200720,
- 244
+ 20201030,
+ 357
],
"deps": [
"cl-lib"
],
- "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c",
- "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0"
+ "commit": "af929c164c4ffaee0c33ba97c06733f0ce9431d4",
+ "sha256": "0qq3a48650brpif3j8kwg9lm2bk5izv1bm9ff1mk7x0anjkcv1hy"
},
"stable": {
"version": [
@@ -7348,14 +7599,14 @@
"repo": "dbrock/bongo",
"unstable": {
"version": [
- 20190722,
- 1644
+ 20201002,
+ 1020
],
"deps": [
"cl-lib"
],
- "commit": "9afbf269d33cd3196962423a2c261824611cffe4",
- "sha256": "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv"
+ "commit": "9e9629090262bba6d0003dabe5a375e47a4477f1",
+ "sha256": "1ayiqj8zc15kf3211asgc4hl7zv78y6n6m6rsb9svysak5srr3wy"
},
"stable": {
"version": [
@@ -7392,8 +7643,8 @@
"repo": "boogie-org/boogie-friends",
"unstable": {
"version": [
- 20190909,
- 1432
+ 20201108,
+ 230
],
"deps": [
"cl-lib",
@@ -7402,8 +7653,8 @@
"flycheck",
"yasnippet"
],
- "commit": "45ee305eba1cce63f89e49daef9eaeaa90e34265",
- "sha256": "0dnmg84ynxr4vhdgrzdvrq68jrrmp9vkz0lbwhlxpljckpmfdf03"
+ "commit": "462acddf8012c896a510f539fa3d16eb3c4dc71b",
+ "sha256": "0lz39j1alzzchfz67xp70cj1z6ckapdyqbl2gnax8xqyw7f3816f"
}
},
{
@@ -7438,16 +7689,16 @@
"repo": "jyp/boon",
"unstable": {
"version": [
- 20200514,
- 1227
+ 20201118,
+ 1521
],
"deps": [
"dash",
"expand-region",
"multiple-cursors"
],
- "commit": "57271ed2ddca96c77b83b282019852d1cffffd26",
- "sha256": "0mmyxi75hlg1lkvpk4lq5nagmcsmjijmkcmmkkq25llf7nmik8as"
+ "commit": "3dd9669d01e48860bb7ea12be8c764a4bc6808ea",
+ "sha256": "0j5v2mm6gd463x6jcbp5ly71g2qaiajrbc3ina2rzbmj0ccqr39l"
},
"stable": {
"version": [
@@ -7471,15 +7722,15 @@
"repo": "emacscollective/borg",
"unstable": {
"version": [
- 20200805,
- 1131
+ 20201119,
+ 1841
],
"deps": [
"epkg",
"magit"
],
- "commit": "1fe1d2b7a574dd560740a55d87d9a5fb3a989dbc",
- "sha256": "19rxqh6qagznsm5hqal65cv03k9gg1cfvb0j5saaqfc4nxkhkv7v"
+ "commit": "79bfdbdf0b4a81ee3bab2c853040e57e5454e164",
+ "sha256": "1rjlkgk6vcfxzgsw44h5prqgpjc1w4sfvklzlbxhyx84x0fzygpb"
},
"stable": {
"version": [
@@ -7581,8 +7832,8 @@
20190608,
2201
],
- "commit": "587b39ea7a1d786df5c04796d51bf2a5a4eda0d7",
- "sha256": "0bvg2vpak2bv3s7wc0zzrqb3pys5s7vi6rs7k7l4fmaj5amaq9vb"
+ "commit": "181065e1f9ab4ec7096bafffe6818b0d7f5362b1",
+ "sha256": "14nxqlrza35l955zgc4yi9yaymd9slyyyjmbnbd831v8jlddngm9"
}
},
{
@@ -7641,20 +7892,20 @@
"repo": "jadler/brazilian-holidays",
"unstable": {
"version": [
- 20191211,
- 330
+ 20201109,
+ 2052
],
- "commit": "13a480f03eb3729e6f203ce77dfd4de5e1203a3d",
- "sha256": "1980267q70b7m16jsxc433cdqzr15q8dz5cwpkhla52wfdf1s184"
+ "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4",
+ "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il"
},
"stable": {
"version": [
2,
1,
- 0
+ 1
],
- "commit": "13a480f03eb3729e6f203ce77dfd4de5e1203a3d",
- "sha256": "1980267q70b7m16jsxc433cdqzr15q8dz5cwpkhla52wfdf1s184"
+ "commit": "d9e685b21be4d5264cbee0cf74a846af380af4d4",
+ "sha256": "10jp4yd2v7p8qg9x1s24z3ldbcf1klbxk1754vf25rrrzsxbb6il"
}
},
{
@@ -7733,16 +7984,16 @@
"repo": "rmuslimov/browse-at-remote",
"unstable": {
"version": [
- 20200308,
- 639
+ 20200820,
+ 654
],
"deps": [
"cl-lib",
"f",
"s"
],
- "commit": "6aecae4b5d202e582425fc8aa2c9c2b6a4779f25",
- "sha256": "0c93ilvxmfv28a05fs2lbdyc2q308anjw0xvbkg7dc0blg0fgb05"
+ "commit": "fadf99d6d8e891f3b112e36c772e0eea0b9bc7f2",
+ "sha256": "15x32g8g90jjxlxj8h6yzyi1k9dgnk8an2c66ibj93dzcfci28m9"
},
"stable": {
"version": [
@@ -7770,8 +8021,8 @@
20200210,
921
],
- "commit": "1ef72cc6accd94cd7032c02b1b2c78ae7f1d1965",
- "sha256": "0mil32g7hcw376jibs5hdyv00xbaql3m4a27rwqaafg0x59avxdj"
+ "commit": "c7a188a6148f6391b6926d25b9cf191d4a8b3f42",
+ "sha256": "12ajcdzqajhs1li0pd8vp2wm6kl5vxcsnka1ygd2144cbi0dx6gk"
},
"stable": {
"version": [
@@ -8136,20 +8387,20 @@
"repo": "jcs-elpa/buffer-wrap",
"unstable": {
"version": [
- 20200724,
- 906
+ 20200924,
+ 345
],
- "commit": "ef0fcb38b23246cfea1721570acc266764cef0a4",
- "sha256": "029vq5hfknp5l8b9lmxw4hskq9bmv56kqysdfka0636hp7bvc63p"
+ "commit": "2b12ed29cbcd733ad21d91475d1fcbd4092c604e",
+ "sha256": "1x9vayhq5cpqglkz4bzd9iaa1p0j0qsvh5pr6vkqi2z1nrjcwi8g"
},
"stable": {
"version": [
0,
1,
- 3
+ 5
],
- "commit": "c24eb1f251baecfb0bbfa750904e6b15cc977a6c",
- "sha256": "1bzr5bf4rm1wm0xdhhdprlv7z60ijwrp1lq9h572iw6giyl0hgc3"
+ "commit": "2b12ed29cbcd733ad21d91475d1fcbd4092c604e",
+ "sha256": "1x9vayhq5cpqglkz4bzd9iaa1p0j0qsvh5pr6vkqi2z1nrjcwi8g"
}
},
{
@@ -8160,8 +8411,8 @@
"repo": "alphapapa/bufler.el",
"unstable": {
"version": [
- 20200409,
- 1253
+ 20201108,
+ 1800
],
"deps": [
"dash",
@@ -8170,8 +8421,8 @@
"magit-section",
"pretty-hydra"
],
- "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f",
- "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs"
+ "commit": "d623605be961316be378ffcd1e97a85069f2f7cc",
+ "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2"
},
"stable": {
"version": [
@@ -8378,6 +8629,54 @@
"sha256": "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h"
}
},
+ {
+ "ename": "burly",
+ "commit": "953c7e20460e98606e4d78d9c427404c03f301bb",
+ "sha256": "10r20r4dxyajp87k6p7zz4y4363mhn9j4rg3w3mvxcj76pzrkdq1",
+ "fetcher": "github",
+ "repo": "alphapapa/burly.el",
+ "unstable": {
+ "version": [
+ 20201118,
+ 1308
+ ],
+ "deps": [
+ "map"
+ ],
+ "commit": "7c03d63500b3164d157f5760619e25d731d68802",
+ "sha256": "1jxrbw9p5i7x0q8v0gy5w0nb4c1mxr274qjdb3ipdggfh6amzl29"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "deps": [
+ "map"
+ ],
+ "commit": "2fd586d8f53944ecf0c3673b425706bfe973bd0d",
+ "sha256": "1vaikknjzmhpszyi4yxjjkp1ihgmhpbnbx1s5pjy4mnhl1ibi33b"
+ }
+ },
+ {
+ "ename": "burnt-toast",
+ "commit": "be86525a641a66448886c3f28214c5f6c97c4e7c",
+ "sha256": "0qv2lr591j9px7f9ahj6w9g5mj18hsah5ax4nvssqcah0z03kdfq",
+ "fetcher": "github",
+ "repo": "cedarbaum/burnt-toast.el",
+ "unstable": {
+ "version": [
+ 20201113,
+ 814
+ ],
+ "deps": [
+ "alert",
+ "dash"
+ ],
+ "commit": "d4b1fc8f6d32eb69c066775558442dcc84208ba0",
+ "sha256": "03qrfb2rzx2aqkzn7pm0z97l9sfv13znd1dndjjp5gdga0nr2wjz"
+ }
+ },
{
"ename": "bury-successful-compilation",
"commit": "f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c",
@@ -8490,11 +8789,11 @@
"repo": "jorgenschaefer/emacs-buttercup",
"unstable": {
"version": [
- 20200817,
- 2001
+ 20201028,
+ 2204
],
- "commit": "0e5eae0766a33b5c8997e1477e3914d5c8ba3d29",
- "sha256": "0qn3i26g119h14jv9q0vha55s4g154djp3f68d2g7i0f46wm54hz"
+ "commit": "2f24a44f31caf5e832bd48438b5424193c5213d1",
+ "sha256": "0dxbn9h38a55jk91mrapsv7k7vdvijkakpcblnjpjd1ww5lkhcy8"
},
"stable": {
"version": [
@@ -8567,14 +8866,14 @@
"repo": "erjoalgo/emacs-buttons",
"unstable": {
"version": [
- 20190319,
- 41
+ 20201123,
+ 2333
],
"deps": [
"cl-lib"
],
- "commit": "a14d0c21cc30d33b57481f535f2a838d65b2032f",
- "sha256": "17b6km8qvkh43g276fmv552lffd2jq5x863fc7zm7xf2khwmpwbh"
+ "commit": "de41b48244574a13000c4289fdb4216a2b0490ff",
+ "sha256": "1kxcxzzhvrkw8sk699gadf83sw9vv1sms6jf8w08vzblbd5na567"
}
},
{
@@ -8600,11 +8899,11 @@
"repo": "nflath/c-eldoc",
"unstable": {
"version": [
- 20181109,
- 439
+ 20201004,
+ 2347
],
- "commit": "e35c0e40f71c25804919f6c01fd27e95c2e2adb7",
- "sha256": "0rwxlq8w6507lkvvj0krwvg4ai1wyj466nhns1f857kry7cssnzy"
+ "commit": "f4ede1f37f6de583376669735326367d84a0a917",
+ "sha256": "0ich78j49x3sl1jyvzynybw0lnhrhjfp4vadysxnzd5zs6vqxcad"
}
},
{
@@ -8764,14 +9063,14 @@
"repo": "xwl/cal-china-x",
"unstable": {
"version": [
- 20190518,
- 1057
+ 20200924,
+ 1837
],
"deps": [
"cl-lib"
],
- "commit": "177f60e011606126f23c8ffed69458439f1c12e0",
- "sha256": "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57"
+ "commit": "94005e678a1d2522b7a00299779f40c5c77286b8",
+ "sha256": "0dy9awy5y990wz925rdn95gn23ywarwbvkqq0l0xms1br1v8kxc6"
}
},
{
@@ -8955,32 +9254,30 @@
"repo": "chenyanming/calibredb.el",
"unstable": {
"version": [
- 20200809,
- 1128
+ 20201115,
+ 617
],
"deps": [
"dash",
- "org",
"s",
"transient"
],
- "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7",
- "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv"
+ "commit": "3f4ed7868bed75f633a8bc86909251a7b070dd55",
+ "sha256": "09j387rb8hdf5a0ivdr5mkwkcalvl2m9fvd99gjcrylby5xa25zw"
},
"stable": {
"version": [
2,
- 5,
+ 7,
0
],
"deps": [
"dash",
- "org",
"s",
"transient"
],
- "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7",
- "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv"
+ "commit": "4cd701c0ae63fb7c0bd6326b1acbaefaeb9d705a",
+ "sha256": "1w3kz9iny72gk54jdafz8sy5sv6hnpm3rw4fn1r8aznx4p00f9dy"
}
},
{
@@ -9147,14 +9444,11 @@
"repo": "veelenga/carbon-now-sh.el",
"unstable": {
"version": [
- 20180331,
- 1735
+ 20201028,
+ 950
],
- "deps": [
- "dash"
- ],
- "commit": "71dee6bc4f2a2cb02b9b7b5e643c4c92b880e6a4",
- "sha256": "1aij3590c7fqga7sla5f4hibyq7m77kxfyiiviv6xrdzwrd98w37"
+ "commit": "6444a77a6065803cf97c3321f811bd34a8063d76",
+ "sha256": "039zsvhicqj4qg5dzvchj8myqfbsib1ia4v668mmalhksijldyma"
}
},
{
@@ -9165,15 +9459,15 @@
"repo": "kwrooijen/cargo.el",
"unstable": {
"version": [
- 20191224,
- 47
+ 20200826,
+ 1537
],
"deps": [
"markdown-mode",
"rust-mode"
],
- "commit": "dc9ff35c2861d524ac4d65020c5320eec71acacf",
- "sha256": "0nng284i5jygsnbda6ycrm2wv8rw47z8ilcs6r1z0w1gv3p012fd"
+ "commit": "91ccfef6e36ff9e96352a03c4a057b5ee181438d",
+ "sha256": "1hyz834hwashcxpv5kxlzn3n0h7a50lniwdwrb62390d0x8pm6vy"
},
"stable": {
"version": [
@@ -9245,8 +9539,8 @@
"repo": "cask/cask",
"unstable": {
"version": [
- 20200814,
- 913
+ 20201206,
+ 1419
],
"deps": [
"ansi",
@@ -9258,16 +9552,17 @@
"s",
"shut-up"
],
- "commit": "c69822a1a3168d43caebb7afaa13249429419ae0",
- "sha256": "0w7q16y2r54rann07lk4gwi7jkqnb5xc8cbjnx2avgpsk7kawi8w"
+ "commit": "b0afdf94c0a2424db86b264bcac175b75c4395b3",
+ "sha256": "0hjc2pig7chhvb94qyccmnndy16xlyzwq37x4pm2s44yl1vra02k"
},
"stable": {
"version": [
0,
8,
- 4
+ 5
],
"deps": [
+ "ansi",
"cl-lib",
"dash",
"epl",
@@ -9276,8 +9571,8 @@
"s",
"shut-up"
],
- "commit": "ba5f6eb78178deb954ab9ac02e0e370315097ebe",
- "sha256": "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"
+ "commit": "6fd81cdbe2c4c0a13798a6f2a1e1a6392a4bbc86",
+ "sha256": "0wgm0f39diswmp1ccx5a0qwfpcy8hczzp8b2s7bpi5qb49al55d0"
}
},
{
@@ -9453,11 +9748,11 @@
"repo": "skk-dev/ddskk",
"unstable": {
"version": [
- 20200314,
- 1557
+ 20200904,
+ 1431
],
- "commit": "275a831be77573470309a78967734d2b6d10f218",
- "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
+ "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13",
+ "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7"
}
},
{
@@ -9468,15 +9763,15 @@
"repo": "MaskRay/emacs-ccls",
"unstable": {
"version": [
- 20200819,
- 106
+ 20200820,
+ 308
],
"deps": [
"dash",
"lsp-mode"
],
- "commit": "44f1fb38786cb6159e03e930876239a215d3feee",
- "sha256": "0adw1gfp8a6cfyh7s1bchdpak7z32jlnliq35ynhakwwx3ixzmfv"
+ "commit": "675a5704c14a27931e835a431beea3631d92e8e6",
+ "sha256": "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is"
}
},
{
@@ -9502,11 +9797,11 @@
"repo": "skk-dev/ddskk",
"unstable": {
"version": [
- 20200803,
- 2138
+ 20200904,
+ 1431
],
- "commit": "275a831be77573470309a78967734d2b6d10f218",
- "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
+ "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13",
+ "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7"
}
},
{
@@ -9517,11 +9812,11 @@
"repo": "cdominik/cdlatex",
"unstable": {
"version": [
- 20200506,
- 739
+ 20201016,
+ 1659
],
- "commit": "480387b39f6ddd9cd2a9511ecee064ad8e1dd324",
- "sha256": "1y5c2ycvmij7klvc9rhg265ha23xlh2hi4q5w50xljzh2mmlp3fb"
+ "commit": "adf96bab0bbf28f65c882c0874f1c14fdb216bd8",
+ "sha256": "010sljis51q31l2irhmr4k3i80f6vnzxf8k09p6k7b91jcby3nf5"
},
"stable": {
"version": [
@@ -9640,15 +9935,15 @@
"repo": "ema2159/centaur-tabs",
"unstable": {
"version": [
- 20200722,
- 27
+ 20201129,
+ 1538
],
"deps": [
"cl-lib",
"powerline"
],
- "commit": "7e0332b138f836b9d0b6d2134310f53369598cfd",
- "sha256": "1fjs1l79wsyiyi4nrdkxg2hhfkngm7g0zpdq5ca3c1zi4fsv084i"
+ "commit": "b172646b49d00c7e11fe4a4eaa80bbf026e58ab5",
+ "sha256": "0g24drzxrdd84kz4dsvawj25wb3v92aanhixvdnpkkwq71clcq3r"
},
"stable": {
"version": [
@@ -9674,8 +9969,8 @@
20200507,
1529
],
- "commit": "f376bdb882047347345d5f0e3ec3fcef63ee93ba",
- "sha256": "1dnc0vjy6z6kdh8h8bmwi5vgyvy2z4405qpxb20d0dbly8qz9fns"
+ "commit": "4093821cc9759ca5a3c6e527d4cc915fc3a5ad74",
+ "sha256": "0r6dzhhlpbkh2n9dmb7iyd78b5rsnkxhk84wm0kgqjy541gfvbhk"
}
},
{
@@ -9775,17 +10070,17 @@
20171115,
2108
],
- "commit": "ec47889f4bef53c6c5a15add60d34c44c6ef1634",
- "sha256": "16lndmhm0ad23g0pa4rl7dyrwmdv22xmscnpqnd49sg88356fyd2"
+ "commit": "bf0858085ae6afc02f87573a77ff4795517fd288",
+ "sha256": "0rch5z0mnv98bvc7w7p48pj1w7lgnwgfh4zy6n097vkbwp4lfcjg"
},
"stable": {
"version": [
3,
- 16,
+ 17,
0
],
- "commit": "ee2c1fd898a8219e81fea4f753648070e50ebc2e",
- "sha256": "1jcvh67kxx5isqb78zjbca51px21cyjcwy1cbfkx47y1rmgsqzaw"
+ "commit": "68302fb6a977b11238c91ad9a2b5cb52e6294561",
+ "sha256": "0y8knkrxhj8w2pvz3wjf36q4lpcbv89h2ha8ha1248mfgqmh3wjr"
}
},
{
@@ -9817,8 +10112,8 @@
20190617,
1130
],
- "commit": "b06d7cee2af0ed5d55a94f0db80fc1f429a1829a",
- "sha256": "0gzkjyai3njllbifm66mjwndy8xl06ph1957l75il9797jzxw4sc"
+ "commit": "2de315abddb6af088a2346e142cc305889dcd775",
+ "sha256": "1hqyxsnnl6zbbbfbacipd226dvhc9zlfpxvacmn6g9iv7qfc8k53"
}
},
{
@@ -9941,14 +10236,14 @@
"repo": "damon-kwok/chapel-mode",
"unstable": {
"version": [
- 20200814,
- 759
+ 20200920,
+ 501
],
"deps": [
"hydra"
],
- "commit": "0855d6ea5e74da7b02e7307066da912c242084c8",
- "sha256": "08bgjwkm6bhm5s73pdx62bjm58z18q21fhj02zdp0q8dds5babf9"
+ "commit": "a99319a43b0a2bf9621a1f61a519ea102ec65783",
+ "sha256": "0p91lwm2bymx5yw2ni0b0iaxmy26mnwvg6g6xp9yaxnr477q5wkn"
},
"stable": {
"version": [
@@ -10328,11 +10623,11 @@
"repo": "plandes/choice-program",
"unstable": {
"version": [
- 20190817,
- 2153
+ 20201208,
+ 313
],
- "commit": "583242445e7890a12bb674b43244bf27c84d91f6",
- "sha256": "08pbh4z3xbpk62a2m6shdpw2g44158di8pb9rjszfcpd5m6m2lf2"
+ "commit": "f95321f5e317225cd33824c32520fe7abb972e29",
+ "sha256": "02d6f2rqd5s5nbrg03n6lwbxdzyyb9m7ycckyj2qha8j4bpv6r0r"
},
"stable": {
"version": [
@@ -10369,8 +10664,8 @@
"repo": "contrapunctus-1/chronometrist",
"unstable": {
"version": [
- 20200816,
- 1947
+ 20200905,
+ 1617
],
"deps": [
"anaphora",
@@ -10379,23 +10674,24 @@
"seq",
"ts"
],
- "commit": "c886dbb1ec8d1e22f7e9891ce9794d373b3b4e9b",
- "sha256": "0f94w039ibqyysldgs0rdzjczhpgd1dq6ll85gdb4av7vw6mp3hy"
+ "commit": "ad2a7fffed94c093e6d83a6938115f66e4e888f3",
+ "sha256": "0raa34888cyjqhr4562gbjdi4j4k5lpp0f4zwlxxrvfwn6yxwhm1"
},
"stable": {
"version": [
0,
5,
- 3
+ 5
],
"deps": [
+ "anaphora",
"dash",
"s",
"seq",
"ts"
],
- "commit": "0445b5187293a927f505633e851ca871bb89d8df",
- "sha256": "0jz35972m372kx9x8mgf42zhzdw2w9wv2ri52chfb2fin4bh1biy"
+ "commit": "2331edbf00cf56f28905d5a91334af4b902cdb68",
+ "sha256": "1zccyfpgq68ixrcl8jq2r38165ngkqrb42y2hkyab6gxhvh4wkpl"
}
},
{
@@ -10406,15 +10702,15 @@
"repo": "contrapunctus-1/chronometrist-goal",
"unstable": {
"version": [
- 20200706,
- 1306
+ 20200906,
+ 1522
],
"deps": [
"alert",
"chronometrist"
],
- "commit": "a9c4410f25f875c55b9237ef6544e82f4a805af6",
- "sha256": "0wydrc4x19rp6nn1hyhaa5zxr4br51aamrv0ky5yppr17rnyygsy"
+ "commit": "c8bb401155a8a2c5718ffd3667c516f8e178a1b5",
+ "sha256": "0lqllxhq8r38gm12ia5s2mjsv75l1d99dbning5lmwwbcyc9cn17"
},
"stable": {
"version": [
@@ -10486,8 +10782,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20200814,
- 1540
+ 20201209,
+ 1121
],
"deps": [
"clojure-mode",
@@ -10498,8 +10794,8 @@
"sesman",
"spinner"
],
- "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db",
- "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d"
+ "commit": "b197dbcf2b74a2f8e80d65bcd0318d6b302370a5",
+ "sha256": "0kfldq02i7jh10xy54za88xa3fspkb9nkf8vaagzj00292x4sl53"
},
"stable": {
"version": [
@@ -10602,10 +10898,10 @@
},
{
"ename": "ciel",
- "commit": "9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a",
- "sha256": "0rz7z3shhsvky91b581nn3hw760nlsc94fl35flm1973kvm9lvdp",
+ "commit": "87204a8f41b51217ef1485305badc6af6a891ed2",
+ "sha256": "1jmws0jh2nrcyv0qnnni7nnfsx63xmwhmbm697xfgm9wknc0bj81",
"fetcher": "github",
- "repo": "cs14095/ciel.el",
+ "repo": "takumatt/ciel.el",
"unstable": {
"version": [
20180914,
@@ -10690,14 +10986,14 @@
"repo": "jorgenschaefer/circe",
"unstable": {
"version": [
- 20200815,
- 1410
+ 20201207,
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7",
- "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy"
+ "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4",
+ "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx"
},
"stable": {
"version": [
@@ -10750,8 +11046,8 @@
"repo": "andras-simonyi/citeproc-el",
"unstable": {
"version": [
- 20200705,
- 1155
+ 20201031,
+ 1642
],
"deps": [
"dash",
@@ -10761,8 +11057,8 @@
"s",
"string-inflection"
],
- "commit": "0ad1f975a095156d02dd7f9adc0fecbc57b1e751",
- "sha256": "1xhkicffmdiy4c22m9qilm09nq9zqfsi9gawq3gflla79avblh4r"
+ "commit": "0857973409e3ef2ef0238714f2ef7ff724230d1c",
+ "sha256": "1vi62fzl3bcn24j7pvb39jdf1njrdvdvwz88qlz6l0ijaxhrv0vp"
},
"stable": {
"version": [
@@ -10790,8 +11086,8 @@
"repo": "andras-simonyi/citeproc-org",
"unstable": {
"version": [
- 20200615,
- 947
+ 20200915,
+ 2009
],
"deps": [
"citeproc",
@@ -10800,8 +11096,8 @@
"org",
"org-ref"
],
- "commit": "342f6531b08f5d789a1ae222f9707f636b1f5e2f",
- "sha256": "1dc5qkwmfi2jm12297yy14fqbc335qjsdfi2mfgiz8wvs84hyci8"
+ "commit": "22a759c4f0ec80075014dcc594baa4d1b470d995",
+ "sha256": "1j7jdc2as87zycbfhz2nav97dqnx3xnq321dbjswmidg5fbhsr7q"
},
"stable": {
"version": [
@@ -10904,11 +11200,11 @@
"url": "https://git.sr.ht/~zge/clang-capf",
"unstable": {
"version": [
- 20200813,
- 2056
+ 20201205,
+ 1229
],
- "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a",
- "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0"
+ "commit": "6d0fcae75044d930e989903673b6ab22d0401418",
+ "sha256": "12kcb26vk0x20nkwsqw7fk2mlzd64dbh02wz7bpdr3r74iygsapf"
},
"stable": {
"version": [
@@ -10928,13 +11224,13 @@
"repo": "emacsmirror/clang-format",
"unstable": {
"version": [
- 20191121,
- 1708
+ 20191106,
+ 950
],
"deps": [
"cl-lib"
],
- "commit": "2d6a4526a2518b7c0059a8a0dfee156e90a49369",
+ "commit": "e48ff8ae18dc7ab6118c1f6752deb48cb1fc83ac",
"sha256": "1l64r9rr59g26mlph6r8pkn8vzadmh3mh8gvv398kz8skayfa55f"
}
},
@@ -11152,6 +11448,25 @@
"sha256": "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd"
}
},
+ {
+ "ename": "clj-decompiler",
+ "commit": "d7081740040bfb7954076eb3b1476cef40d76f3c",
+ "sha256": "0x1bjhgyck2kfi6g3fa1nl1cg9rfqgl9zvr7a7r61dnkvp1x0w42",
+ "fetcher": "github",
+ "repo": "bsless/clj-decompiler.el",
+ "unstable": {
+ "version": [
+ 20201004,
+ 1019
+ ],
+ "deps": [
+ "cider",
+ "clojure-mode"
+ ],
+ "commit": "f04e97af2678f170b872ff35dcbe81f86f7c39f2",
+ "sha256": "09267smjngms21rc1fl6c5ip45lzqx4iqzqaqi9sbfpy8vggxkd3"
+ }
+ },
{
"ename": "clj-refactor",
"commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
@@ -11160,8 +11475,8 @@
"repo": "clojure-emacs/clj-refactor.el",
"unstable": {
"version": [
- 20200405,
- 1419
+ 20200831,
+ 1244
],
"deps": [
"cider",
@@ -11174,8 +11489,8 @@
"seq",
"yasnippet"
],
- "commit": "97095682580bbc5bfebcbc5349f03f5bd7121c96",
- "sha256": "1dgksqzdln8cv0hyq273ikfk2bmk16rwvkiyscqsxzi8jdv8cdck"
+ "commit": "6db85b37b57497b56d97d5e5512160e5db85f798",
+ "sha256": "1aig67ps65adsnpdkjvl0wdglzjzhw1jc2v1rdhyfszqk0w30sz9"
},
"stable": {
"version": [
@@ -11364,8 +11679,8 @@
"deps": [
"cider"
],
- "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6",
- "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d"
+ "commit": "13ac560c25f7355fba00d9ca8c9f4ca03e7fd189",
+ "sha256": "0h48jwx1wljh3jlnhx123i2w6hacgysh9dh7ppsrkzsg0hwhhn88"
},
"stable": {
"version": [
@@ -11396,8 +11711,8 @@
"dash",
"nov"
],
- "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6",
- "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d"
+ "commit": "13ac560c25f7355fba00d9ca8c9f4ca03e7fd189",
+ "sha256": "0h48jwx1wljh3jlnhx123i2w6hacgysh9dh7ppsrkzsg0hwhhn88"
},
"stable": {
"version": [
@@ -11422,11 +11737,11 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20200813,
- 639
+ 20201126,
+ 1558
],
- "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1",
- "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j"
+ "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b",
+ "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m"
},
"stable": {
"version": [
@@ -11446,14 +11761,14 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20200320,
- 823
+ 20200922,
+ 656
],
"deps": [
"clojure-mode"
],
- "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1",
- "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j"
+ "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b",
+ "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m"
},
"stable": {
"version": [
@@ -11700,14 +12015,14 @@
"repo": "Lindydancer/cmake-font-lock",
"unstable": {
"version": [
- 20200103,
- 1702
+ 20200914,
+ 1715
],
"deps": [
"cmake-mode"
],
- "commit": "9e0fcd1ee2cf316f661f2d652368b12f83a4ec9c",
- "sha256": "0m1i5ijiwsxral544xd4nygcr1qbackaghjfgr8pfb5yfwgdxifh"
+ "commit": "47687b6ccd0e244691fb5907aaba609e5a42d787",
+ "sha256": "03am60wr5jzx1vqyvfc885z8vy959zypjbmar37ln2pffiz9510l"
}
},
{
@@ -11718,8 +12033,8 @@
"repo": "atilaneves/cmake-ide",
"unstable": {
"version": [
- 20200515,
- 951
+ 20201027,
+ 1947
],
"deps": [
"cl-lib",
@@ -11727,8 +12042,8 @@
"s",
"seq"
],
- "commit": "a8f9e83848b513f810170988679a9ef455025975",
- "sha256": "1dzqqcj9l7hr73cj65rx5iy58bsiif5521d18jym4pajhzj3mkx0"
+ "commit": "3bc3b359a88db47fc20978bd1e9a6cbe0326ec31",
+ "sha256": "1g5fzzvjlr5jais11qdpqbgdvfq2c9k211lphdhwi0m26wqfdp3g"
},
"stable": {
"version": [
@@ -11752,20 +12067,20 @@
"url": "https://gitlab.kitware.com/cmake/cmake.git",
"unstable": {
"version": [
- 20190710,
- 1319
+ 20201119,
+ 1544
],
- "commit": "92d724903192b98e42cc1048ca587207aa20043f",
- "sha256": "1ig5wjiq31rgf57gkf37d2rzx4qkkif997w1dfllwc4w3svwykp0"
+ "commit": "d5b12ddcbca4d0919056c7815a9335087e9f2638",
+ "sha256": "1hvqmdn3xf3x2gkr2zpsh0yn26zq5g1ch7m7cmhrki1dzkfm7jhd"
},
"stable": {
"version": [
3,
- 18,
+ 19,
1
],
- "commit": "63a65baf4c343c73b2142078ef0045d3711dea1d",
- "sha256": "1a3r119qca4sg83zchnsnmmq9k7ad8pljl5s24k00xbyyfs1wm7k"
+ "commit": "64fb825438a2fecb9eab9933d5d1b926bf6f294b",
+ "sha256": "16vdm76bx9a9viha4v4sgszin2qrvkqr7j4n671r8xm7cdiyc8b7"
}
},
{
@@ -11833,11 +12148,11 @@
"repo": "tumashu/cnfonts",
"unstable": {
"version": [
- 20200819,
- 543
+ 20200824,
+ 240
],
- "commit": "d4d303b0045b682b9e699e63fa3af4dd00daf878",
- "sha256": "06gcm7wc1ayz0z2fqz3bqyfxqlgbx31z95gwbwjd9x2mqgkp02mh"
+ "commit": "b967605d571d827c1cb041c174fb363985758729",
+ "sha256": "1h4c6czj7zr1p8b0233rxmczkaf7hh72869lijsvkvx9xmq9pk8w"
},
"stable": {
"version": [
@@ -12122,14 +12437,14 @@
"repo": "ankurdave/color-identifiers-mode",
"unstable": {
"version": [
- 20200705,
- 2145
+ 20201029,
+ 2325
],
"deps": [
"dash"
],
- "commit": "dfca97595094fc192a04172d86cb4ba68cab984f",
- "sha256": "1w9biijvqr7ig7l3j6axbnmdn44xvyj3m8yinx0d6qqyys98hgyj"
+ "commit": "09684e62f0d28b22e60f3f6f50c5941549315134",
+ "sha256": "1kbb519h8ba0a428charybhwscggqza4j2wqghibkz2cgik99n2p"
},
"stable": {
"version": [
@@ -12265,11 +12580,11 @@
"repo": "purcell/color-theme-sanityinc-tomorrow",
"unstable": {
"version": [
- 20200813,
- 333
+ 20201013,
+ 551
],
- "commit": "b7e33d1ccb10a93d6a0393c43400435b70a48689",
- "sha256": "1qg5wz04d7kq63zsjbhdcxn96j6x84hsbj7vbx6d051yql6l3m8s"
+ "commit": "65dcfc9329c2eb228c12438e3831e3aeeb449470",
+ "sha256": "1l4dwn6fddix655ka9rlaqd9zyx62sxxa8nm9zwzp8nh5zdd93j4"
},
"stable": {
"version": [
@@ -12288,14 +12603,14 @@
"repo": "ajsquared/color-theme-x",
"unstable": {
"version": [
- 20180227,
- 46
+ 20201204,
+ 2245
],
"deps": [
"cl-lib"
],
- "commit": "6c2264aa6c5d9a72caeae67ebaa4472090e70350",
- "sha256": "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd"
+ "commit": "ec853dd931d625e07116fbc91d8829bd15f90889",
+ "sha256": "08b9k49adgyd0vzbwglgnc6vn741dpbxbd6ly13m5dh5h4w9zknf"
}
},
{
@@ -12306,11 +12621,11 @@
"url": "https://git.sr.ht/~lthms/colorless-themes.el",
"unstable": {
"version": [
- 20200812,
- 656
+ 20201009,
+ 1533
],
- "commit": "736f7a105535901b4783d19534e7855920e25115",
- "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
+ "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136",
+ "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72"
},
"stable": {
"version": [
@@ -12368,26 +12683,26 @@
"repo": "jcs-elpa/com-css-sort",
"unstable": {
"version": [
- 20200717,
- 338
+ 20201002,
+ 1430
],
"deps": [
"s"
],
- "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b",
- "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y"
+ "commit": "61244e12594f117ffac047454311212604399d52",
+ "sha256": "104iq411nwnv3dnm5x9myn4vf36yg3v46jcag9ln0cj0kypmjdrv"
},
"stable": {
"version": [
0,
0,
- 6
+ 7
],
"deps": [
"s"
],
- "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b",
- "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y"
+ "commit": "61244e12594f117ffac047454311212604399d52",
+ "sha256": "104iq411nwnv3dnm5x9myn4vf36yg3v46jcag9ln0cj0kypmjdrv"
}
},
{
@@ -12398,11 +12713,11 @@
"repo": "cyrus-and/comb",
"unstable": {
"version": [
- 20200411,
- 1040
+ 20201010,
+ 1147
],
- "commit": "59e025c3afb867706b869ac4bf2623665eb99821",
- "sha256": "16swixv88nbs6gscgzy5lizi66pw0c9fm03xpm1kinan8v2s9m3v"
+ "commit": "31f3e94afb2a7f7d18d30c2468a0c683700f7a66",
+ "sha256": "00xwlx9w76g557qhkgifdbxx3qr2i3l1vqldyhwa4qny3qmy6h2w"
},
"stable": {
"version": [
@@ -12542,11 +12857,11 @@
"repo": "remyferre/comment-dwim-2",
"unstable": {
"version": [
- 20190105,
- 1653
+ 20201024,
+ 828
],
- "commit": "3dfdd58495c46a37708344a57c5c52beca6b2c1c",
- "sha256": "08pi3y12i6wx69aj09nk5qd6lplwxq5wz3m7w5701988q39x62xl"
+ "commit": "396b03c67684461e194a45ce751508d37088469d",
+ "sha256": "1pmgprhl9fllpa06c4hxb5zss3qiq1lcqwqzlnq5n2lhv8lzk3h0"
},
"stable": {
"version": [
@@ -12661,14 +12976,14 @@
"repo": "ddoherty03/commify",
"unstable": {
"version": [
- 20200812,
- 1241
+ 20200921,
+ 2002
],
"deps": [
"s"
],
- "commit": "92514f071c667653f146629c0aec0ab4d3b78226",
- "sha256": "1n6jpkhq0kncsszkkpfi923zq75h3d032vwmlz7pp8szs93w2308"
+ "commit": "b1c1a06e488208ef653e0d86c97b746fd6d2bbc2",
+ "sha256": "1q843ay7zkci2xdavia6wkj06acn83a198ykpxl0xbl5wihdd6w2"
}
},
{
@@ -12709,11 +13024,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20200818,
- 1753
+ 20201120,
+ 1115
],
- "commit": "54f60ef523878c4d332f29df380f36cf2f165935",
- "sha256": "08lbjvm97fh1bm5201ncbnr5b1456y9mwf6yhrrhg1rjqvcca74q"
+ "commit": "97cfbc3967c195fb4ccb171735b9b1dea97e681a",
+ "sha256": "16rb3giggnnkpla29c7p5r8hnaiyqvjjjd9idv18pqahs7w4cy7y"
},
"stable": {
"version": [
@@ -12851,8 +13166,8 @@
"axiom-environment",
"company"
],
- "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
- "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
+ "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1",
+ "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585"
}
},
{
@@ -12883,16 +13198,17 @@
"repo": "sebastiencs/company-box",
"unstable": {
"version": [
- 20200818,
- 738
+ 20201004,
+ 735
],
"deps": [
"company",
"dash",
- "dash-functional"
+ "dash-functional",
+ "frame-local"
],
- "commit": "20384f0e382c063173b9d863344b1b23bc1e4954",
- "sha256": "0l66ajzh1x0gazmv9nzgcsy72kyja3yq4gmzgzpkgin5dxms33k0"
+ "commit": "be37a9a30dc112ab172af21af694e2cb04a74f85",
+ "sha256": "13fgmdy51gqdwijqfvb784pirx4lgva0y7ysi0c3fcx8f82cdj59"
}
},
{
@@ -12909,8 +13225,8 @@
"deps": [
"company"
],
- "commit": "5e676ab0c2f287c868b1e3931afd4c78895910cd",
- "sha256": "18zyzhjnlbwblgqgr876ynrc7k736lg5s6bgxmxph7gymdz4fb4h"
+ "commit": "9d384571b1190e99d0a789e5296176d69a3d0771",
+ "sha256": "149sbw2pmfwn52jrhavrnc16rkjz09g5kl9acl973k764mf215l0"
}
},
{
@@ -12963,8 +13279,8 @@
"dash",
"yasnippet"
],
- "commit": "b096cb528de1e0bb31cc1059d0bd698b98a6cc6a",
- "sha256": "0m70w4f0kpvk97nnnp1bfk191dhipv418fmcfqjw90sajknyhq6m"
+ "commit": "4da7b41e25943c0e30171ed25c761c5311999f0d",
+ "sha256": "1pmj4bdpnaydqai9lcxkjyik6yhbqjb2xb1wdfxpv1agzazmfyx1"
},
"stable": {
"version": [
@@ -12991,14 +13307,14 @@
"repo": "redguardtoo/company-ctags",
"unstable": {
"version": [
- 20200603,
- 438
+ 20201121,
+ 1116
],
"deps": [
"company"
],
- "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8",
- "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45"
+ "commit": "b089a1e645cd14971c93397549b237ef63495adf",
+ "sha256": "045na4qi4n4w8vibjnxqd308ksgazx9ziy5x7ir7b4cklvkifvml"
},
"stable": {
"version": [
@@ -13021,8 +13337,8 @@
"repo": "tsukimizake/company-dcd",
"unstable": {
"version": [
- 20190116,
- 256
+ 20201009,
+ 1328
],
"deps": [
"cl-lib",
@@ -13032,8 +13348,8 @@
"popwin",
"yasnippet"
],
- "commit": "11e90949e546fcff1b1cd40887ad7b6701aa1653",
- "sha256": "1n4f2hqmvwysbb1l6c5ah58b1bq8vxznk3ysszz8rs5gpqsizqd4"
+ "commit": "26245d79b5ab38314dd3a90877e425b18854bcab",
+ "sha256": "1aqcbi99333qdyd27xw3x4n4r2q8yx0pb2wyzlff4qw1z90bpr9f"
}
},
{
@@ -13127,28 +13443,28 @@
"repo": "dunn/company-emoji",
"unstable": {
"version": [
- 20200612,
- 1902
+ 20201020,
+ 554
],
"deps": [
"cl-lib",
"company"
],
- "commit": "5f2d10623c1e9f547d852cb13c7a391afbda09fb",
- "sha256": "0b7hfcgmrkmbi138hjfc9jsgh84slw4fcizxss55b9j60xrzsc75"
+ "commit": "514b33c29ff384188e90aceceabf305205837081",
+ "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp"
},
"stable": {
"version": [
2,
- 5,
- 2
+ 6,
+ 0
],
"deps": [
"cl-lib",
"company"
],
- "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06",
- "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2"
+ "commit": "514b33c29ff384188e90aceceabf305205837081",
+ "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp"
}
},
{
@@ -13229,28 +13545,28 @@
"repo": "jcs-elpa/company-fuzzy",
"unstable": {
"version": [
- 20200712,
- 49
+ 20201119,
+ 315
],
"deps": [
"company",
"s"
],
- "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a",
- "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3"
+ "commit": "ae004dc234b2cd2e4a0fd8a35aa8c966a15074c7",
+ "sha256": "1073hf1ximvhaf5vaxmz5arfph51ywqld52fkwjna6bf2djmchrf"
},
"stable": {
"version": [
+ 1,
0,
- 6,
- 0
+ 1
],
"deps": [
"company",
"s"
],
- "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a",
- "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3"
+ "commit": "ae004dc234b2cd2e4a0fd8a35aa8c966a15074c7",
+ "sha256": "1073hf1ximvhaf5vaxmz5arfph51ywqld52fkwjna6bf2djmchrf"
}
},
{
@@ -13457,8 +13773,8 @@
"company",
"jedi-core"
],
- "commit": "5232fbc1fdbfc81b1dd883afb720338c3e39556b",
- "sha256": "155dba3qim7r8xhrv6dkhzhcc2km9761g5d3qmgd37jnk0mmd8l0"
+ "commit": "4775b659564f1d57bc68c88c9faabf44c9fe4e4d",
+ "sha256": "03ii2r9wnfcywk1a0c46ga4nimq9jrrh5ljzsi079j0rnvj0hsj0"
},
"stable": {
"version": [
@@ -13493,8 +13809,8 @@
"lean-mode",
"s"
],
- "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
- "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
+ "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7",
+ "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb"
}
},
{
@@ -13587,6 +13903,19 @@
"company",
"ivy"
],
+ "commit": "44c7a655e5f2a462835a96d1f0ed2ce434848416",
+ "sha256": "007zyvr5mw16j7gxxx8bm0jpy8hyph9xrmxsi1dy2pshb2fnpq95"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "company",
+ "ivy"
+ ],
"commit": "b922318da821fc3cf1d3155f21d543ea8470c881",
"sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9"
}
@@ -13669,11 +13998,15 @@
"repo": "stardiviner/company-nginx",
"unstable": {
"version": [
- 20180604,
- 2
+ 20201020,
+ 2038
],
- "commit": "3074a5d322562f36867ef67bffeb25f1c0d8aca9",
- "sha256": "04nq6cihb5kymi3rjfx53337fx4g042cw1jxiv016sq88z24lznx"
+ "deps": [
+ "cl-lib",
+ "company"
+ ],
+ "commit": "3ef9aa76c43347694d355db4c75cfd3d049cdbe1",
+ "sha256": "0kvxmpwf206grfirkpf8rwnkprb96lhna4bgaixf71g160dm3770"
}
},
{
@@ -13782,30 +14115,30 @@
"repo": "xcwen/ac-php",
"unstable": {
"version": [
- 20190424,
- 222
+ 20201009,
+ 1025
],
"deps": [
"ac-php-core",
"cl-lib",
"company"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd",
+ "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f"
},
"stable": {
"version": [
2,
3,
- 0
+ 1
],
"deps": [
"ac-php-core",
"cl-lib",
"company"
],
- "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
- "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
+ "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3",
+ "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn"
}
},
{
@@ -13924,28 +14257,28 @@
"repo": "tumashu/company-posframe",
"unstable": {
"version": [
- 20200812,
- 410
+ 20201127,
+ 239
],
"deps": [
"company",
"posframe"
],
- "commit": "4bfb8bccef4b64479f4147de6bf6fbd05df2a67e",
- "sha256": "0k19gkh8xbap4j1jjqw6lnkp1v2q76fz3ryrns7kvbzmca3y5599"
+ "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df",
+ "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm"
},
"stable": {
"version": [
0,
- 1,
+ 5,
0
],
"deps": [
"company",
"posframe"
],
- "commit": "361de25739e866843b770638669f5bdf7ed95610",
- "sha256": "0azmln9mssc52563vs5g3z3ajv4p6908c94v3fij1q0bdvlmcv6g"
+ "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df",
+ "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm"
}
},
{
@@ -13963,8 +14296,8 @@
"company",
"prescient"
],
- "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
- "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
+ "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95",
+ "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0"
},
"stable": {
"version": [
@@ -14006,15 +14339,15 @@
"repo": "company-mode/company-quickhelp",
"unstable": {
"version": [
- 20200714,
- 1611
+ 20201208,
+ 2308
],
"deps": [
"company",
"pos-tip"
],
- "commit": "5a86731de461142db3b7ca26b4681756edb4b773",
- "sha256": "0n0pdcgql8hcipwacc60hk4ymp8ry6z9lm4p4wn8gmnb7km023qb"
+ "commit": "b13ff1ba0d6176825f165920b17625948f1256c5",
+ "sha256": "0kbingznnzmd4qfck2pg696ixrzxlqzqv2vgq77cvbf1ijld1rgh"
},
"stable": {
"version": [
@@ -14038,28 +14371,28 @@
"repo": "jcs-elpa/company-quickhelp-terminal",
"unstable": {
"version": [
- 20200627,
- 908
+ 20200904,
+ 305
],
"deps": [
"company-quickhelp",
"popup"
],
- "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e",
- "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7"
+ "commit": "c2e077e8d32610f80a506c410ab51a4ba747a47f",
+ "sha256": "014gk5ara9xh218wm2ygh2nilyp3s1rbg6y5y2z2ki460biwi166"
},
"stable": {
"version": [
0,
1,
- 0
+ 1
],
"deps": [
"company-quickhelp",
"popup"
],
- "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e",
- "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7"
+ "commit": "c2e077e8d32610f80a506c410ab51a4ba747a47f",
+ "sha256": "014gk5ara9xh218wm2ygh2nilyp3s1rbg6y5y2z2ki460biwi166"
}
},
{
@@ -14090,15 +14423,15 @@
"repo": "TheBB/company-reftex",
"unstable": {
"version": [
- 20181222,
- 906
+ 20201116,
+ 1605
],
"deps": [
"company",
"s"
],
- "commit": "275ef708f08d3bf0eb30632148e5c6184eeaacdb",
- "sha256": "118cgw5lsffqdqz95mnkw36mmnsbg9m52r2np4m7v14mjjwr9fby"
+ "commit": "291c283c8a015fd7cbaa99f836e1a721f1e2c832",
+ "sha256": "0qwmjqcpi10lwsrppifjyr041hmgqb86nxpb970rb1m3n9p5rnk0"
}
},
{
@@ -14152,8 +14485,8 @@
"company",
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -14287,21 +14620,21 @@
"company",
"stan-mode"
],
- "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
- "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
},
"stable": {
"version": [
10,
- 1,
+ 2,
0
],
"deps": [
"company",
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
}
},
{
@@ -14342,14 +14675,14 @@
"repo": "juergenhoetzel/company-suggest",
"unstable": {
"version": [
- 20200804,
- 1127
+ 20200911,
+ 1845
],
"deps": [
"company"
],
- "commit": "7f4efb0e2577b7b34928db3dc71758ab6852f66b",
- "sha256": "0hlvg11p4xkafqys322ablbld2v7fks924cpc3bs3wcipjjxl3cf"
+ "commit": "1c89c9de3852f07ce28b0bedf1fbf56fe6eedcdc",
+ "sha256": "0xy2al4b888f32qmxcai2wshx4ajgkk9wnv3rdmdmianx0xmzpzh"
}
},
{
@@ -14360,8 +14693,8 @@
"repo": "TommyX12/company-tabnine",
"unstable": {
"version": [
- 20200327,
- 2137
+ 20201101,
+ 1948
],
"deps": [
"cl-lib",
@@ -14370,8 +14703,8 @@
"s",
"unicode-escape"
],
- "commit": "e986a4ad0d0e0174b08f1fb94c4f804a98a344e4",
- "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5"
+ "commit": "da18b5e1f01facea1e9588f067ec79dc36e475fc",
+ "sha256": "0qaq5k5c6nnnk7rhi2n51nj4jgnrjf843p8qafcqbz120ynih1w1"
}
},
{
@@ -14497,8 +14830,8 @@
"s",
"ycmd"
],
- "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477",
- "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv"
+ "commit": "c17ff9e0250a9b39d23af37015a2b300e2f36fed",
+ "sha256": "0amdz2ss953lm39yky1dv3zp20ig97mxsk7z81694bpxnhn4kxad"
},
"stable": {
"version": [
@@ -14520,10 +14853,10 @@
},
{
"ename": "compdef",
- "commit": "462b3d92c8c5f72ae1b70fa4d48b803c2f3d07e2",
- "sha256": "04cav3f1ggyjfgnbx1wsyfaj8d63sxwfqkjar869p6kz9gajy4qr",
- "fetcher": "gitlab",
- "repo": "jjzmajic/compdef",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "1ndwkmmd4ajpg3g78b761dhhkjzwp9qan10r568rp2knbf6xnaw4",
+ "fetcher": "github",
+ "repo": "wurosh/compdef",
"unstable": {
"version": [
20200304,
@@ -14541,14 +14874,14 @@
"repo": "sei40kr/competitive-programming-snippets",
"unstable": {
"version": [
- 20200501,
- 1205
+ 20201115,
+ 1702
],
"deps": [
"yasnippet"
],
- "commit": "22bbf4c5edcc895b67b9f22599f284655ca48858",
- "sha256": "14vbpy1y9dq9ip0bkmap7l2y2qx9jxzvisarbwlqqxj0xl7gbwc6"
+ "commit": "3b43c1aeaa6676d1d3d0c47e78790db9bee150b6",
+ "sha256": "1pmwsjwj1sb9dqy46p7ky94m9dawd79klcjg1vpl9l7mfvz5i34m"
},
"stable": {
"version": [
@@ -14571,11 +14904,11 @@
"repo": "muffinmad/emacs-completions-frame",
"unstable": {
"version": [
- 20200507,
- 1703
+ 20201123,
+ 1213
],
- "commit": "192a70060d2a8710ca75aa2336a10c21a4d30eed",
- "sha256": "0bi7q2napzfqbsdi4si1kfzdjq39hxg3czwbpmybrljg6rwgr9xf"
+ "commit": "95e0845fdac5412a511ca15b12189ed9487a64a7",
+ "sha256": "1mz7dxa4bhay4h2kh1f4g4dwsfswidlhiy11s4a6l3zjqjj8hklb"
}
},
{
@@ -14586,11 +14919,11 @@
"repo": "paldepind/composable.el",
"unstable": {
"version": [
- 20200604,
- 1156
+ 20201024,
+ 1458
],
- "commit": "f6262e6d7380ce9d4eacd7127fe0d968325f347d",
- "sha256": "0a2xfnd54pclh3qm1hwv867dpkhk6wck94092yyzapj7zxnfnr15"
+ "commit": "6f2efaa7018feb854720cc2518e4274ad708f793",
+ "sha256": "101shj0z8piww7idb6ha67synhw12x1lwgp3w48w1khrcw43zq7f"
},
"stable": {
"version": [
@@ -14646,14 +14979,14 @@
"repo": "daviderestivo/comware-router-mode",
"unstable": {
"version": [
- 20200106,
- 2011
+ 20201112,
+ 1629
],
"deps": [
"dash"
],
- "commit": "e6e2d9ca71a7a46c0e4ebeb30e4994c2a8b5fe0d",
- "sha256": "16x9xbf3km6k8xjivlf2ill7pmvrmaf3c35baznixm6hwdcv4wib"
+ "commit": "471cde874999cc50b03d7c906802369ea5a5ffa4",
+ "sha256": "14cjnc09ms4cfp9nyp904gcp6rd5aflgp9vhb42gh4lzfzm3ppzj"
}
},
{
@@ -14841,8 +15174,8 @@
20191111,
446
],
- "commit": "c9cad101100975e88873636bfd426b7a19304ebd",
- "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi"
+ "commit": "bdf0aa7761d1c1a3bc0652b2fdc4a54b3acdb06a",
+ "sha256": "1vm9m36ab7hs58xqzr4g8lp2s78qzlcsy57f8yajrhibwfh5jrs6"
},
"stable": {
"version": [
@@ -14868,6 +15201,21 @@
"sha256": "1456kydn5k5sq8dgaf45nzqaw1035945dhwkh07vz11ivvcrz3xs"
}
},
+ {
+ "ename": "consult",
+ "commit": "488a72b896992984b048cc6ce4796ade11849bb0",
+ "sha256": "02z6h0x346230ayncsb8phks9mmjdq5mj9ja68380hl6gkic3407",
+ "fetcher": "github",
+ "repo": "minad/consult",
+ "unstable": {
+ "version": [
+ 20201209,
+ 824
+ ],
+ "commit": "dadc87fe73a93d2ecc34a0f82636729e8fe2dcd7",
+ "sha256": "07ibxpbsv7mfxg8b04fw7517i54yky4y7h0wyg7f6lfmhb0zadq3"
+ }
+ },
{
"ename": "contextual",
"commit": "de20db067590624bbd2ca5a7a537b7f11ada84f2",
@@ -15135,15 +15483,15 @@
"repo": "conao3/cort.el",
"unstable": {
"version": [
- 20200812,
- 910
+ 20200904,
+ 609
],
"deps": [
"ansi",
"cl-lib"
],
- "commit": "28c8422e84fd545f7a166f1904277b6b3f98398c",
- "sha256": "06fcwadrn32i19qp30xw65976wplsw3xh2jm0zzsp9g0pir1snxb"
+ "commit": "98532580e0425ac96f45f73ef7cebf80cb4101e2",
+ "sha256": "0pwdh0c0ilrp8bx594qw2684q009ls1ras8ha2xavnwxph84jpd2"
},
"stable": {
"version": [
@@ -15181,14 +15529,14 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200818,
- 1428
+ 20201208,
+ 1022
],
"deps": [
"swiper"
],
- "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
- "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f",
+ "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6"
},
"stable": {
"version": [
@@ -15328,26 +15676,26 @@
"repo": "redguardtoo/counsel-etags",
"unstable": {
"version": [
- 20200814,
- 716
+ 20201117,
+ 113
],
"deps": [
"counsel"
],
- "commit": "5ec1e422b47163e17d0d5c1cf732068f93ffc39c",
- "sha256": "0zwyff7lamlpqd52ifspf6bb78cpanlsy5gccp7ms7mnj82zhfxm"
+ "commit": "89ed187095be956dbf97e813a7bbfdb87ee125ba",
+ "sha256": "02dhj8qry2j5v47cfr3f6yv5kzxwf1m1w9055ar4x74akgm7901w"
},
"stable": {
"version": [
1,
9,
- 12
+ 15
],
"deps": [
"counsel"
],
- "commit": "9436bdbddc0deba88d97b5f31d62a2c95a52c400",
- "sha256": "08glszh5y8y078vjrnmasxdfmxiics88hkva4nqq6spl0a0hrn9f"
+ "commit": "d391b550a9d874409560e71d74cd13c14aacc6ab",
+ "sha256": "1kkck3cdq404czih8rhinammillhmy2iz10469z7iyzc35wrljyk"
}
},
{
@@ -15358,14 +15706,14 @@
"repo": "CsBigDataHub/counsel-fd",
"unstable": {
"version": [
- 20200505,
- 1344
+ 20200902,
+ 2147
],
"deps": [
"counsel"
],
- "commit": "afba62f73d348cd7dfd10db039769788f5ae7ad4",
- "sha256": "1v5iy8axlrapaav0vwhns32xbsnsay62dc9g50bv7n84cn1pvmmy"
+ "commit": "533d70f229abc73b013668bd03f7486effa1e369",
+ "sha256": "0iz0blxbi0zcilyg4a5aqzggy1b0rdygw5q45szp9hbzzqdb5wfg"
}
},
{
@@ -15395,15 +15743,15 @@
"repo": "FelipeLema/emacs-counsel-gtags",
"unstable": {
"version": [
- 20200101,
- 1701
+ 20201130,
+ 1401
],
"deps": [
"counsel",
"seq"
],
- "commit": "5d2a8c2c2d358e374a576cf8a3a67f7997a8839b",
- "sha256": "0qx7gdxgd28grz8pn57kb9qrsvdiysci6hya1fif3iqb1hbyg2mn"
+ "commit": "1c0a0102931b73e0073307ba10ebfc47b2b145af",
+ "sha256": "137i0mwi12hfrdlb4h0vh9vwjw5yyq2p69ib9pfs4y8frhv350ad"
},
"stable": {
"version": [
@@ -15425,15 +15773,15 @@
"repo": "200ok-ch/counsel-jq",
"unstable": {
"version": [
- 20191207,
- 1334
+ 20201203,
+ 901
],
"deps": [
"ivy",
"swiper"
],
- "commit": "b14dfc5c18d991c3b3051c3cbb244d5923b3a327",
- "sha256": "0f5h7nnqrkzbyxi4mgzahqzylszrqb25l3i24ml8yra2a23nl2w8"
+ "commit": "aaf33fc2447096cd0d03b77395fe2a95c9fe1481",
+ "sha256": "10rz0qm8a4bl0m86kx19zq8lri047p4sxqyny08bgm9pbam0wvwn"
},
"stable": {
"version": [
@@ -15531,15 +15879,15 @@
"repo": "ericdanan/counsel-projectile",
"unstable": {
"version": [
- 20200522,
- 1131
+ 20201015,
+ 1109
],
"deps": [
"counsel",
"projectile"
],
- "commit": "77392cbbc42e98fc137b43f1db1b111ba6e2dd75",
- "sha256": "131pww7lf88az5bsnaza8i60p7xcic271wpdr870zan8z1jh69k3"
+ "commit": "06b03c1080d3ccc3fa9b9c41b1ccbcf13f058e4b",
+ "sha256": "10afil6grwxj1x8fxd3ar7ikw3s3hzrkjsjin8wzchbz04389l7s"
},
"stable": {
"version": [
@@ -15704,16 +16052,16 @@
"repo": "AdamNiederer/cov",
"unstable": {
"version": [
- 20200630,
- 1942
+ 20201025,
+ 425
],
"deps": [
"elquery",
"f",
"s"
],
- "commit": "8b9c7d7f4e53ab3a66cc4d9c88ac07fa57c7a5fe",
- "sha256": "17msfsl7q78cs065a28z95hgcqvhbddlg9qwgldc1v62lgpqfd7a"
+ "commit": "d6cd3f6a857622f73779ffb2250902fc0c00f7f8",
+ "sha256": "1kazdbwdidwqi0zj3dxh0h53pw22pvvn8nhkkk6xkjiigjz85n89"
}
},
{
@@ -16109,14 +16457,14 @@
"repo": "bbatsov/crux",
"unstable": {
"version": [
- 20200817,
- 1534
+ 20201129,
+ 1921
],
"deps": [
"seq"
],
- "commit": "139eb6f1504b6885c86c658fd33c6d59bfac0a8c",
- "sha256": "1889cn6pb8j55mi606nm1r6yywg64xa89s0hfbiksl4gx03yk2ip"
+ "commit": "ba4a1f38eee0ae7597f67a1424bbf5c0c09473bf",
+ "sha256": "0swykynbxsvxwxqjf41aqydkfrwy6f5ngl4pp8py5r5vh78a91ih"
},
"stable": {
"version": [
@@ -16220,20 +16568,20 @@
"repo": "josteink/csharp-mode",
"unstable": {
"version": [
- 20200728,
- 1113
+ 20201209,
+ 1122
],
- "commit": "48851778e0f01a2b0395e054e418a1d8a1687a06",
- "sha256": "0nikm2sn59ichbd3ikyhdn696fqj5ikzh79iniylza8gzmhxgddi"
+ "commit": "a6caa85b914ade93310da17f669a57c6f7ff94bb",
+ "sha256": "0k6y0ngpk0993p8y65a7yp377izzf1jjs6bpxmw0mc45sjwiqmwa"
},
"stable": {
"version": [
0,
- 9,
- 2
+ 10,
+ 0
],
- "commit": "5e47b7764b3f4c97c260a902e8072d444dbd0f1b",
- "sha256": "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0"
+ "commit": "80238e862dec17e3553e04e6f101a0cc42019f84",
+ "sha256": "0vwkbla2gkfa9dzxfvrvr7hd2z16769iwbycl7k6l701dnwli1fw"
}
},
{
@@ -16439,19 +16787,34 @@
"repo": "raxod502/ctrlf",
"unstable": {
"version": [
- 20200802,
- 1422
+ 20201020,
+ 1353
],
- "commit": "5a13161bb2ef2908dd5a00b3b6aa7b8dacfecd8a",
- "sha256": "09gd2zi3wvg9vhaxz6y1zii0n8nxhffp9qyjsgswyzaa1j7dzv2i"
+ "commit": "5acefdc9a6f8e35febf6f71b6a34a0d4fc499269",
+ "sha256": "0h707npbc4n9zx3pzla8cwaij48f80gg8fyjrdha4wb4y8ld6llq"
},
"stable": {
"version": [
1,
- 1
+ 2
],
- "commit": "b91f88a24c05408757ae9c9b5ce74d46d6ce20d8",
- "sha256": "1ffcjf0ff0748gqipkklz6jmcj4f3blgzdcax93ql9ws8bmvlsdc"
+ "commit": "d398a9bfbd959489fd6515b62dbf818a61d0e4d6",
+ "sha256": "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi"
+ }
+ },
+ {
+ "ename": "ctrlxo",
+ "commit": "94b9c456d9896c345158cf43dfd9695cbb393af2",
+ "sha256": "158l994l3z6bwi6g3igcksv0b3yr5i358cs262391w9awaghl5rh",
+ "fetcher": "github",
+ "repo": "muffinmad/emacs-ctrlxo",
+ "unstable": {
+ "version": [
+ 20201021,
+ 701
+ ],
+ "commit": "8ad95a81bd1ece06ebe40e2a83490775db64b419",
+ "sha256": "1d84nx8zdy5jcfm4bavlg989ygv55gfb3mwjibsrbmn9vgckrdgr"
}
},
{
@@ -16551,8 +16914,8 @@
20171009,
1957
],
- "commit": "c2fba597da83b9ddc1195f1c8710d5330db24735",
- "sha256": "0gprqhm38y5dcpkmhy1i6rv7pa5l8271b71284p1g90p2iyvm89g"
+ "commit": "00f09bb2d4bb496549775e770d7ada08bc1e4866",
+ "sha256": "18m10xyyjw8zyiq4v4qvajal0mvp9iy637a6sc375qxnr829x23m"
},
"stable": {
"version": [
@@ -16590,11 +16953,11 @@
"repo": "chachi/cuda-mode",
"unstable": {
"version": [
- 20151214,
- 321
+ 20201013,
+ 2230
],
- "commit": "9ae9eacfdba3559b5456342d0d03296290df8ff5",
- "sha256": "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy"
+ "commit": "7f593518fd135fc6af994024bcb47986dfa502d2",
+ "sha256": "0ibap1k70b3c4fnyvgvnqdcxnchqwrpz20k2dk2lw3wgznv3bsx2"
},
"stable": {
"version": [
@@ -16614,11 +16977,11 @@
"repo": "xuchunyang/curl-to-elisp",
"unstable": {
"version": [
- 20200427,
- 219
+ 20201124,
+ 1012
],
- "commit": "25449962e758607762b3df76fc5501cfeedbbd38",
- "sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv"
+ "commit": "63d8d9c6d5efb8af8aa88042bfc0690ba699ef64",
+ "sha256": "1k43gr7jaw5m7s6rrwmcygam3rmxin5yhbr06bn7ga2c4jc9g0d0"
}
},
{
@@ -16629,11 +16992,11 @@
"repo": "lassik/emacs-currency-convert",
"unstable": {
"version": [
- 20200611,
- 815
+ 20201017,
+ 1817
],
- "commit": "a8bd12654c34380b87ac6ffece32f43b723b6f0f",
- "sha256": "1np43lwrwfwnnff98230ahaqdifiq2nzd361ypsg8cp8qja4zwwi"
+ "commit": "0b12614956085444d73c47bc308c02cef0f64f97",
+ "sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm"
}
},
{
@@ -16817,8 +17180,8 @@
20190111,
2150
],
- "commit": "fcfd16c7467c31f255287a73f36cf66b32bc096c",
- "sha256": "1yscd5q1qqw8xx4ds2pifpiyzhdnx0la5n50mxqjb3hlky7p48wh"
+ "commit": "cedbd5840fde2c63549b64c35cd05ea5fb9fc524",
+ "sha256": "1l5j4phhmlzr14zczk9h63m8rw3z0avlvgs6pbhch5fvhs8fv4zi"
},
"stable": {
"version": [
@@ -16853,20 +17216,20 @@
"repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
"unstable": {
"version": [
- 20191009,
- 903
+ 20201201,
+ 1136
],
- "commit": "cfd1d0869d51b7548b3fb738b2f2593c76533d44",
- "sha256": "0vkl470vvmxap8ca773a0jvjvalmvdbbax3qvgjdclp54ml75al4"
+ "commit": "1931ec9ee7af6767883452a822914ad3fd98ddad",
+ "sha256": "0sf7bn11hfcmmlx3vrp0aix2g1nvng7wfwbkbvj682prr9zld3c3"
},
"stable": {
"version": [
2,
0,
- 10
+ 11
],
- "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4",
- "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv"
+ "commit": "cfd1d0869d51b7548b3fb738b2f2593c76533d44",
+ "sha256": "0vkl470vvmxap8ca773a0jvjvalmvdbbax3qvgjdclp54ml75al4"
}
},
{
@@ -16969,11 +17332,11 @@
"repo": "rails-to-cosmos/danneskjold-theme",
"unstable": {
"version": [
- 20200724,
- 1525
+ 20201120,
+ 1520
],
- "commit": "5b458ce976acf948aa101a05994b68baf9b01846",
- "sha256": "16496dr846whv056xq2y994csr55zjd8906brkav2zjhj7qy0w1r"
+ "commit": "412f5c80f3da1699ae69b878405fd71e65b6358a",
+ "sha256": "1icwdkaybs1cpqgvdzvgqickgcpm0ykpr4345jzhc193gfb1iccc"
}
},
{
@@ -16984,8 +17347,8 @@
"repo": "jyp/dante",
"unstable": {
"version": [
- 20200416,
- 1217
+ 20200921,
+ 723
],
"deps": [
"company",
@@ -16996,8 +17359,8 @@
"lcr",
"s"
],
- "commit": "c516bc9e8f09e0f928de9a93e82acfb382636f5c",
- "sha256": "16msp36vflq10w0h1hh6fy7z9gmqzhr61w0xali2jkb203v1pi6d"
+ "commit": "e2acbf6dd37818cbf479c9c3503d8a59192e34af",
+ "sha256": "18w9ifykrcxxjn9pwp3xfyxvx54c0icwsv0n12xfjghfdkph21qq"
},
"stable": {
"version": [
@@ -17025,8 +17388,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20200814,
- 1819
+ 20201118,
+ 1304
],
"deps": [
"bui",
@@ -17038,8 +17401,8 @@
"posframe",
"s"
],
- "commit": "0c11dd205152f3b8712362e4bc8919def7f312a4",
- "sha256": "1j7vxf42icl4nsnza91lp8l3lgrhn6y11xi9ql5lji5vfgj94mk6"
+ "commit": "e582ff90c104703ed65c1f3174d4c4690e9cf1fd",
+ "sha256": "05rcpxg982amzk8abrrhzig2ax6rwm2bj1xvy29r8imvpayfm14f"
},
"stable": {
"version": [
@@ -17295,8 +17658,8 @@
20200803,
1520
],
- "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20",
- "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh"
+ "commit": "0f238a9a466879ee96e5db0482019453718f342d",
+ "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v"
},
"stable": {
"version": [
@@ -17371,8 +17734,8 @@
"deps": [
"dash"
],
- "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20",
- "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh"
+ "commit": "0f238a9a466879ee96e5db0482019453718f342d",
+ "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v"
},
"stable": {
"version": [
@@ -17395,14 +17758,14 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20200306,
- 1344
+ 20201209,
+ 1003
],
"deps": [
"page-break-lines"
],
- "commit": "bf38867ae80902d58207974b4a2bba4249324599",
- "sha256": "1ksa1rq6xmyxc4srj1n3l0rd66zcz9br8k2bp3pzriljqvk8l753"
+ "commit": "197d9285c473afa524c45c737f4f61ea1caf8f0d",
+ "sha256": "18sqfs845xp16yqan4pbks4iy3z26988s7idby58333ky506lpl2"
},
"stable": {
"version": [
@@ -17444,30 +17807,30 @@
"repo": "jcs-elpa/dashboard-ls",
"unstable": {
"version": [
- 20200515,
- 1430
+ 20201207,
+ 1616
],
"deps": [
"dashboard",
"f",
"s"
],
- "commit": "8b2922abb75847787626fe241d609cff7eabf840",
- "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h"
+ "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8",
+ "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b"
},
"stable": {
"version": [
0,
- 1,
- 3
+ 2,
+ 1
],
"deps": [
"dashboard",
"f",
"s"
],
- "commit": "8b2922abb75847787626fe241d609cff7eabf840",
- "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h"
+ "commit": "c97ea0b454ea78e55155fd4c52abc60753496cd8",
+ "sha256": "1dkgccj4ac2mis930qwsncjcygx729pgs0v00hpm23mnhc6mxx9b"
}
},
{
@@ -17704,15 +18067,15 @@
"repo": "matsievskiysv/display-buffer-control",
"unstable": {
"version": [
- 20200527,
- 1040
+ 20201001,
+ 1452
],
"deps": [
"cl-lib",
"ht"
],
- "commit": "8aa8982e6afbe3820f60c3defbb3c8037e04eebe",
- "sha256": "1zwxn76zh0ba5pa821g2aaqa1niz2l0g3wvnngspw04fla2scjb4"
+ "commit": "6728e72f72347d098b7d75ac4c29a7d687cc9ed3",
+ "sha256": "1bkiwg1wp3l904159gycdr83xkb3i0h2k0da7akzkwc957abvp8w"
},
"stable": {
"version": [
@@ -17735,15 +18098,15 @@
"repo": "skk-dev/ddskk",
"unstable": {
"version": [
- 20200816,
- 1809
+ 20200906,
+ 233
],
"deps": [
"ccc",
"cdb"
],
- "commit": "275a831be77573470309a78967734d2b6d10f218",
- "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
+ "commit": "a66a7b16f13533afdd03e21eebcdd6309e469a13",
+ "sha256": "1x5qrzzsn977hyi8xnc37jrsq7adwg2jd1ln3vapfxr05pgiijk7"
}
},
{
@@ -17785,16 +18148,16 @@
"repo": "Wilfred/deadgrep",
"unstable": {
"version": [
- 20200803,
- 606
+ 20201012,
+ 619
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "9cd79e0d5dd6b77abca3e84e17d3e4e2e9aa5695",
- "sha256": "1xq06af3lib8i2l0619ggzkzf00pb39pk0pd97i6dv7593y82c94"
+ "commit": "baa352b982bded5fbca1ec9c14fec20e78b2089b",
+ "sha256": "08p2aaak27mf8nidl2nqfhrhvapswp0b79l3jn0vb2xabbhza7rv"
},
"stable": {
"version": [
@@ -17818,11 +18181,11 @@
"url": "https://salsa.debian.org/emacsen-team/debian-el.git",
"unstable": {
"version": [
- 20200401,
- 1622
+ 20201011,
+ 1543
],
- "commit": "d7117ab18b15f449f194cd7d91ff22e55fcfa817",
- "sha256": "09i2n4990d5ra4zqswzv8sjk4psd9lf71xdsgnfbr88pdv1q8bhf"
+ "commit": "4fd5547a54ee931f4a16adde1d3b52bf01ce045a",
+ "sha256": "07yar2b0h8d16j3q55cw2mdk88akvsab6z7bpkzavyqalgvd061b"
},
"stable": {
"version": [
@@ -18014,8 +18377,8 @@
"repo": "jcs-elpa/define-it",
"unstable": {
"version": [
- 20191230,
- 1409
+ 20201005,
+ 1731
],
"deps": [
"google-translate",
@@ -18025,8 +18388,8 @@
"s",
"wiki-summary"
],
- "commit": "4e769b94c4ec81d9c1eac9dda0e22c869a07aa7c",
- "sha256": "0amwslk4hawjzjbdakx7ggclw3y9ackl2vnmrr0pw17m5ccsr10b"
+ "commit": "8df0505babf930bafe3fd28d472cc325637f886b",
+ "sha256": "1czdnvwf2z0za296sn392w52hb2akw2sh27f3b7nw0987iz9qa0s"
},
"stable": {
"version": [
@@ -18054,11 +18417,11 @@
"repo": "abo-abo/define-word",
"unstable": {
"version": [
- 20200417,
- 844
+ 20200824,
+ 1120
],
- "commit": "08c71b1ff4fd07bf0c78d1fcf77efeaafc8f7443",
- "sha256": "053kyg2jqayphdkm7s8fz8yl97yspib6qszcajyr77m6n7j4i764"
+ "commit": "3af6825c5f3bf4f6176a3f5b2e499616c65e2fe0",
+ "sha256": "1l418w5lhlyh62557ffrsisv7ips0ql7bpcxc32msc51dlh7ilhh"
},
"stable": {
"version": [
@@ -18149,26 +18512,25 @@
"repo": "liblit/demangle-mode",
"unstable": {
"version": [
- 20200621,
- 2344
+ 20200926,
+ 2014
],
"deps": [
"cl-lib"
],
- "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6",
- "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l"
+ "commit": "aaef0bd77a3ea9ce9132e9a53ac021b0f5d33e12",
+ "sha256": "0pz49zn81bwszcaq24x9p3kkybrl47xl3ndj5xalg4ifw7nw0ygb"
},
"stable": {
"version": [
- 1,
- 3,
- 2
+ 2,
+ 0
],
"deps": [
"cl-lib"
],
- "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6",
- "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l"
+ "commit": "901242db26d00432ba075a2325b389cc847825e2",
+ "sha256": "0qkkrjb4yai5qd6hdabkwsgh696dazahswsk674jqwn39c3b2d4c"
}
},
{
@@ -18303,20 +18665,20 @@
"repo": "DamienCassou/desktop-environment",
"unstable": {
"version": [
- 20200225,
- 1042
+ 20201117,
+ 1653
],
- "commit": "dbcf3d9411d53908de09ab0d34932d19c8117144",
- "sha256": "12lqwc3aqrly85ihdrh4k4vwglqypbi250fl0aasbbiwpbnraawa"
+ "commit": "d8560e4fe98d75a47ab652ef44ced8660c956fb8",
+ "sha256": "1xsqhvprjd1097mdig14z83psi3jzfm6k8pdw43g9pqih404lg40"
},
"stable": {
"version": [
0,
- 3,
+ 4,
0
],
- "commit": "57de5e018baa1c7667230cae657c80ca765ae912",
- "sha256": "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2"
+ "commit": "c7507bfb10464b0527b3e2c5287a256cf3bf7ba3",
+ "sha256": "0s33jncjg8c2xlr90qjk1ishwmwxm9yg0z6n3kzilawcilpxidsh"
}
},
{
@@ -18396,14 +18758,14 @@
"repo": "psibi/dhall-mode",
"unstable": {
"version": [
- 20200716,
- 2147
+ 20200822,
+ 258
],
"deps": [
"reformatter"
],
- "commit": "484bcf8f78f1183ef45c3b04a362bb73690c6b9b",
- "sha256": "1wggg8jlzg9rph4jhxp6yiri178rnasbv38838i973kjgqjxrl76"
+ "commit": "97524f934556d561c6c9268ed719f027ed9f55e9",
+ "sha256": "1c8dzk19f3n5v1r43iaynd1cs2valypz0ldh8l22cdbg82smva1b"
}
},
{
@@ -18441,8 +18803,8 @@
20200404,
1549
],
- "commit": "2850e8f27662eb1e8a34425b3032a361a5c989cc",
- "sha256": "0p4l6gsfazq6aigvyy8mjkr9jpqs8cbmpzsfwdr7yvr5llxg77ds"
+ "commit": "4f9d3104f0d89fe3e39c878d2035e6b6d9510659",
+ "sha256": "094x2n9nlqwxdppkw7wsyxwp34gf0b1dfyxp97nn712mfy98g1fc"
},
"stable": {
"version": [
@@ -18513,15 +18875,15 @@
"repo": "myrkr/dictionary-el",
"unstable": {
"version": [
- 20191111,
- 446
+ 20201001,
+ 1727
],
"deps": [
"connection",
"link"
],
- "commit": "c9cad101100975e88873636bfd426b7a19304ebd",
- "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi"
+ "commit": "bdf0aa7761d1c1a3bc0652b2fdc4a54b3acdb06a",
+ "sha256": "1vm9m36ab7hs58xqzr4g8lp2s78qzlcsy57f8yajrhibwfh5jrs6"
},
"stable": {
"version": [
@@ -18544,11 +18906,11 @@
"repo": "kisaragi-hiu/didyoumean.el",
"unstable": {
"version": [
- 20191020,
- 531
+ 20200905,
+ 1843
],
- "commit": "4a6049f2de36801e0a50e93b17a375501f16cf28",
- "sha256": "0plwn23h96m71vx0jxilnl6nj7lsq4mpjv8mjaiankrxhvjcv6f0"
+ "commit": "ce5edcce160b86e7f6480f0381be785d43f97e19",
+ "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s"
},
"stable": {
"version": [
@@ -18568,11 +18930,11 @@
"repo": "ideasman42/emacs-diff-at-point",
"unstable": {
"version": [
- 20200413,
- 200
+ 20201006,
+ 1436
],
- "commit": "5b06de513297a80cf3a2081b8ee0914e90da810b",
- "sha256": "1ib8297alpsvcxl9c56n2bjh5j4m49k92nz1mgdybiqwg3z4is21"
+ "commit": "940f967bca64a8012892040c2e2f262d8709c41a",
+ "sha256": "1pm4a3jx2aq1cz9s9nfs1zm0s4crqarai3hr6dyihjqyf0szwrvq"
}
},
{
@@ -18583,14 +18945,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20200701,
- 2141
+ 20201201,
+ 1956
],
"deps": [
"cl-lib"
],
- "commit": "2281a89a3ddc6616073da6f190dda08d23b18ba6",
- "sha256": "0lyx0hnc45k2f154p81dyjxrv5r53bwb6nfyhmy5avmp9cqdjd4d"
+ "commit": "c31af59cce04fdcf9d05da54a43d236a4869c251",
+ "sha256": "191vqwnalbynpj0r1v5v7qd35dih8k99kvm2gvpgpv5kg28gq3hm"
},
"stable": {
"version": [
@@ -18685,20 +19047,20 @@
"repo": "retroj/digistar-mode",
"unstable": {
"version": [
- 20200819,
- 1316
+ 20200827,
+ 9
],
- "commit": "7f89372f27eff9e4db55bcf39f9cce3693d95bb2",
- "sha256": "0s9q9f9bqr4w9ll0im65h95hxki3svanlikwxgq6m7p493s1q5j0"
+ "commit": "f46d58ea690c7c9ff9aca19441dff23284bab7cf",
+ "sha256": "0x29502mn9cpbsfiqsdaa90j2566zfai5lbv2c49w5wxxm904b7j"
},
"stable": {
"version": [
0,
9,
- 0
+ 1
],
- "commit": "343de0e0fe408f422a32e1bda22cafc2cc9900bb",
- "sha256": "1cg38x7zd1n9zqsyg47famss91nqs7giqpgsi5qy10zp8y3i3l2c"
+ "commit": "f46d58ea690c7c9ff9aca19441dff23284bab7cf",
+ "sha256": "0x29502mn9cpbsfiqsdaa90j2566zfai5lbv2c49w5wxxm904b7j"
}
},
{
@@ -18834,20 +19196,20 @@
"repo": "jcs-elpa/diminish-buffer",
"unstable": {
"version": [
- 20200712,
- 1355
+ 20201206,
+ 1238
],
- "commit": "2ef1e03458b9528a737814546aaee66067db649e",
- "sha256": "0xlbgxl44iyffpg5r7md3a3l1b7gdj1vsfajww8g3rsna7d7n2wp"
+ "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f",
+ "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8"
},
"stable": {
"version": [
0,
- 0,
- 7
+ 1,
+ 1
],
- "commit": "cef452767c16c564dabc819b234fd3236fa97a51",
- "sha256": "1hz3b44pbsy6ybicjs6i1fm2lai1ccxk46dk6fyd5bcb66s2lxzy"
+ "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f",
+ "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8"
}
},
{
@@ -18858,11 +19220,11 @@
"repo": "gonewest818/dimmer.el",
"unstable": {
"version": [
- 20200509,
- 1718
+ 20201203,
+ 545
],
- "commit": "4abe51533a972910f9012029a47b533878ec682e",
- "sha256": "023lrm9s8rdq41d19nlizq2s1d2317s4qlc83m4g6ymw54m61z2m"
+ "commit": "360e413f06d0da968af7cbb2a25d97a24765818f",
+ "sha256": "0fbr5s8zf5na8zsm5vq2ahkyr37azslnssa102mhkf67077lpy4n"
},
"stable": {
"version": [
@@ -18914,6 +19276,24 @@
"sha256": "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"
}
},
+ {
+ "ename": "dir-treeview",
+ "commit": "763f2c1d932d6f415fb2e0be0ef514406fa74151",
+ "sha256": "1kbmmp2ljczgg7kf4df44lmday4nnmqb62algnm1v35g8gcd9q75",
+ "fetcher": "github",
+ "repo": "tilmanrassy/emacs-dir-treeview",
+ "unstable": {
+ "version": [
+ 20201003,
+ 2206
+ ],
+ "deps": [
+ "treeview"
+ ],
+ "commit": "1f88a9ddda0b431c79564f91d470e8e308ed3c32",
+ "sha256": "1pxkxlpbbm4si5z8gx7lbqaw2qvf6h3qc1qxsp6s47h10nrpi9kk"
+ }
+ },
{
"ename": "dircmp",
"commit": "b146db5977003cb48bc37317f3df19b8a8c7fc30",
@@ -18968,8 +19348,8 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -18988,8 +19368,8 @@
"dired-hacks-utils",
"f"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19115,8 +19495,8 @@
"dired-hacks-utils",
"f"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19148,14 +19528,14 @@
"repo": "Fuco1/dired-hacks",
"unstable": {
"version": [
- 20190522,
- 950
+ 20201005,
+ 2318
],
"deps": [
"dash"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19239,8 +19619,8 @@
20200322,
2035
],
- "commit": "1f90cf6ac932ad30ccfefec27ea7e514c24ab335",
- "sha256": "1bmpn18z42i8dy331yrks5gsivpvwj677yc58iw66ckjnyjnyjps"
+ "commit": "0ddf0adb3a642c2f0694d8c1c12f263f2bf27375",
+ "sha256": "1gpbjq9c2z96mclmyqk8mxg9blya3q9mybbpxm9qhz2k9khw9k2y"
},
"stable": {
"version": [
@@ -19305,8 +19685,8 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19324,8 +19704,8 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19366,25 +19746,26 @@
"repo": "xuhdev/dired-quick-sort",
"unstable": {
"version": [
- 20161208,
- 2112
+ 20201128,
+ 116
],
"deps": [
"hydra"
],
- "commit": "1845f978d313f750a5b70b832457ed803c4ffbdb",
- "sha256": "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"
+ "commit": "9741bae65b5ca077a81589dcc6b3ca3c12f0f76f",
+ "sha256": "14chkh5zqrjs574jml8sq3d4xhq0fclbzifcnpph080vxspxr2xn"
},
"stable": {
"version": [
0,
+ 1,
1
],
"deps": [
"hydra"
],
- "commit": "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469",
- "sha256": "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a"
+ "commit": "868311eec176d9cc254730b305c1cab9ede82547",
+ "sha256": "0jngm5zrmbm2w45sq1kxf0bimkmrwxc2biyb5bx7422mqkcsg2fh"
}
},
{
@@ -19402,8 +19783,8 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19421,31 +19802,31 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
"ename": "dired-recent",
- "commit": "35763febad20f29320d459394f810668db6c3353",
- "sha256": "1qvw7m6wzahc0xmf37cyl9lv1k9442j0kkzx6dl6f0wclw0v6hgs",
+ "commit": "a1cdb922b8cd2f3b50f833d8f3e69a788ed5675b",
+ "sha256": "1hspi9bazbij9h05qaljgn5035p409w28mzvmrl4j6isx306s61l",
"fetcher": "github",
- "repo": "Vifon/dired-recent.el",
+ "repo": "vifon/dired-recent.el",
"unstable": {
"version": [
- 20200712,
- 716
+ 20201004,
+ 2201
],
- "commit": "860e70b15983ac7164648de8148a529bdcdb8833",
- "sha256": "1558cdinig8kx2hx2hkl3zxk001ijx53n5rjdm3367wllp0icyzf"
+ "commit": "d62ace45cc72d49d77862ecf00f52d794ecc5677",
+ "sha256": "0yg1jsixx6vmhdpg5qw9hag40bgjplg76qwr5j14j0sq6zqzbpjb"
}
},
{
"ename": "dired-rifle",
- "commit": "35763febad20f29320d459394f810668db6c3353",
- "sha256": "1x6i68i7f1c3k0w3w4zph16s046ccajyb2641fx0j8dl5367qgbc",
+ "commit": "2630f2e4ae1544db9408ad3adf23fe5b33bf7792",
+ "sha256": "0s980i6sr08rlyz3i49lm783qv7a9mm4r065138xdbwnc8fq4cr8",
"fetcher": "github",
- "repo": "Vifon/dired-rifle.el",
+ "repo": "vifon/dired-rifle.el",
"unstable": {
"version": [
20200308,
@@ -19486,15 +19867,15 @@
"repo": "stsquad/dired-rsync",
"unstable": {
"version": [
- 20200308,
- 1150
+ 20201126,
+ 1319
],
"deps": [
"dash",
"s"
],
- "commit": "bfd5c155be1cb6b71c83e5f41116c81b6532b6d5",
- "sha256": "096lqsq4bh5fgxhfscvmscd5v8d4ji88wks2chi92h9v85sha3b6"
+ "commit": "fe5988154c843c70d080ae8a822f27ed83983d01",
+ "sha256": "1i2qsdbhmsrdx49lqn0fk69sk85ysdpa8c90gfz78vby4fjlb240"
},
"stable": {
"version": [
@@ -19547,11 +19928,11 @@
"repo": "crocket/dired-single",
"unstable": {
"version": [
- 20200303,
- 1144
+ 20200824,
+ 708
],
- "commit": "90ade369ba478fdebf61957f837c0b10cef128b1",
- "sha256": "08qm8s77kfx9yfhm10vivhq15jrndvd29azkv4y1wd9qsrh5ylk0"
+ "commit": "98c2102429fcac6fbfdba9198c126eb1b3dcc4e5",
+ "sha256": "1adh8sr7g2xc6b7is1cz48v109iavr2krkp5nd23bkgnjsjjkxlm"
},
"stable": {
"version": [
@@ -19578,8 +19959,8 @@
"dash",
"dired-hacks-utils"
],
- "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46",
- "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
+ "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e",
+ "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f"
}
},
{
@@ -19593,8 +19974,8 @@
20190616,
303
],
- "commit": "b694ba91a45d0762bd032ff1bb4109e4c62ca686",
- "sha256": "0kcyd6a3c46dz54c2h74bxm62c0shl85rgi1dhy9gmjshlmwn24k"
+ "commit": "7fe5fe35c63d1b0da14d6d6d52bdf6b2a5410ba7",
+ "sha256": "0hdm6gn9r2crzpjd09v14cd8hrnshv9qwhqpi9nsm6rnijsfvq8y"
},
"stable": {
"version": [
@@ -20542,15 +20923,15 @@
"repo": "meqif/docker-compose-mode",
"unstable": {
"version": [
- 20200730,
- 1258
+ 20200830,
+ 1336
],
"deps": [
"dash",
"yaml-mode"
],
- "commit": "4c0c897fb0572e6b026b2a5ab9f2c76174be7a14",
- "sha256": "01fj856511qjn5zw370axyz4imdnq3j5sqvbm8nkd71z1mz3dyv1"
+ "commit": "abaa4f3aeb5c62d7d16e186dd7d77f4e846e126a",
+ "sha256": "123msjiw5jsgmb5r1vmp3h2m4qia2pjg9wrb9cjhi3fjlspk9x2d"
},
"stable": {
"version": [
@@ -20603,22 +20984,60 @@
"repo": "spotify/dockerfile-mode",
"unstable": {
"version": [
- 20200106,
- 2126
+ 20201208,
+ 1348
+ ],
+ "commit": "6a56c1cc1713b501040b08fdbf0c4159a4fe95f9",
+ "sha256": "0l5pj85xpywfl2sgd4rgpvlxphc9alhhwi7ls0pa8wh2nry7ri5b"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 3
],
"deps": [
"s"
],
"commit": "d31f7685ebc5832d957e25070a930aa42984327d",
"sha256": "1br73dsls42fn4rwagljkpa3l4wwj6f7jxfn3gmgl6c54z81av3v"
+ }
+ },
+ {
+ "ename": "docopt",
+ "commit": "077d431eb8c441fab775156a34622b0491c3af5a",
+ "sha256": "0qcjgxlilzpx15wsqp0186b3818hhv467c5g9sz6yn6w58fg9632",
+ "fetcher": "github",
+ "repo": "r0man/docopt.el",
+ "unstable": {
+ "version": [
+ 20201121,
+ 1523
+ ],
+ "deps": [
+ "dash",
+ "f",
+ "parsec",
+ "s",
+ "transient"
+ ],
+ "commit": "8a0e1777777d6ef7d144f1150b06ede9d9950220",
+ "sha256": "1m77nix3kwghwpbl5ins677f6qaxaczzg2k22ana3nsib8lvdkra"
},
"stable": {
"version": [
+ 0,
1,
- 2
+ 0
],
- "commit": "9a75fcd119c5b2a1d723d440bbe4b1db56df90cc",
- "sha256": "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2"
+ "deps": [
+ "dash",
+ "f",
+ "parsec",
+ "s",
+ "transient"
+ ],
+ "commit": "9546e43acc2c3193a58820a89814f1c580f0cb27",
+ "sha256": "0s4q1zk4aqz76392c030c4bs28nbngw1rw3mygrk3cqaqykg7mq4"
}
},
{
@@ -20629,11 +21048,11 @@
"repo": "progfolio/doct",
"unstable": {
"version": [
- 20200815,
- 2139
+ 20200917,
+ 1712
],
- "commit": "89eb2e6f1c2630c980bdf4c0430ba54722c9ee00",
- "sha256": "0210jwk19b59hx7gi2ddy5ja9jndvmwmip8bh16g35qiscn2jwml"
+ "commit": "dabb30ebea866ef225b81561c8265d740b1e81c3",
+ "sha256": "0pbalf1a9jrfwb6h1zw3bxz16qn1md10w030hbcbm0dblafchz0y"
}
},
{
@@ -20748,16 +21167,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20200819,
- 117
+ 20201128,
+ 1659
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "ffbaaee832f1c97ff608bc4959b408997d959b7d",
- "sha256": "0gvdlwa4w7s1igy8hqapng2s1k9ca6f76g68m5wzrfnx1z0zf7xl"
+ "commit": "fb34eb5eb60f41ce1bc23c2bad6ac20de5669f22",
+ "sha256": "0swyhkzlz1znwddl0jzgxs7xyxz9shji5bnh91p5d5rq74j35f0k"
},
"stable": {
"version": [
@@ -20782,14 +21201,14 @@
"repo": "hlissner/emacs-doom-themes",
"unstable": {
"version": [
- 20200816,
- 2044
+ 20201121,
+ 2040
],
"deps": [
"cl-lib"
],
- "commit": "24023de3c80c9f3afc3d012762d1ef0f8dbd326e",
- "sha256": "0dwwpdwi0722xyap3xnm7034syb2fssfm4c6k5868k0344rvdkr8"
+ "commit": "74ebd778571a2ba2a490d45a3f4161ea7251e050",
+ "sha256": "0wj7ysyyv2ycjiibyd8gda24g2zj1p51sh4ani9r13bs0idnq910"
},
"stable": {
"version": [
@@ -20986,8 +21405,8 @@
"deps": [
"debian-el"
],
- "commit": "aafb047e03c642e6ae4740a7fbc0a789e0ec1291",
- "sha256": "1sfan4pil51jrc0b6fxf5vjyrif0dx1xmx92yhgwap684kpsarv4"
+ "commit": "0f2a8257788a2f99e87326e52402f69e3f534903",
+ "sha256": "1hkabhnbiwygcx3blv3hc819m3bckkcngsf280pfg2y1xmd9n7b2"
},
"stable": {
"version": [
@@ -21033,11 +21452,11 @@
"repo": "dracula/emacs",
"unstable": {
"version": [
- 20200814,
- 1717
+ 20201120,
+ 758
],
- "commit": "3b7c2905d249f47bc9c09d304c16f72f217df2e0",
- "sha256": "031c2md9zxk8bhb8v6s6i5s3qmlfxf5ks0nl7n6kyw1w31h6pww9"
+ "commit": "18e8aa5ed78d10b372414b7def917337224bf2f5",
+ "sha256": "0fw3qar6dwcq5ahf9ca2glshka1ddb4im21hfy069sbdaxdajj4d"
},
"stable": {
"version": [
@@ -21182,8 +21601,8 @@
"deps": [
"php-mode"
],
- "commit": "ee1a24c96a7487bb9df8dd15656be7d8330028f0",
- "sha256": "1h0p1z0s02vn7b4p2kj6jr49y245wjf5grcv0n5riqds2s863q2v"
+ "commit": "4f3cffa76d8359449bf0e960f884320130f24b85",
+ "sha256": "1fdhlb25w0ig7cg51w58h63zy416fwbcbvm63zr4s9gbzsdidmjs"
},
"stable": {
"version": [
@@ -21245,8 +21664,8 @@
"repo": "dtk01/dtk",
"unstable": {
"version": [
- 20200816,
- 2055
+ 20201006,
+ 1835
],
"deps": [
"cl-lib",
@@ -21254,8 +21673,8 @@
"s",
"seq"
],
- "commit": "a0e789919f71ff4ab752432fe9e295f9f44c7b12",
- "sha256": "029xsdasbrvkg8w2ykgy6iq618cdjkr4gkp4l094na35jpv96yca"
+ "commit": "282ad6f8eb21b5812521bd9e31d2323b8b9bd9cb",
+ "sha256": "0yy1jfdh3k0fj7mrl66g6ljp6q77b9xh4xywi80021a15vv1va57"
}
},
{
@@ -21281,19 +21700,19 @@
"repo": "jscheid/dtrt-indent",
"unstable": {
"version": [
- 20200430,
- 1023
+ 20201208,
+ 1925
],
- "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407",
- "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly"
+ "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d",
+ "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm"
},
"stable": {
"version": [
1,
- 2
+ 3
],
- "commit": "50c440c80e0d15303d8ab543bce4c56e9c2bf407",
- "sha256": "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly"
+ "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d",
+ "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm"
}
},
{
@@ -21363,16 +21782,16 @@
"repo": "jacktasia/dumb-jump",
"unstable": {
"version": [
- 20200815,
- 1537
+ 20201205,
+ 1625
],
"deps": [
"dash",
"popup",
"s"
],
- "commit": "0d74b2f2aa834b602e91d99e9cb23197a389f042",
- "sha256": "01jwyridywbihspan8zrrfpxl4gl275z8l23swhczg0bcjq1x8g8"
+ "commit": "ff9fc9360d39f5e07c1f480f8b0656b49606781b",
+ "sha256": "13anm4wrm7v5x9wsv5h0bxsvr36h228afqp0zxyv008xghqmzwbv"
},
"stable": {
"version": [
@@ -21416,17 +21835,17 @@
20191016,
1241
],
- "commit": "26078df94ea16e2fc9221a84c5d42f2fe024074b",
- "sha256": "1pvqrijx5bmnbvwk4pz6j1ldir5zi95ixbfrqki284qcgq28krd1"
+ "commit": "08d27d547f09d86cf5d7230f8a5cbe027708f979",
+ "sha256": "0h43hcx447vp811jxdgan0b3cz21pzc1azhd47srmyca5jsfpklq"
},
"stable": {
"version": [
2,
7,
- 0
+ 1
],
- "commit": "85b4e16bd6c310811fcc206d3d0cbb391eb8b81c",
- "sha256": "19fn7ywx13j1hc600pccyghz2izjy26bzwaqjynn7swlbkc96ymz"
+ "commit": "5472766b2448308a7160dfd0fca1ec711e124a5c",
+ "sha256": "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in"
}
},
{
@@ -21459,6 +21878,30 @@
"sha256": "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n"
}
},
+ {
+ "ename": "dw",
+ "commit": "0a61e1436292645a77b6889cecbf4f390155d712",
+ "sha256": "1f3i21wp7gmgckrrnh2yx1949wvapkw6dyrm6l8kx1899s2awqr5",
+ "fetcher": "github",
+ "repo": "integral-dw/dw-passphrase-generator",
+ "unstable": {
+ "version": [
+ 20201006,
+ 1927
+ ],
+ "commit": "9c989595536775b380d46f28452c136070b8e4ab",
+ "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "9c989595536775b380d46f28452c136070b8e4ab",
+ "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax"
+ }
+ },
{
"ename": "dyalog-mode",
"commit": "1a8f86df54f1243fea71e1e73ed0b9fb049032bd",
@@ -21467,14 +21910,14 @@
"repo": "harsman/dyalog-mode",
"unstable": {
"version": [
- 20200817,
- 737
+ 20200822,
+ 1536
],
"deps": [
"cl-lib"
],
- "commit": "5d703d91f90ddebdfb4cae1b45c476aec5976313",
- "sha256": "1vf88vywb4cjfndc4jd185fdqjydd7ckbf1n2qsi9w3k8940q2pq"
+ "commit": "f42e49b9dd7ab41f08361185cc25509f19b949a8",
+ "sha256": "1cqaa12pycwiv4cj100n8326f3yg59xgww3lk2l6x7841n7g7szm"
}
},
{
@@ -21534,11 +21977,11 @@
"repo": "zellerin/dynamic-graphs",
"unstable": {
"version": [
- 20200818,
- 442
+ 20200902,
+ 1238
],
- "commit": "10dffcbc4011647c16e8d65d05856e043de1865d",
- "sha256": "08f3f4bwryyhvj8yp2y2v3fppl6drd4rq3wyx48mxwkiw6z1db4r"
+ "commit": "ba3fdf2cf0e5e1e952a1961a03dfb7f61a4ab0e7",
+ "sha256": "0cyngkba93swhgklh88r5czlvimc0pa9blg02cwz3mjwj5r558bl"
}
},
{
@@ -21831,26 +22274,20 @@
"repo": "redguardtoo/eacl",
"unstable": {
"version": [
- 20200612,
- 736
+ 20201112,
+ 820
],
- "deps": [
- "ivy"
- ],
- "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4",
- "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k"
+ "commit": "5f3cfac22a7e2508be47079860ab573f397c3cfa",
+ "sha256": "1p7x7wvzc1sragxpb7b6qnb9fv193mm3ydwf1kwi6rgnz29zql58"
},
"stable": {
"version": [
2,
0,
- 3
+ 4
],
- "deps": [
- "ivy"
- ],
- "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4",
- "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k"
+ "commit": "85a76fa17ebd304392ec9b1dd87d223fdd8fa09f",
+ "sha256": "0fxb2lv4cqdjxarqhzjgfc43sncc1c6m96n0aflm8l4gdmm090kq"
}
},
{
@@ -21891,28 +22328,28 @@
"repo": "masasam/emacs-easy-hugo",
"unstable": {
"version": [
- 20200811,
- 842
+ 20201205,
+ 1908
],
"deps": [
"popup",
"request"
],
- "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2",
- "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b"
+ "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb",
+ "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95"
},
"stable": {
"version": [
3,
9,
- 47
+ 50
],
"deps": [
"popup",
"request"
],
- "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2",
- "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b"
+ "commit": "eacc00637380fbd9a2cc95821e91969ab75e76eb",
+ "sha256": "12vlkbi15c54wpy0ak5mq89x354f86qk1y9g413bacafg5hxnn95"
}
},
{
@@ -21923,26 +22360,26 @@
"repo": "masasam/emacs-easy-jekyll",
"unstable": {
"version": [
- 20200811,
- 859
+ 20201205,
+ 1918
],
"deps": [
"request"
],
- "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34",
- "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5"
+ "commit": "b79176c6c4a8d5914e2c6e2bb53f61633ff5e023",
+ "sha256": "18ywyq9k05a16b6k1492czp19gya1y5ngqmzfqgbzdm1xl9icxxz"
},
"stable": {
"version": [
2,
4,
- 27
+ 30
],
"deps": [
"request"
],
- "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34",
- "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5"
+ "commit": "b79176c6c4a8d5914e2c6e2bb53f61633ff5e023",
+ "sha256": "18ywyq9k05a16b6k1492czp19gya1y5ngqmzfqgbzdm1xl9icxxz"
}
},
{
@@ -22070,26 +22507,26 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20200628,
- 2157
+ 20201203,
+ 927
],
"deps": [
"parsebib"
],
- "commit": "805c2e30e30f9f211f4aa443263d1c3971935295",
- "sha256": "0kgw049wph40kk0kin7zxj44ghd1s1pr8zpl1gli4zic02vzcaga"
+ "commit": "1274cba384a798faab6f6e1f20d349bbf3d48f94",
+ "sha256": "18ba50j42l4w33i3mbdy4d1izn724pa00zbyrcqd9hrhdma7hnhw"
},
"stable": {
"version": [
2,
- 25,
- 1
+ 27,
+ 2
],
"deps": [
"parsebib"
],
- "commit": "bd258c1f364a8c96b0026fdc3de75117ca4e324a",
- "sha256": "1mvsa2a761va74ybxprdvmhkzhjl6axn1ngjfhrrljqgsvqgyjwk"
+ "commit": "f6411b41bd612a3747816c40c933c28402dd0b03",
+ "sha256": "194pzhi8kylawsnc0p02nds9vk7ghw88s1dvd355b7m2vp92cnlf"
}
},
{
@@ -22184,8 +22621,8 @@
"repo": "ecukes/ecukes",
"unstable": {
"version": [
- 20190822,
- 2127
+ 20201010,
+ 1529
],
"deps": [
"ansi",
@@ -22195,8 +22632,8 @@
"f",
"s"
],
- "commit": "d835ce619a8f0057a133c08060af4b026e1c9359",
- "sha256": "1iqrb6lmvmsfk1g6hcc304b091nv3x7f5pv7zpn87kvvw7xw6lqg"
+ "commit": "f13723e0d7c2abbcb7a870091201ec80103bf202",
+ "sha256": "187zbmk1k14y7lwnbgycsk7g42c55bmp8vmyrvwylkz2lq65n0b2"
},
"stable": {
"version": [
@@ -22544,14 +22981,14 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20200730,
- 1329
+ 20201122,
+ 1542
],
"deps": [
"cl-lib"
],
- "commit": "9bc1343ce8bd2cc84bf04b58a053b7ec700244c0",
- "sha256": "10zaxq356fq6y4h1g9gxj8sja4k4g5z9g2xggw0yy4dbx1mmw7n1"
+ "commit": "da844718bfe1ca51919c63fdffedaba5d0cc1bba",
+ "sha256": "05ydgbc6dmrs3qfahcg8lmrfm74f5ij9yxn9nm1c3r5zxf759ajy"
},
"stable": {
"version": [
@@ -22663,8 +23100,8 @@
"cl-lib",
"peg"
],
- "commit": "be9e32d1b49e35247b263b0243df7cfdc8d413ab",
- "sha256": "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l"
+ "commit": "21e120a6914ee9a694be0a051f9f2af34ef055e4",
+ "sha256": "1hyv29b10iqa7msnmf6w47fj1zbbh678x76d1m59mcbfgbxzxagz"
},
"stable": {
"version": [
@@ -22682,6 +23119,21 @@
"sha256": "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd"
}
},
+ {
+ "ename": "ednc",
+ "commit": "f1b96c967e3e54dfcc4ffdb7d242abc578b63a12",
+ "sha256": "0v70n0m641yq89r2bq3xabrlpd0z0106njxyk8aszdbx1294ssrb",
+ "fetcher": "github",
+ "repo": "sinic/ednc",
+ "unstable": {
+ "version": [
+ 20201122,
+ 25
+ ],
+ "commit": "84c49302e9d6d5f9b2b110e61a7a1774d79f111f",
+ "sha256": "12dqavx3d665drwsdzh2g81xzf5iaa4i76d2q37yihb1xx7ibk3q"
+ }
+ },
{
"ename": "edts",
"commit": "92b0d3a2af833e0f11e6a935d54eba5e3879d690",
@@ -22690,8 +23142,8 @@
"repo": "sebastiw/edts",
"unstable": {
"version": [
- 20200710,
- 1424
+ 20201110,
+ 1827
],
"deps": [
"auto-complete",
@@ -22702,8 +23154,8 @@
"popup",
"s"
],
- "commit": "eda93f89c198db6aa3590d8e812ed797c9b3e305",
- "sha256": "0vpvil86j6ahfq9f123ampba93h7pgnlvg14y9a9fpwig1hvqm60"
+ "commit": "648e8ac632bee8eaa92fc4e09a674ae453bae0a9",
+ "sha256": "1z7abw4s3k8ynx9i25blp0i51is0wdpsipx79l4wkpazhpsx8gb6"
},
"stable": {
"version": [
@@ -22866,17 +23318,17 @@
20200107,
2333
],
- "commit": "54b0f51a103e4c12515cd814e3bc6be67c3da966",
- "sha256": "1yvf4qns69smcg6vbb6l25g8dnai5da827qpd8f6pg3qp8w1q5wc"
+ "commit": "fc939c84a0ca6e8de844edfdcc0aacdfde577c66",
+ "sha256": "1r10ivaifxp4200vpmayjrnqanz9sp4bykknj5n2rsx078fsbb90"
},
"stable": {
"version": [
4,
- 0,
- 3
+ 1,
+ 2
],
- "commit": "64665dba315f5b70b3ce2045a42f6059d7b858de",
- "sha256": "0z41p0aqz4bqvx885vy7hqny8ni8q2nrk7bhwazwymnhnzq52bjp"
+ "commit": "87db16156ded2b39c87383f2fe6e1ee5e8e8757e",
+ "sha256": "0227p1qg0qgnbcpxiv58b2bp9iwckvfw8a6c1bm7z5r91a9xjgxg"
}
},
{
@@ -22887,8 +23339,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20200816,
- 1810
+ 20201103,
+ 1026
],
"deps": [
"eldoc",
@@ -22897,8 +23349,8 @@
"project",
"xref"
],
- "commit": "5f873d288e1c5434c1640bef03555ed056cb0d35",
- "sha256": "1rdfrw6qcbkl7bnjsfrzz6ndbr6lk0s4ldyqwv48k1nvlk9jc796"
+ "commit": "21726416e6e580b20dfa90833c6dab2a8a15ea48",
+ "sha256": "1al1a7np6127xw4ksqcwpm20v635pb83vfx8mr06wyzdbgls0plb"
},
"stable": {
"version": [
@@ -22969,10 +23421,10 @@
},
{
"ename": "eide",
- "commit": "1dd52b48fbac25ee2873645d87a1238351a6ff74",
- "sha256": "1akmb48rpq05mmb022yh0qnjlbs1wx5x6f1gk2kw5fb5g45swb0c",
+ "commit": "4b0915b90f1e0832b5920bee860723473acae4dd",
+ "sha256": "0ir02p1qrkxsh6b2v2aagkxzzzbd8hysxhr5zpbp11gv6sw4harj",
"fetcher": "git",
- "url": "https://forge.tedomum.net/eide/eide.git",
+ "url": "https://forge.tedomum.net/hjuvi/eide.git",
"unstable": {
"version": [
20200702,
@@ -23014,21 +23466,20 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20200812,
- 230
+ 20201128,
+ 2101
],
"deps": [
"anaphora",
"dash",
"deferred",
- "exec-path-from-shell",
"polymode",
"request",
"websocket",
"with-editor"
],
- "commit": "99a4718f50538a439a2a3f2011d1aa97246e259b",
- "sha256": "0qi012pbyj1zdj7h0y3r26ijf80046827ln079v1q9hgkz9ipaam"
+ "commit": "a019ee3994585e4ed4700d2591d693fda3232616",
+ "sha256": "0lks1pzp1rsb9xrf7fpfb6svzhrqzfmcahzij7psi02kxkq8zjyd"
},
"stable": {
"version": [
@@ -23102,8 +23553,8 @@
"repo": "kostafey/ejc-sql",
"unstable": {
"version": [
- 20200809,
- 1221
+ 20201129,
+ 2043
],
"deps": [
"clomacs",
@@ -23111,8 +23562,8 @@
"direx",
"spinner"
],
- "commit": "c99825ce67c142b38a8d3edec444593e29d48b44",
- "sha256": "0fwkaz5cacfmgchl0xyb82bqc20fbvl1kk14m5mvydhjqaam7r45"
+ "commit": "6eecf51e4c5e6f7d24ab90e8def34f6cea4eda52",
+ "sha256": "0yk5bblrzf0bvnkzdkb0bzk8mfp4b6j84cjg60k3i4dyyp17h847"
},
"stable": {
"version": [
@@ -23179,8 +23630,8 @@
20180422,
243
],
- "commit": "4917f486a7be7482dedfea0a7ac3d01cab4ce21c",
- "sha256": "19ap5l2i0ydkl2whzy44rxc8cgjgrrwi4w7i429ga3pjkac9170g"
+ "commit": "39738c88c01a3a035edffe63400d434edb1e3003",
+ "sha256": "1p29h1ab9iciray6yzg120vw8zi9zx3lsms120szhqdn1chaldcg"
}
},
{
@@ -23191,11 +23642,11 @@
"repo": "dimitri/el-get",
"unstable": {
"version": [
- 20181006,
- 225
+ 20200912,
+ 1653
],
- "commit": "3b5e48ba4a4dca5c91610e2eb607a8bbb725a6ab",
- "sha256": "1kx0c3wgij66hhryb9ggf8c975406vb9a9m6z4yrsrrisyc2ljgk"
+ "commit": "6138ce5b0a9df779e33ef42eadc4c15a5cf65f39",
+ "sha256": "19qfpv0f0xhj04f572a20a0yd7qqhrivxjx9mfp15g43pgdp9ajz"
},
"stable": {
"version": [
@@ -23221,8 +23672,8 @@
"anaphora",
"cl-lib"
],
- "commit": "747acd434aa6f50a599efe5f6e96dea2dfed79d6",
- "sha256": "0nyllimsrghwd1vkmal1c58g1nx4djyvjfmylhqidx4h79gkryxm"
+ "commit": "7538e1511ff7ceea2ba65ed4783c57e2f9176ee6",
+ "sha256": "1x71qqw6bq86cpfldz3jgchpm93200z8xcq8vwryyg3ynz681b0a"
},
"stable": {
"version": [
@@ -23311,8 +23762,8 @@
20200716,
1428
],
- "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c",
- "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0"
+ "commit": "a47067b4d63f3674d284a772bfe773021540c043",
+ "sha256": "17gpysk41qf40xa4vab79d3dmi7l3xay5gb27wn7fmj9nrzbm4sm"
},
"stable": {
"version": [
@@ -23347,11 +23798,11 @@
"repo": "vedang/el-spice",
"unstable": {
"version": [
- 20180128,
- 1721
+ 20201013,
+ 1729
],
- "commit": "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c",
- "sha256": "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8"
+ "commit": "a1adde201ee10881b522e67aa2c605378943a28d",
+ "sha256": "1yify5hv7frvvvwhkq38svj2zws7s50df6vh6qpd3xkgm2imm9fd"
},
"stable": {
"version": [
@@ -23497,8 +23948,8 @@
"repo": "rollacaster/elcontext",
"unstable": {
"version": [
- 20180526,
- 1304
+ 20201129,
+ 1203
],
"deps": [
"f",
@@ -23507,8 +23958,8 @@
"osx-location",
"uuidgen"
],
- "commit": "f434ffc655e6349a4dd52285ff68a9194bcfc949",
- "sha256": "0gbbnx969asq73ypc5lp4qpi4iwwfzm1mmxb1fdifl2lf18p8qwv"
+ "commit": "077d36928993950c01bcdb92102a3d3c18d06bac",
+ "sha256": "1hj3m3y2an0axwkk75af2bd68sqcqf4j0l8dm6392xy4yipz5cj9"
}
},
{
@@ -23534,29 +23985,30 @@
"repo": "DamienCassou/elcouch",
"unstable": {
"version": [
- 20190820,
- 1641
+ 20201108,
+ 955
],
"deps": [
"json-mode",
"libelcouch",
"navigel"
],
- "commit": "8e1b7ddec91ae863c3951776a0fcbfead8ca7a80",
- "sha256": "07psfjynphzpm5jgajf31cigs5jyj8qnq491xrk88jvxm63sq55c"
+ "commit": "3d162dda14411349e12509029d2b621c5d1edea2",
+ "sha256": "0laq0qwlp1172yirvcyxsrmgqj8mjs4rfavjy4apiyxvv7131mss"
},
"stable": {
"version": [
0,
- 3,
+ 11,
0
],
"deps": [
"json-mode",
- "libelcouch"
+ "libelcouch",
+ "navigel"
],
- "commit": "d22e8cab9328966b2e2d5bc4fc17a4abbb222736",
- "sha256": "0l9ah3ijlidjshwkazfcdasm3hmigw8dcyqgi9pmpv0kw9096y64"
+ "commit": "3d162dda14411349e12509029d2b621c5d1edea2",
+ "sha256": "0laq0qwlp1172yirvcyxsrmgqj8mjs4rfavjy4apiyxvv7131mss"
}
},
{
@@ -23567,20 +24019,20 @@
"repo": "doublep/eldev",
"unstable": {
"version": [
- 20200815,
- 2332
+ 20201125,
+ 1919
],
- "commit": "ae353301c15b15930b0a83807275ed58a3be82e6",
- "sha256": "0l1ac2ll2127wn6nlrpvxzk38xb74rb8bmp6c5sjh79hnjr04zh5"
+ "commit": "aa4360bcd72ca64913b2bad0056b0521d7e125ab",
+ "sha256": "1mmplyqi6krjgrrlh905pxvjz32d2vdkd3lkz00j82bjgxfxis7f"
},
"stable": {
"version": [
0,
- 6,
- 1
+ 7,
+ 2
],
- "commit": "8440e797f0dcaf7bf6da2a7573a7b07c4ea9da82",
- "sha256": "16g68lgd5lp3rdskym4xnkvsm6953xgx48yah8zs5fpk4qny212r"
+ "commit": "a25ea7a9f6c15c18457e737ef61a0ff81970c5cc",
+ "sha256": "1xxcxgycn0a03irjcdq2pcb4p1bddhfjspni7lliwpv6zjqgkyhb"
}
},
{
@@ -23630,11 +24082,11 @@
"repo": "thierryvolpiatto/eldoc-eval",
"unstable": {
"version": [
- 20190423,
- 1858
+ 20200902,
+ 1339
],
- "commit": "a67fe3637378dcb6c5f9e140acc8131f0d2346b3",
- "sha256": "0504yyzxp1rk0br6f25395n4aa4w8ixf59vqxxb55a7agxplfpjc"
+ "commit": "f6e639047d9b3695877e63dd3de8f24e704d6d23",
+ "sha256": "0avl9yfprf4q1xpnvhdx0dbcgrf25sln7w7d76jqjmp93cn4idrc"
},
"stable": {
"version": [
@@ -23672,26 +24124,26 @@
"repo": "stan-dev/stan-mode",
"unstable": {
"version": [
- 20200221,
- 2025
+ 20200830,
+ 1032
],
"deps": [
"stan-mode"
],
- "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
- "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
},
"stable": {
"version": [
10,
- 1,
+ 2,
0
],
"deps": [
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
}
},
{
@@ -23717,14 +24169,14 @@
"repo": "davidshepherd7/electric-operator",
"unstable": {
"version": [
- 20200410,
- 928
+ 20201123,
+ 836
],
"deps": [
"dash"
],
- "commit": "f8454905a147045f25ab03da7aa6406e4f20cc64",
- "sha256": "1x087fry0yx5sk9vvgqv1zh7fkpgzvykl14fzns1920sxacgms68"
+ "commit": "677424d2c6b05e0a3b03eb2e5e4bacef141a0a77",
+ "sha256": "0wf452gssmpdmqrpi7zf63vkis48yqv0ha5ic5mr7vwyfpx3qmgb"
},
"stable": {
"version": [
@@ -23802,11 +24254,11 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20200716,
- 1921
+ 20201205,
+ 134
],
- "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d",
- "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v"
+ "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e",
+ "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5"
},
"stable": {
"version": [
@@ -23871,28 +24323,28 @@
"repo": "fasheng/elfeed-protocol",
"unstable": {
"version": [
- 20200526,
- 341
+ 20201013,
+ 751
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5",
- "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb"
+ "commit": "4a59e26216ceb6eb466781f15b6ac770b90437f6",
+ "sha256": "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp"
},
"stable": {
"version": [
0,
- 7,
- 8
+ 8,
+ 0
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5",
- "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb"
+ "commit": "4a59e26216ceb6eb466781f15b6ac770b90437f6",
+ "sha256": "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp"
}
},
{
@@ -23903,28 +24355,26 @@
"repo": "sp1ff/elfeed-score",
"unstable": {
"version": [
- 20200810,
- 1547
+ 20201101,
+ 1835
],
"deps": [
- "cl-lib",
"elfeed"
],
- "commit": "0551993338c5d41386eccd47cc2f1b382a1b29c3",
- "sha256": "0hgdsvi4l9k978kcx8gmbqkdi7q3qj70cg697fqky0cmcpykhcbq"
+ "commit": "2de8fd1f40780282f4c36bc47963f207d2257918",
+ "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z"
},
"stable": {
"version": [
0,
- 4,
- 4
+ 5,
+ 5
],
"deps": [
- "cl-lib",
"elfeed"
],
- "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947",
- "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4"
+ "commit": "2de8fd1f40780282f4c36bc47963f207d2257918",
+ "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z"
}
},
{
@@ -23942,8 +24392,8 @@
"elfeed",
"simple-httpd"
],
- "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d",
- "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v"
+ "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e",
+ "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5"
},
"stable": {
"version": [
@@ -24045,11 +24495,11 @@
"repo": "xuchunyang/elisp-demos",
"unstable": {
"version": [
- 20200606,
- 949
+ 20201128,
+ 1009
],
- "commit": "8c9748134f7c017ae1536dbd0b76434afb52e64d",
- "sha256": "15gyhqnlppsswmmcknc3yfm6p7s2y06r2py656vh5vwhah7pcqxj"
+ "commit": "ed9578dfdbbdd6874d497fc9873ebfe09f869570",
+ "sha256": "1268wk05j0xjqah56x7mwxvkqbaal8nal894imy42ls043ppvqd3"
},
"stable": {
"version": [
@@ -24078,9 +24528,9 @@
},
{
"ename": "elisp-depmap",
- "commit": "8c86ca9b1ad39282f965d36ec2a8df807cc0ebb1",
- "sha256": "08qjrc3vrn18apnb856qd2m0wzza8755fbh8ly9nh58dlbjhkkd7",
- "fetcher": "github",
+ "commit": "2db07414d2d39b2d40a2ae91491032844b82d801",
+ "sha256": "1pd9r1f78nhzpbakjbkvhp43ip6dh3a293dnnk4d4xrm8lfzb9hh",
+ "fetcher": "gitlab",
"repo": "mtekman/elisp-depmap.el",
"unstable": {
"version": [
@@ -24139,8 +24589,8 @@
"dash",
"package-lint"
],
- "commit": "35a3fcc3131c243206fa914b8562cda771eab8c5",
- "sha256": "09ibaq3mjnw3vm1rwrljdcgybxly2fk9gjdim39s9fpgar4ys12p"
+ "commit": "a4de033c260389c0d483f93e715fd3395c6e4145",
+ "sha256": "167b1yfagssqz3p481w7ghi12hsyi5wjv01a85yjc8qihjhar02l"
},
"stable": {
"version": [
@@ -24240,26 +24690,26 @@
"repo": "elixir-editors/emacs-elixir",
"unstable": {
"version": [
- 20200723,
- 1750
+ 20201128,
+ 2057
],
"deps": [
"pkg-info"
],
- "commit": "01b332495d3f44addeb236428041c4ffa0c2ca3b",
- "sha256": "0qzzrvzpzj8vpdm8fw3sagp7bfps28l615hi67vnwp2car9a7f2y"
+ "commit": "b78e7f733be7bf2af35807d759e53b7d52323193",
+ "sha256": "1jrflpfxxxs9kvrf7qm149wp1br7bb2dxx0pyzdgny3zpif4vakh"
},
"stable": {
"version": [
2,
3,
- 1
+ 2
],
"deps": [
"pkg-info"
],
- "commit": "a1f4d60ec555574c945201359d2e32b183c69f4b",
- "sha256": "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg"
+ "commit": "c548a84e69787bcd04e0821351009c4448c96cac",
+ "sha256": "0f2a360h8bizvqk6bmgxm59g8n7id5rzwlbv6d383h15w298mcga"
}
},
{
@@ -24388,15 +24838,15 @@
"repo": "Silex/elmacro",
"unstable": {
"version": [
- 20191208,
- 1057
+ 20200905,
+ 2130
],
"deps": [
"dash",
"s"
],
- "commit": "ba4086ef241dadfc2b1ce1bcfa56e12dbb89ef58",
- "sha256": "0q29h3y6q1xkz2jx9bvrk8nvmisv1di2l79yc3zrw5k4hirq8j2a"
+ "commit": "4888d1baa8b943adf0bab94419357c55b7e6e697",
+ "sha256": "0g1iavy7f0n14c34b808kv5sf3imvc9aqv5814r231i6qjck5vj4"
},
"stable": {
"version": [
@@ -24438,6 +24888,30 @@
"sha256": "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3"
}
},
+ {
+ "ename": "elmpd",
+ "commit": "32b6fcf73b083eec2332c547ab4df4994bfdafff",
+ "sha256": "1ph0c1xq93pk53wq2vbh588nwifpji1ixn5wpgm9wp421ad3z5br",
+ "fetcher": "github",
+ "repo": "sp1ff/elmpd",
+ "unstable": {
+ "version": [
+ 20201107,
+ 428
+ ],
+ "commit": "0d0456f2b9bfffbe452b6d94b9cd8798c52fc80e",
+ "sha256": "00qkkjd397y0mlank1hwqvfhp4m53rs5jpd8gfcyjl53ka9dg587"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 8
+ ],
+ "commit": "1356343300140a77f462e690045584c85bd05c94",
+ "sha256": "0iwmn54v78fgch6cx9qp3cpdfqifqs6g36203xwqmkb4kgvwsg7m"
+ }
+ },
{
"ename": "elnode",
"commit": "987a93afa134fdda466fbdc6dd9c48a572b0be61",
@@ -24594,44 +25068,44 @@
"repo": "redguardtoo/elpa-mirror",
"unstable": {
"version": [
- 20200502,
- 115
+ 20201119,
+ 1306
],
- "commit": "9b25a8a2619e1f723528e8a093d31181223d5c85",
- "sha256": "0frafk7a86l2g02c1c6vrinp609v480klhkh3y823b5k4bx3m3b7"
+ "commit": "c9d4f69dd0fd7a1be143ef512262d219d7c10eb6",
+ "sha256": "01gnyan4l04pvvpncpxydramd77v5dxcv8vby4k3lv731qqvp0nv"
},
"stable": {
"version": [
2,
1,
- 1
+ 2
],
- "commit": "83a38b5721c459d311833522903de96f874e1a4e",
- "sha256": "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri"
+ "commit": "cdd83ff9965d8df7aaf95e5d7751d2feabbd5493",
+ "sha256": "0i7ayq9v06l0raw8fw557k159rids9avabbj79yzf6p0daq93xvk"
}
},
{
"ename": "elpher",
- "commit": "d87a0f3142e0a59842608576961707c98374f954",
- "sha256": "1i52q6xsyabl8gg8cd29d24gnw6aac69pjif2yh0rijxvbcl2a86",
+ "commit": "8f45c610341f34e284025093e30b96d29513add7",
+ "sha256": "1b8m198vb61k8dp80rjl1srxm1sfh0cf7v7v26zjjpvchk3w2gc1",
"fetcher": "git",
- "url": "git://thelambdalab.xyz/elpher.git",
+ "url": "https://thelambdalab.xyz/git/elpher.git",
"unstable": {
"version": [
- 20200628,
- 2255
+ 20200919,
+ 1025
],
- "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927",
- "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg"
+ "commit": "3561c2815bc6bc896fc7a6da8f094edca48c55b8",
+ "sha256": "0vy1ak5gphnih90c1n7js91p0fdyccdqqbagdjqdfbpbir41gba5"
},
"stable": {
"version": [
2,
10,
- 0
+ 2
],
- "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927",
- "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg"
+ "commit": "1edbaec565d413a9c7d4c55e9356c38b2037e0f5",
+ "sha256": "0xqiisirpvw4ka9417pq4r73x937wl3qbf8cpn2i03akm8d58smd"
}
},
{
@@ -24642,11 +25116,11 @@
"repo": "twlz0ne/elpl",
"unstable": {
"version": [
- 20191229,
- 1929
+ 20200821,
+ 1052
],
- "commit": "48ecee2aa7b3d085a3deff809fb3ae31ae4ef9dd",
- "sha256": "06xqww1r3i2hlr4hyg4n2l9zbpiki3g90b51jylaiabj4gqfswzv"
+ "commit": "ca6a6237681c641d5137d58e52f884dec0da6349",
+ "sha256": "0nh300bn5wc753dpyi5p8ihgm173h07mg04fryz5w173xxqqhj8c"
}
},
{
@@ -24657,8 +25131,8 @@
"repo": "jorgenschaefer/elpy",
"unstable": {
"version": [
- 20200805,
- 1736
+ 20201115,
+ 1811
],
"deps": [
"company",
@@ -24667,13 +25141,13 @@
"s",
"yasnippet"
],
- "commit": "c766feb5c34dd17b7afba480ae9e90a08d75012c",
- "sha256": "13z21jfvinjxyyi37xvx12gbr28fbr0g43x0nsip270dz797ls0v"
+ "commit": "4032c7251eb2d74ec8a301a3988b62b7a0f00932",
+ "sha256": "0bmfazghviwkn14vbk2iabgrnb0xk3xw8cp2cyrg68rxmbpvl527"
},
"stable": {
"version": [
1,
- 34,
+ 35,
0
],
"deps": [
@@ -24683,8 +25157,8 @@
"s",
"yasnippet"
],
- "commit": "980705c0b23aead72d7d6711008b1fb1706a45c2",
- "sha256": "1x1z298axbh4xalssnq9nkf2z1sdgmx839vb01xz18kr9lfavx1x"
+ "commit": "4666c16ef362d4f99053bbc0856d8c65121e1825",
+ "sha256": "07rdb9w3bxzfr07224awa541xdy116hyc2b3bpl3fc3ikddmbydk"
}
},
{
@@ -24732,8 +25206,8 @@
"repo": "emacs-elsa/Elsa",
"unstable": {
"version": [
- 20200225,
- 1440
+ 20201011,
+ 1950
],
"deps": [
"cl-lib",
@@ -24741,8 +25215,8 @@
"f",
"trinary"
],
- "commit": "5ac373088eca10581e848ad42f5e278aedcd85c0",
- "sha256": "11q5bh1mxc3z8a2zxs157pf7aqld9vddcffibgawh4r8q661ys03"
+ "commit": "ac0ab88abca1215cac60f8a986dadf3011b444bb",
+ "sha256": "0g712vmiabia8aqvdw15i4416dgvy73flsijb6x8mq6bbxw6mmrc"
}
},
{
@@ -24900,8 +25374,8 @@
"dash",
"elscreen"
],
- "commit": "da79fb0b9ead2402662ff8e163039635aaae2413",
- "sha256": "18zzp7ziawb2qb5qlmn9b85pfx4h6ldfxdhv9nr72njgrfp1q5al"
+ "commit": "51360259326b8b4a5395a9f37dea8bf71ef2428a",
+ "sha256": "0472mr7r4ac8f16bq7zcybaxdvn2rqgaijckkbrcccivz3v1hky8"
},
"stable": {
"version": [
@@ -25147,26 +25621,26 @@
"repo": "cireu/emacsql-sqlite3",
"unstable": {
"version": [
- 20200718,
- 614
+ 20200914,
+ 508
],
"deps": [
"emacsql"
],
- "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df",
- "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"
+ "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c",
+ "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6"
},
"stable": {
"version": [
1,
0,
- 1
+ 2
],
"deps": [
"emacsql"
],
- "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df",
- "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"
+ "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c",
+ "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6"
}
},
{
@@ -25417,33 +25891,35 @@
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20200716,
- 1815
+ 20201105,
+ 2351
],
"deps": [
- "cl-lib"
+ "cl-lib",
+ "seq"
],
- "commit": "36d760e2bd7e5376aff3f03456fa6445833242ad",
- "sha256": "0xgshxdd5zmy1c7sxvrmw0wkqwhwaccqf93zwz98gb9gsfabyxd8"
+ "commit": "6995bf6ee0cb87a36d2ac462c329326603f8662e",
+ "sha256": "0dp1cfgng2nhi1jfp88q2hp1k5xbd72p02prqj6iv3xd8dh1qjgk"
},
"stable": {
"version": [
- 5,
- 4
+ 6,
+ 2
],
"deps": [
- "cl-lib"
+ "cl-lib",
+ "seq"
],
- "commit": "f4924c2e77bdc5806495a74832fba60b2c30aca1",
- "sha256": "01d8akv046igc13d5ki9wz36v51dlijab892ki5s5c4ysgj42wkr"
+ "commit": "6985faba91b9d48c48da55d2adf4a54ca332c1cb",
+ "sha256": "0pcg9g11y6mjcc035wqlnn87gh4d1gmaz7dxy9ll3nksj5vwyllm"
}
},
{
"ename": "emms-bilibili",
- "commit": "533f96d1e68eda20b2d2e7f8eb3e7fa118904970",
- "sha256": "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47",
+ "commit": "3d9f959ce68cb49ea0c0628f37eaa4a8b0644ce3",
+ "sha256": "0cfqi3ng6z4f8cfa51pk2w1zrm5l32w9jqfzbaxgpqgg6d34i6hh",
"fetcher": "github",
- "repo": "0xDEATHCODE/emms-bilibili",
+ "repo": "iBytePress/emms-bilibili",
"unstable": {
"version": [
20180103,
@@ -25699,28 +26175,28 @@
"repo": "jcs-elpa/emoji-github",
"unstable": {
"version": [
- 20200323,
- 233
+ 20200825,
+ 425
],
"deps": [
"emojify",
"request"
],
- "commit": "43f63c0dd64aae6c8054c2dad617bf810abdfadd",
- "sha256": "0wcxsy3q8912kf87bn3mi2si010i5dd99yinf23nhb2nqvqgiw94"
+ "commit": "d512c2babb412820945444c6daf309b470e2eb12",
+ "sha256": "1llqn6ik0dnrpmvdxcgiyadbffjlbxqv6i7bxh2rnqiy4fhk9s1n"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
"deps": [
"emojify",
"request"
],
- "commit": "5d1512fb30c65018a507ef549d92c668d8221da3",
- "sha256": "00dj0kfllyhiklylj4cjcv64zjaxs6a4cc79f8pppmzvf1spivvz"
+ "commit": "d512c2babb412820945444c6daf309b470e2eb12",
+ "sha256": "1llqn6ik0dnrpmvdxcgiyadbffjlbxqv6i7bxh2rnqiy4fhk9s1n"
}
},
{
@@ -25746,15 +26222,15 @@
"repo": "iqbalansari/emacs-emojify",
"unstable": {
"version": [
- 20200812,
- 628
+ 20201130,
+ 1116
],
"deps": [
"ht",
"seq"
],
- "commit": "d886069974d05c8c15654204f9afeaee962f3e7d",
- "sha256": "00s6vzziiym4bqh91c1k55qjihpmqs7w6kcxnwms8mx92w40hlw2"
+ "commit": "4b96f37f315182f95d4ea9ff33a9b5af9f1b1620",
+ "sha256": "0xk8yv3icb7cik6qgc8c7v657zyyclbpgyra2djagwj5fnn3266n"
},
"stable": {
"version": [
@@ -26004,14 +26480,14 @@
"repo": "purcell/envrc",
"unstable": {
"version": [
- 20200714,
- 201
+ 20201114,
+ 240
],
"deps": [
"seq"
],
- "commit": "1dc5aad14d2c27211c7c288d2d9dffeb2e27cb2d",
- "sha256": "11ad4i1cyz6cfsckm4jf10w0570sd2fcrji87sf5052csl4ril2h"
+ "commit": "18caf5154f61d7f78cd4719d999e0fa6ef52345f",
+ "sha256": "09ww340nnnsqxkxr68rnd2h9lyi4sdngry30d57ps4g1p3phdfxd"
},
"stable": {
"version": [
@@ -26119,14 +26595,14 @@
"repo": "emacscollective/epkg",
"unstable": {
"version": [
- 20200817,
- 1145
+ 20201203,
+ 1723
],
"deps": [
"closql"
],
- "commit": "ac6e85e11f0e071911279f3f0a4ea7bff35b68cf",
- "sha256": "1g5g8rs4zpwlxmkmnml34hy0arbhq8fsmyxqjq0h1l1xxbwscdl4"
+ "commit": "e5c3541b0a85b3a30ca4eaf578f1d0927e67a10e",
+ "sha256": "0h90q5g44xkq2r4vrvib2k55b7sm7v5bpksxy5pblv1m2vdsmwvk"
},
"stable": {
"version": [
@@ -26260,15 +26736,14 @@
"repo": "emacsomancer/equake",
"unstable": {
"version": [
- 20200805,
- 2110
+ 20200824,
+ 1549
],
"deps": [
- "dash",
- "tco"
+ "dash"
],
- "commit": "85fe1033e3aa64986d297bf1fde2d172827309cc",
- "sha256": "0w3yp9ixdwcm3fl8104yb3rxp1h8z6i6msd95b48jia52dbajzcj"
+ "commit": "b0a5e334a7ccf69b837656c8a91c2e9e254e4c76",
+ "sha256": "1m6p148pcgcfywqzgc0v5wyf1k4knz7kwidf76qhvcff8z9fd5j5"
}
},
{
@@ -26279,11 +26754,11 @@
"repo": "olav35/eradio",
"unstable": {
"version": [
- 20200729,
- 1817
+ 20201204,
+ 2035
],
- "commit": "5e257849113b70b2b42a999994d89ec8abadf253",
- "sha256": "1nni4yyvhqg4dscgn1xlbgh073lwjff5mqw8zxwyiahfsdi0z9ca"
+ "commit": "893d499ef67065f56ef464fa8ede2e49d4597fe4",
+ "sha256": "0sxxkdsnz21pb1cn24c9qf3lypbgvr6z3bqda4k168ml4pbg4rlj"
}
},
{
@@ -26384,6 +26859,21 @@
"sha256": "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i"
}
},
+ {
+ "ename": "erc-matterircd",
+ "commit": "c74850115b5b3da103407971f40a44f22791928e",
+ "sha256": "19qrh5k26gdpg1pb2fwa8abnllpmm4r95nf5ign32qyq83d0dyh4",
+ "fetcher": "github",
+ "repo": "alexmurray/erc-matterircd",
+ "unstable": {
+ "version": [
+ 20201029,
+ 2321
+ ],
+ "commit": "d46f55909f1c229fd84f409ef992a7a463719893",
+ "sha256": "19vwpl40nw3jgfmiwl1y4yna0ygjyzlqf5gs85g63f61d89gjlrs"
+ }
+ },
{
"ename": "erc-scrolltoplace",
"commit": "848cb17d871287c401496e4483e400b44696e89d",
@@ -26398,8 +26888,8 @@
"deps": [
"switch-buffer-functions"
],
- "commit": "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9",
- "sha256": "1wb3xm45g77daw2ncs8a8w0m8d2hi591jmzwy5xli1zgrr5mm8h3"
+ "commit": "38cfd0c2e2f5f6533b217189c3afaf6640b5602e",
+ "sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5"
},
"stable": {
"version": [
@@ -26437,14 +26927,14 @@
"repo": "drewbarbs/erc-status-sidebar",
"unstable": {
"version": [
- 20200811,
- 136
+ 20200907,
+ 1307
],
"deps": [
"seq"
],
- "commit": "b589b74245591257c9e666bd5cd25812e04b7a34",
- "sha256": "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy"
+ "commit": "87210a3ccc16a86e6b5992744b68daabed3b2d11",
+ "sha256": "1gb8lzsi3clbass40sllfwf8akzlgb2k93wqlw1lf4gfb9shx08v"
}
},
{
@@ -26691,15 +27181,15 @@
"repo": "ergoemacs/ergoemacs-mode",
"unstable": {
"version": [
- 20200526,
- 18
+ 20201114,
+ 2201
],
"deps": [
"cl-lib",
"undo-tree"
],
- "commit": "6a3214e1a892a45f575604f0bc4bb83175142aa4",
- "sha256": "1n0ki4214c53ax3r54gg303kawyqivwcciyhvrgqa1y0kk093982"
+ "commit": "ad3ec45ebbfdfaca052253c550102fd665b3bd1b",
+ "sha256": "06l7sx9bcvsm3p4jy6l4l5lgl357nrvr54491ignz7c9j403x6lm"
},
"stable": {
"version": [
@@ -26735,6 +27225,31 @@
"sha256": "06pdwrhflpi5rkigqnr5h3jzv3dm1p9nydpvql9w33ixm6qhjj71"
}
},
+ {
+ "ename": "eri",
+ "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c",
+ "sha256": "0rnrx6fc9zwh9pl2n90nzhp702ww9hlbqk16wqcbbm88awbznc6p",
+ "fetcher": "github",
+ "repo": "agda/agda",
+ "unstable": {
+ "version": [
+ 20200914,
+ 644
+ ],
+ "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1",
+ "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 6,
+ 1,
+ 1
+ ],
+ "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71",
+ "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7"
+ }
+ },
{
"ename": "erlang",
"commit": "d9cd526f43981e0826af59cdc4bb702f644781d9",
@@ -26743,20 +27258,20 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20200519,
- 530
+ 20201112,
+ 1915
],
- "commit": "d9bc7858e985143a433953ba286422511b466a0c",
- "sha256": "0ik1hhmw4xsmny9j5gbz7lr73jsvdd79xb3ygcsi8jkwz7lxi3v1"
+ "commit": "6b1435b92389bb6ce2d2613b66267c3a48abd0d6",
+ "sha256": "1xncnyp0904n287633dcl0f8mh5zhhq8shdjnjnb9fklglsbiad8"
},
"stable": {
"version": [
23,
- 0,
- 3
+ 1,
+ 5
],
- "commit": "44b6531bc575bac4eccab7eea2b27167f0d324aa",
- "sha256": "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv"
+ "commit": "600506690a10215a6c7e21eefbf855216cda4c33",
+ "sha256": "0pxf8h6dd1a1i7vlklc5jqbb6ab91axnldgg3vmvgff6a554xd7x"
}
},
{
@@ -26898,8 +27413,8 @@
"repo": "rejeep/ert-runner.el",
"unstable": {
"version": [
- 20200704,
- 1048
+ 20201005,
+ 2336
],
"deps": [
"ansi",
@@ -26909,8 +27424,8 @@
"s",
"shut-up"
],
- "commit": "59a0f07f4f6b7c4757768309e8a47cec983e862a",
- "sha256": "198bc526s6sw8qqsbmw4wgz5m97n6kf9002f2bgg9phms7a8if4s"
+ "commit": "c3969c86b5b00087d8b2fcb7147481d5be56f2f7",
+ "sha256": "0v3ry7aza86pzrjjy9qr07jxn3md1vx324cl0xq3b055mdp6dqv6"
},
"stable": {
"version": [
@@ -26967,8 +27482,8 @@
"repo": "dakrone/es-mode",
"unstable": {
"version": [
- 20191119,
- 2018
+ 20201125,
+ 2059
],
"deps": [
"cl-lib",
@@ -26977,8 +27492,8 @@
"s",
"spark"
],
- "commit": "3aacf72daf6a2b4104914dd40e5f33e78fb084ac",
- "sha256": "1ki839cfsn2xr2d8a2j89llbl452d45x3y5jiaiwkcmfhf7xadcb"
+ "commit": "cde5cafcbbbd57db6d38ae7452de626305bba68d",
+ "sha256": "02zzwf9ykfi2dggjbspg7mk77b5x1fnkpp3bcp6rd4h95apnsjq5"
},
"stable": {
"version": [
@@ -27137,11 +27652,11 @@
"repo": "coldnew/eshell-autojump",
"unstable": {
"version": [
- 20150927,
- 724
+ 20201117,
+ 235
],
- "commit": "c6a8b81a16576df9875e721fbbfe6690d04e7e43",
- "sha256": "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2"
+ "commit": "c1056bfc6b46646ae1e606247689fef9aee621af",
+ "sha256": "1anay4d29p86yxmjgrscby92icc7j230xc8dnjhgq29y2s44f3gg"
},
"stable": {
"version": [
@@ -27270,6 +27785,30 @@
"sha256": "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y"
}
},
+ {
+ "ename": "eshell-outline",
+ "commit": "950b9323c19b145bbf07a9a8f780880a2593831c",
+ "sha256": "1k510vsfsnhp86y2587zbc0cmaf735sp802d6qk7bgdllljl18hd",
+ "fetcher": "git",
+ "url": "https://git.jamzattack.xyz/eshell-outline",
+ "unstable": {
+ "version": [
+ 20201121,
+ 620
+ ],
+ "commit": "6f917afa5b3d36764d76d7864589094647d8c3b4",
+ "sha256": "1igh5hxvncd4lvxv5jj1hjgsfl4h0cn81597qn6ppzvxgjbhh7v7"
+ },
+ "stable": {
+ "version": [
+ 2020,
+ 8,
+ 31
+ ],
+ "commit": "45311744f38dea4f750b382068c0b720568449b1",
+ "sha256": "1qwlrv7nkxkq9w1vxp5d2sznssbpswkj3pxrygv0bjp46vc5rf7z"
+ }
+ },
{
"ename": "eshell-prompt-extras",
"commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -27278,11 +27817,11 @@
"repo": "zwild/eshell-prompt-extras",
"unstable": {
"version": [
- 20200319,
- 322
+ 20201115,
+ 440
],
- "commit": "1801b3aeccf1363f138fe01ee99d892d10fc2a07",
- "sha256": "1dgfd9yf4ikn5whqpxyliyp21vs1h852wjfqy5lmxzhnzic1xsi1"
+ "commit": "d7d874ce3da3ae55a42f669aca723a8774c8292c",
+ "sha256": "1ahydmiffxn4mp76fmzax73fx1lws37nacnnxp1imxnvmk8f0zjp"
},
"stable": {
"version": [
@@ -27293,6 +27832,29 @@
"sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g"
}
},
+ {
+ "ename": "eshell-syntax-highlighting",
+ "commit": "0e79e165f80e1ed4c727508839f74a866ca99e61",
+ "sha256": "1cbfdwrsr6jwrlpfrvxn4gy3a3xsclp5hxgdhlycx7v17bkip3iy",
+ "fetcher": "github",
+ "repo": "akreisher/eshell-syntax-highlighting",
+ "unstable": {
+ "version": [
+ 20201013,
+ 623
+ ],
+ "commit": "6cc32ee59d79d965e40269c764d90aa898252f0a",
+ "sha256": "09yjiamz3gvpchhzf424419q4gx7wybm2bcm5j2bw688qswd9rrc"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3
+ ],
+ "commit": "6dc15347a88e019e283fd98ec9e3ddd34d210b5c",
+ "sha256": "1fb9aa85a3hx1rcmv71j6sc3y278452p1y4dabpwy07avb6apd0p"
+ }
+ },
{
"ename": "eshell-toggle",
"commit": "b7a3cf4c5ed3bb0995eac9dcce939b518a0ef987",
@@ -27301,14 +27863,14 @@
"repo": "4DA/eshell-toggle",
"unstable": {
"version": [
- 20200528,
- 1124
+ 20201112,
+ 1008
],
"deps": [
"dash"
],
- "commit": "aeb7c121e4518c0edd1d2972851502303a299984",
- "sha256": "12w38h438bg2vm8najsqizcdfyr1px5h1gba68x4mzyv2bcll2qx"
+ "commit": "bbf69e54ba97f23ae281f5c455c194e8a236549c",
+ "sha256": "1f3i9cr4qibjkg8bh719ayb7p3nr5y3hmzlvyflb9vi3108kspb8"
}
},
{
@@ -27396,14 +27958,14 @@
"repo": "aaronjensen/eslintd-fix",
"unstable": {
"version": [
- 20190830,
- 2116
+ 20201127,
+ 1639
],
"deps": [
"dash"
],
- "commit": "0c431141be9a408c28aead152ea454df0804364f",
- "sha256": "0yyssbgfi3fg3dbfrzsy9sms42z87apk6amql8pijwzb3b735jc2"
+ "commit": "f287e61208a5ae532f6722e369400a530b697ea0",
+ "sha256": "05b00iacp792i05p10iaaj6385gmdygglfizhziag4s588afpj46"
},
"stable": {
"version": [
@@ -27546,11 +28108,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20200819,
- 1030
+ 20201208,
+ 1047
],
- "commit": "1baf8bf1403fe5956a25475b03be0d8f02b3f3ca",
- "sha256": "0asyd67krsq3xx7kk770x1f70j33bga8w0i7l4089a1jqzmpn3kx"
+ "commit": "a23b04599bad080ed15c630469c113b2cb591507",
+ "sha256": "1y5gvza93wvf5ihncfdvfghz0zgnsmy1pq1rjbi0pv4gc39rifbj"
},
"stable": {
"version": [
@@ -27598,6 +28160,35 @@
"sha256": "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x"
}
},
+ {
+ "ename": "ess-r-insert-obj",
+ "commit": "ed21286f280f7b4021a6e789ab638bee09a046ca",
+ "sha256": "0jm074h55qsby4bvq1hqpzcbbl99a734mcgw39grnidqb2912nsk",
+ "fetcher": "github",
+ "repo": "ShuguangSun/ess-r-insert-obj",
+ "unstable": {
+ "version": [
+ 20200916,
+ 843
+ ],
+ "deps": [
+ "ess"
+ ],
+ "commit": "554bdc7d6c7fafc5b8a886690970b5145276a3f5",
+ "sha256": "0v4cj8d44a52h3r8k4yhr84xalfwrkwpdn3c5m44x7xp36s6zgbn"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "ess"
+ ],
+ "commit": "a3b9339a066ecf0b4e13b123c2034c2ad0235a6a",
+ "sha256": "0lrh8gcvx6jzngk0n5yh0f4nxaqipfi319i0iidjrdarnnbjvin0"
+ }
+ },
{
"ename": "ess-smart-equals",
"commit": "4403cf87e05311d7fe0360f35f9634b9fdfc6f81",
@@ -27677,6 +28268,36 @@
"sha256": "1yzki5f2k7gmj4m0871h4h46zalv2x71rbpa6glkfx7bm9kyc193"
}
},
+ {
+ "ename": "ess-view-data",
+ "commit": "5467365756ac525321e2f0e28d3afebd7ad9fa7d",
+ "sha256": "0pz5ypcsr6pfnxlp1vabwilsq8zyjq2fqnj8kn0989g1wr7vdf2h",
+ "fetcher": "github",
+ "repo": "ShuguangSun/ess-view-data",
+ "unstable": {
+ "version": [
+ 20201202,
+ 1124
+ ],
+ "deps": [
+ "csv-mode",
+ "ess"
+ ],
+ "commit": "9aeb18c0adc3e0fed75640a15500944becd5f3ef",
+ "sha256": "0mspy45wrc42r7agksyzrlf6ir3wqnyx19hfikm0fh81bn23im2h"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2
+ ],
+ "deps": [
+ "ess"
+ ],
+ "commit": "99ddbceaa54941a5e8438eadb0210fd16470e581",
+ "sha256": "1crbrzphs49ghkx3rv952wbdv483rwfblryv8bx8lgpxv5gkar9w"
+ }
+ },
{
"ename": "esup",
"commit": "b9d2948a42da5d4864404d2d11a924a4f235fc3b",
@@ -27692,8 +28313,8 @@
"cl-lib",
"s"
],
- "commit": "0de8af8233d9ce1b67f05a50f25c481c4f1118d8",
- "sha256": "01khb3xyj0ylwib6ryzzvqmkh5wvzxiq2n3l0s3h9zv7wx849bzv"
+ "commit": "0ef8b536253c11da44a6788cc2c6e4d0ba7bbd6e",
+ "sha256": "1wg3hqq2faq20s5qmccz84jjwyjlygz0rrhz2rawck8srwwz45g5"
},
"stable": {
"version": [
@@ -27716,20 +28337,20 @@
"repo": "tali713/esxml",
"unstable": {
"version": [
- 20171129,
- 807
+ 20201130,
+ 809
],
- "commit": "193d199305e7abcb5ed795b9bc5434ded20ae60e",
- "sha256": "1cbzdwfndz6pdmb3vzb6l2smxb2l47sncmkccya0nzlvvhz3p8c0"
+ "commit": "265646046b084621900767682adff6581933f044",
+ "sha256": "0hmmxchhqg6vipscn9ycbfm5p8bix22hipa2cl155wyqrm0cl7iz"
},
"stable": {
"version": [
0,
3,
- 4
+ 5
],
- "commit": "5548ceba17deae0c3c6d0092672edc4de3c75ce3",
- "sha256": "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"
+ "commit": "68efaa4a7e9841b9bf2b80ea4841ee07d7bd68f9",
+ "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z"
}
},
{
@@ -27759,20 +28380,28 @@
"repo": "mavit/etc-sudoers-mode",
"unstable": {
"version": [
- 20200608,
- 1555
+ 20201102,
+ 1707
],
- "commit": "52d5be9214185cfbba56e0b39bc4af474fc95f45",
- "sha256": "1ff4dpwr0127mziwafxry5a9iyw8lbm4z8bdlim81p4pyyll7vx6"
+ "deps": [
+ "sudo-edit",
+ "with-editor"
+ ],
+ "commit": "74c66c58c9578a0d841206d5dec04d81e7b3d741",
+ "sha256": "0f4glimf9xf87nv23vq5cjhr92f0avzvimnr9v829d69fjmjghni"
},
"stable": {
"version": [
1,
- 0,
+ 1,
0
],
- "commit": "8d3805d8b8e016278204d727f6b97913ea0e5079",
- "sha256": "0cg0l8ksqrxy0clzj5x8l891873zcxwwzziv1mvwf8i618w2sjss"
+ "deps": [
+ "sudo-edit",
+ "with-editor"
+ ],
+ "commit": "74c66c58c9578a0d841206d5dec04d81e7b3d741",
+ "sha256": "0f4glimf9xf87nv23vq5cjhr92f0avzvimnr9v829d69fjmjghni"
}
},
{
@@ -27833,11 +28462,11 @@
"repo": "glasserc/ethan-wspace",
"unstable": {
"version": [
- 20190522,
- 1448
+ 20201106,
+ 2059
],
- "commit": "0f110fc26b829093c352e8dc9e50ba51a4e483ac",
- "sha256": "1w26cczq58xyzgmpsks11dnl58kvzk0av2y4bg46cgma4fdg9pb1"
+ "commit": "035c7d698c99e3891a522d6e6f8fde23c6267c15",
+ "sha256": "18wdk9bi822lx2ip9g1v443sc6qzq3zvxmyg32nsf6v85102z19k"
},
"stable": {
"version": [
@@ -27849,6 +28478,25 @@
"sha256": "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41"
}
},
+ {
+ "ename": "etherpad",
+ "commit": "2e4252ff1088a04bc3804897d382be69bd7302dc",
+ "sha256": "1mgfwrfjmf1b31hry5xrzsmb89lawq6glbjqa2f8h1jvq5fcvdvd",
+ "fetcher": "github",
+ "repo": "zzkt/ethermacs",
+ "unstable": {
+ "version": [
+ 20201017,
+ 2006
+ ],
+ "deps": [
+ "let-alist",
+ "request"
+ ],
+ "commit": "bfb8b4bfacbf16bb23e09a2b64b5383dd9cb9a47",
+ "sha256": "0fj9zn136izbq8r1p4b2ca9zzvxw5jl7h2gi4v3wf1wa15fkjzf5"
+ }
+ },
{
"ename": "euslisp-mode",
"commit": "b04fffe5e52f26e92930a112a64531228f94e340",
@@ -27892,16 +28540,16 @@
"repo": "kaz-yos/eval-in-repl",
"unstable": {
"version": [
- 20191116,
- 1107
+ 20201121,
+ 1341
],
"deps": [
"ace-window",
"dash",
"paredit"
],
- "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f",
- "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn"
+ "commit": "2abb9ccf6f08ae3a5ab504f0b3fd81ce0345b766",
+ "sha256": "1707c7v6n2w94nnlb6n08y2m11bh7abm6fks2zrf0i80srxb8mrk"
},
"stable": {
"version": [
@@ -28024,16 +28672,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20200816,
- 737
+ 20201107,
+ 1830
],
"deps": [
"cl-lib",
- "goto-chg",
- "undo-tree"
+ "goto-chg"
],
- "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90",
- "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0"
+ "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758",
+ "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b"
},
"stable": {
"version": [
@@ -28184,8 +28831,8 @@
"evil",
"evil-snipe"
],
- "commit": "dcdf5c3e844f6eef2bf9d6a502cf8c81b3edaff2",
- "sha256": "1g9li89kg3wgpm39prz9xra12vw7mhrnjl9wqqkvj98fx6dxsdr7"
+ "commit": "2354c9fa3d396fa5b1de8608e6920420b89ee323",
+ "sha256": "1cb7dv8wgixrfyx0mnc82i0ydg5bz7snn2643xi261kbrwhg51yj"
},
"stable": {
"version": [
@@ -28227,29 +28874,28 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20200808,
- 850
+ 20201207,
+ 1906
],
"deps": [
"annalist",
"evil"
],
- "commit": "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63",
- "sha256": "0kbv4p4v5mgjk2hbrg0c5p29yd74s4xaa8z6c8f2h6l5p28dsk4j"
+ "commit": "c9ccc3065f46c1654f1cc0d41cd2f5cff184d273",
+ "sha256": "1di2kc1ikrcvzf1p4nshlxdq5ndbg209kvhhdq3576xjw0ir90v5"
},
"stable": {
"version": [
0,
0,
- 3
+ 4
],
"deps": [
"annalist",
- "cl-lib",
"evil"
],
- "commit": "34d515e99e911f368b335bbccc026b71b42a9821",
- "sha256": "1737dbwv8fa9kps340jsvjyz4gd5vjf3zrdzbvjcjh56ssvdaw2w"
+ "commit": "04df79eadc952eaa9469094426b008426d3c5bee",
+ "sha256": "0ydr06krlj6v1r7hq3m5iy875mhmjr9amcfjjgqglfnzhic29g18"
}
},
{
@@ -28572,27 +29218,27 @@
"repo": "syl20bnr/evil-iedit-state",
"unstable": {
"version": [
- 20180607,
- 558
+ 20200830,
+ 617
],
"deps": [
"evil",
"iedit"
],
- "commit": "f75cff4ecbd5beaa9ca64a6c157c4105f078daec",
- "sha256": "0f6m5wi1q6ac9mkvalm62rlnlkjz1c315a4sa93p6iw9x12llkgw"
+ "commit": "30fcfa96ceebed0191337c493f5c2efc8ae090ad",
+ "sha256": "0aqwjd7pmzxf7l768vyqqgjzmqdwlpznh30w5bdr7yh79r6xm6n1"
},
"stable": {
"version": [
1,
- 1
+ 2
],
"deps": [
"evil",
"iedit"
],
- "commit": "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c",
- "sha256": "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss"
+ "commit": "f5573ddefc03309037bd98c4c649d517f4f8d659",
+ "sha256": "1i4kq34kghabkx0mp0asw2d0ybrrlv2ps50h8mgkm20sm5ha9lbh"
}
},
{
@@ -28760,15 +29406,15 @@
"repo": "emacs-evil/evil-magit",
"unstable": {
"version": [
- 20200604,
- 110
+ 20201107,
+ 1529
],
"deps": [
"evil",
"magit"
],
- "commit": "88dc26ce59dbf4acb4e2891c79c4bd329553ba56",
- "sha256": "0vh872rpxfwqj7m77l12czknddmz7aijk30vwb1l08yi9309cdsf"
+ "commit": "f4a8c8d3a5a699baea9356be7c1c5fd8867f610c",
+ "sha256": "1a14n8nl6470vbzw1a2y9rw5l7pw21qnnhxrw963gy063jyl9m8i"
},
"stable": {
"version": [
@@ -28822,26 +29468,26 @@
"repo": "redguardtoo/evil-matchit",
"unstable": {
"version": [
- 20200812,
- 1050
+ 20201129,
+ 1241
],
"deps": [
"evil"
],
- "commit": "574d3c4e4517d3bb10bf652cacf459376ae401fe",
- "sha256": "12c7y8dmkpqlak733cak6274fxzrk1hpywj7ky6nkfspqdvc2xz8"
+ "commit": "6254f7c81284dd7d8249f81a6601069710432be7",
+ "sha256": "16s78wg904jrpa0nr9ahf6jpwd2rs9igsn4km24abdhiaxgkw04b"
},
"stable": {
"version": [
2,
3,
- 8
+ 10
],
"deps": [
"evil"
],
- "commit": "8fba4f12e1bbfdbf25a8ed2a5308840f104bc7c0",
- "sha256": "04s650hz6aa4ld3xqa272a2jsw9j1scnn5qkhpgis0w2d3gpwvpa"
+ "commit": "b24a7232a2de114cb09774111c2ff8462451894f",
+ "sha256": "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa"
}
},
{
@@ -28859,8 +29505,8 @@
"cl-lib",
"evil"
],
- "commit": "4d4c0172e4c7f80acc1d0e73d5fb3e536929b262",
- "sha256": "1a5glj1n5dyhdaas5b8m3v2p36s1w9qcpmj7gnfxyp75iy0rqlbs"
+ "commit": "7dfb2ca5ac00c249cb2f55cd6fa91fb2bfb1117e",
+ "sha256": "18a4xcxadchyh9vrg9pqjmby40d5d0j78y1298kpflx78m5c9rgx"
},
"stable": {
"version": [
@@ -28957,11 +29603,11 @@
"repo": "redguardtoo/evil-nerd-commenter",
"unstable": {
"version": [
- 20200630,
- 911
+ 20201017,
+ 1148
],
- "commit": "87734b9c7fcd047f73a072b9d03ec05f786eeb03",
- "sha256": "15dahrvary0ahyzg83jxdhf00pd2231rr628nq9fl0dl54laixsd"
+ "commit": "563cdc154b1f29d181b883563dd37be7eafafdee",
+ "sha256": "0q3m6i2hin6sb3aqng37nfvz97bj099c3727srxcw2m4gw7z4cp2"
},
"stable": {
"version": [
@@ -29051,14 +29697,14 @@
"repo": "Somelauw/evil-org-mode",
"unstable": {
"version": [
- 20200601,
- 1855
+ 20200922,
+ 1933
],
"deps": [
"evil"
],
- "commit": "4b23116a6ecfa687819050e5a9a419cf08d5ba90",
- "sha256": "0r3b6j0ywkz8wggzyfnvqwwrd7ir317njdwldcdncirfwy603337"
+ "commit": "a629fb705b0ac704580d5a5833a64716284074e7",
+ "sha256": "004098pxli12x75j9z0i650rvsf4al7rv3gj6r7mayv29939w8w7"
},
"stable": {
"version": [
@@ -29081,14 +29727,14 @@
"repo": "mamapanda/evil-owl",
"unstable": {
"version": [
- 20200113,
- 405
+ 20201115,
+ 130
],
"deps": [
"evil"
],
- "commit": "ed5a98644a9cf321de213b50df6473de9f3a71ed",
- "sha256": "03afn47fgz3bxifmpwlmckpkl9nc237lc0khmaks0jfpmzcbkagc"
+ "commit": "713b898b214a2e5ef2a4189674a2f21e72a55769",
+ "sha256": "084f6s6vfs5wx1h9wa6xazi9rjx3gfnini71cjqqrn51gahp5c9a"
},
"stable": {
"version": [
@@ -29130,15 +29776,15 @@
"repo": "laishulu/evil-pinyin",
"unstable": {
"version": [
- 20200726,
- 546
+ 20200927,
+ 849
],
"deps": [
"evil",
"names"
],
- "commit": "ee4ea5a297fb8a445e0c886f9d20bbd4e94c00df",
- "sha256": "1g1v0513ypq4kax56rmq5dvf8yf9absvfls6zadhniwjzmdh68ii"
+ "commit": "3e9e501ded86f88e01a4edec5d526ab0fab879d7",
+ "sha256": "14by4ilj5bw9jx6kglbm63v2cpy1flijikpymqqvs1z4flmj7cgr"
}
},
{
@@ -29573,14 +30219,14 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20200816,
- 737
+ 20201008,
+ 1515
],
"deps": [
"evil"
],
- "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90",
- "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0"
+ "commit": "d6cf6680ec52733ea78dc530ed75fadc5171c758",
+ "sha256": "14rl6jx7cj336raxbksh3r2cplyifz8dghdhqvf7h1ng10sd9j6b"
},
"stable": {
"version": [
@@ -29603,28 +30249,28 @@
"repo": "iyefrat/evil-tex",
"unstable": {
"version": [
- 20200818,
- 1628
+ 20201103,
+ 1410
],
"deps": [
"auctex",
"evil"
],
- "commit": "03c014d63373c21c511506f36763a355e566eb01",
- "sha256": "096im6yld0bqkdrb3ywxiabv55l8qdvg10887iwq86zprj89igmf"
+ "commit": "ac313efb22d621c093d8d30233bd7dc8b4cc54b4",
+ "sha256": "1wrx8ihimn1sx3vzzfppcwv0yfh3x95jrkxqvzj0ykckipm3zk0b"
},
"stable": {
"version": [
1,
0,
- 1
+ 2
],
"deps": [
"auctex",
"evil"
],
- "commit": "bb01576e4cf9cc10c529621ced3ef3a7eb5ab376",
- "sha256": "1d4s9f0p8bmch3kv7zh5fcv1y6nxza9kfcrjrdvmflz1nb96sy6g"
+ "commit": "ac313efb22d621c093d8d30233bd7dc8b4cc54b4",
+ "sha256": "1wrx8ihimn1sx3vzzfppcwv0yfh3x95jrkxqvzj0ykckipm3zk0b"
}
},
{
@@ -29974,17 +30620,17 @@
},
{
"ename": "ewal",
- "commit": "33592edc97154b396b469e2352779721d5df670b",
- "sha256": "1i6j8dgbgj64wa08wl4kzf26q2x73zy2n4zfa4dzvdspm2bn0ddr",
- "fetcher": "gitlab",
- "repo": "jjzmajic/ewal",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "1gwq8n64v173g2jp2i23qm9lzbhjikr6y0j6nry720sa7j0y4pm2",
+ "fetcher": "github",
+ "repo": "wurosh/ewal",
"unstable": {
"version": [
20200305,
230
],
- "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
- "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
+ "commit": "e2a04f5c97b7d5e087af26e646c0b45a24522e56",
+ "sha256": "05wrz53jxhzkncsbhgg25lyi6b1vbw2kprhq0n5n87i6g9hlvl56"
},
"stable": {
"version": [
@@ -29998,21 +30644,21 @@
},
{
"ename": "ewal-doom-themes",
- "commit": "5f59228fa54a9733f549c1ba531cd90d4350fb62",
- "sha256": "14blxk8dkr0hkhf1hd75xk0zzx6qxavynymhbwbvbf3m0mp64x6l",
- "fetcher": "gitlab",
- "repo": "jjzmajic/ewal",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "0fn1ds2w7zcfqrcn9p74sz4hkccwg4xf8dbcgxg9sxzl89waya4b",
+ "fetcher": "github",
+ "repo": "wurosh/ewal",
"unstable": {
"version": [
- 20200301,
- 839
+ 20200922,
+ 325
],
"deps": [
"doom-themes",
"ewal"
],
- "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
- "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
+ "commit": "e2a04f5c97b7d5e087af26e646c0b45a24522e56",
+ "sha256": "05wrz53jxhzkncsbhgg25lyi6b1vbw2kprhq0n5n87i6g9hlvl56"
},
"stable": {
"version": [
@@ -30030,10 +30676,10 @@
},
{
"ename": "ewal-evil-cursors",
- "commit": "ee7f9833a1dda00e12bcf45c7194ebc38e26168b",
- "sha256": "177f5m1a3cvgjkgqz61w8gz3q272sk2cafq2z29rk88gcfbm2iqc",
- "fetcher": "gitlab",
- "repo": "jjzmajic/ewal",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "1xkjf31ba3ixv7nmxngba9pswpfr1nj4jni5y08rxfjxirwm0vbl",
+ "fetcher": "github",
+ "repo": "wurosh/ewal",
"unstable": {
"version": [
20190911,
@@ -30042,8 +30688,8 @@
"deps": [
"ewal"
],
- "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
- "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
+ "commit": "e2a04f5c97b7d5e087af26e646c0b45a24522e56",
+ "sha256": "05wrz53jxhzkncsbhgg25lyi6b1vbw2kprhq0n5n87i6g9hlvl56"
},
"stable": {
"version": [
@@ -30060,10 +30706,10 @@
},
{
"ename": "ewal-spacemacs-themes",
- "commit": "5aebe80668479c02a694fef153cea0e9f9ca7eb0",
- "sha256": "0a0xpjlw3yfqfn2wcyqzpdisyr5pm1x35k8rpcjhwn5lhh7njlfc",
- "fetcher": "gitlab",
- "repo": "jjzmajic/ewal",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "1dliqwmlnl9bdw166xyadlgf3is22qn5bzrm0mv2gqi8p8ib5dl8",
+ "fetcher": "github",
+ "repo": "wurosh/ewal",
"unstable": {
"version": [
20190911,
@@ -30073,8 +30719,8 @@
"ewal",
"spacemacs-theme"
],
- "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
- "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
+ "commit": "e2a04f5c97b7d5e087af26e646c0b45a24522e56",
+ "sha256": "05wrz53jxhzkncsbhgg25lyi6b1vbw2kprhq0n5n87i6g9hlvl56"
},
"stable": {
"version": [
@@ -30175,11 +30821,14 @@
"repo": "purcell/exec-path-from-shell",
"unstable": {
"version": [
- 20200526,
- 324
+ 20201105,
+ 2236
],
- "commit": "e5647b910900972bc59acea7b74e932ba0a94ce2",
- "sha256": "18awpmyrvcw6yckms8wfgyh5kfyva1w7vpvclqa655l22brbvpph"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "4ea306a76f0f8371053dd12d77a3b5b4438974d3",
+ "sha256": "1s6raprqgyn64fhfbjiyp874nzxysr1ycdm5064721w3iz9rzzw0"
},
"stable": {
"version": [
@@ -30245,10 +30894,10 @@
},
{
"ename": "exotica-theme",
- "commit": "9182f92dd62e2f1775a76699a6c8f9c3e71e9030",
- "sha256": "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs",
+ "commit": "2788fa27ba5b3bddc98c28fed6243d1f34e8caa8",
+ "sha256": "0inglwhia3l9cl7k7d6gwir1za3wz861gknj4pb6n76x5p0zap0f",
"fetcher": "github",
- "repo": "jbharat/exotica-theme",
+ "repo": "1bharat/exotica-theme",
"unstable": {
"version": [
20180212,
@@ -30499,26 +31148,20 @@
"repo": "ieure/exwm-mff",
"unstable": {
"version": [
- 20200516,
- 2335
+ 20201003,
+ 1651
],
- "deps": [
- "exwm"
- ],
- "commit": "81fbbea495e32aef2e2d86c097cb586422d8822c",
- "sha256": "0c3k2cs57iahm5dc1i3h05kiz4fjh7l2675im8kh91jx7lk27vb5"
+ "commit": "0d428aca46b8c251dc04d412832e6e7b6e910872",
+ "sha256": "0g4jvnygcn91kzay0dvahkmf7813cizfc3lhyx1mvi6riz9li3l7"
},
"stable": {
"version": [
1,
- 0,
- 6
+ 2,
+ 0
],
- "deps": [
- "exwm"
- ],
- "commit": "74a05bb1cc9444bb57d7a5361a15ec38deb4295a",
- "sha256": "128j1xqg1k2z0lp7ivnszx8aai8y0zg182n1fhwc3iryrz52fn5q"
+ "commit": "c3a132164ea5fdcaa9df49d8a115eab0481ee342",
+ "sha256": "0r0j3xja70i4k7rxw0fgbnl1wzy2ragq7cway57293a25534bmlm"
}
},
{
@@ -30589,14 +31232,14 @@
"url": "https://depp.brause.cc/eyebrowse.git",
"unstable": {
"version": [
- 20200506,
- 1303
+ 20201107,
+ 955
],
"deps": [
"dash"
],
- "commit": "bde0eb8f56ec7e2501dc33154c273e43cafb1e5d",
- "sha256": "19x3wfnbcmrrywxbigr3lv0yp6dxmr0iy10ykqg3pajpxbvarcn2"
+ "commit": "88c7b59aa7c5c93bc23812217213adfa238f977b",
+ "sha256": "09s07mvg5bz3dm9sxgn40c7z6d6ry1sdjzsxwgmy825f3xm66avs"
},
"stable": {
"version": [
@@ -30853,19 +31496,19 @@
"repo": "WJCFerguson/emacs-faff-theme",
"unstable": {
"version": [
- 20200304,
- 1414
+ 20201208,
+ 2051
],
- "commit": "3a2f4b567de490ee7af32ecca46de741e7fd7d6a",
- "sha256": "0h3i61md4w6zsjarqan0s3p3kxz5af6ic3fww4ly6s8q1nv57xsc"
+ "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986",
+ "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v"
},
"stable": {
"version": [
2,
- 9
+ 13
],
- "commit": "0aaa15181eab4088a57ad69ba2c93b2663453c31",
- "sha256": "0xg20g9qqmi1x94d8f0gqwxgxpyzirs61nj86507bqn2c4n00r7v"
+ "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986",
+ "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v"
}
},
{
@@ -31014,11 +31657,11 @@
"url": "https://framagit.org/steckerhalter/emacs-fasd.git",
"unstable": {
"version": [
- 20180606,
- 505
+ 20200925,
+ 1549
],
- "commit": "020c6a4b5fd1498a84ae142d2e32c7ff678fb029",
- "sha256": "142zq0zz38j3akgc1gipqhgs05krlkig1i97pgzmi4jcqdgm3lx9"
+ "commit": "38555b501430bb684feb58901ede5347dca287c7",
+ "sha256": "0wncbk910c7nw3wi602psx5hc6cwzigim5ahyqmkm8gry3vhwbyd"
}
},
{
@@ -31115,11 +31758,11 @@
"repo": "rukano/emacs-faust-mode",
"unstable": {
"version": [
- 20180205,
- 926
+ 20201004,
+ 1353
],
- "commit": "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c",
- "sha256": "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"
+ "commit": "2a56cda14b152d5471f21a5d82f23c141dc7134c",
+ "sha256": "04xzlnk2rq9h19g9n09sn99khdryjj9ywjby65srah9kwp1abcm8"
},
"stable": {
"version": [
@@ -31206,11 +31849,11 @@
"repo": "yqrashawn/fd-dired",
"unstable": {
"version": [
- 20200713,
- 243
+ 20201124,
+ 126
],
- "commit": "5622041068d5fa2f299dbc8aa91fece0ba260086",
- "sha256": "028qm0snna2w8wrgx988nhw3sdid5n3nr01hvavnzyhadha1j6fc"
+ "commit": "313def22c88519e61279e858b4f53bb84a93da36",
+ "sha256": "0sp3a01qvxrszmcvdzplrhkiax4lhssz4idw78sxmm28j59m8p7x"
},
"stable": {
"version": [
@@ -31304,8 +31947,8 @@
"deps": [
"dash"
],
- "commit": "47692787326a14c06dab6815bb18caced59a5bf0",
- "sha256": "1mj86p4zw73c1n6nqv35zhgsqrmcmgvi07q60dahs016bwdzc6jb"
+ "commit": "12fcd1a28fe7c8c46c74e32f395ec631d45ec739",
+ "sha256": "1k22gwzrblkqqqkkdb99d5lv44nmvpmiwwv2ghw7hjh4w1wxir0z"
},
"stable": {
"version": [
@@ -31328,11 +31971,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20200714,
- 237
+ 20201114,
+ 132
],
- "commit": "a39543750ba337b9327108ba17ffb0cdb18c7f9b",
- "sha256": "0p9n0plb1ry6r8i09if6mzhhk4gs1saxm05msq8sgwdjs6r1ra61"
+ "commit": "fa56106eeb27de8c8f063f53e139e9bcf6004274",
+ "sha256": "1ph0x8qp736nr2zs3ffznmxd6hycgk1gv2hpw4kls3qkbcail387"
},
"stable": {
"version": [
@@ -31516,6 +32159,30 @@
"sha256": "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf"
}
},
+ {
+ "ename": "fill-page",
+ "commit": "ccf97fe3676818a2f17f5647654690ee22055f82",
+ "sha256": "1bv1a3jf6km7pkazqcg0b0k2q86jc9zq1am14fnmq8njw9snzmwn",
+ "fetcher": "github",
+ "repo": "jcs-elpa/fill-page",
+ "unstable": {
+ "version": [
+ 20201105,
+ 452
+ ],
+ "commit": "95f82f93848ca608d4c4d9ec7386d94745cbc691",
+ "sha256": "10kgaq1da5zgz2dzagw2fc5hlh4ik5z6vyfw0lqd7bqpjfg62kgr"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 7
+ ],
+ "commit": "95f82f93848ca608d4c4d9ec7386d94745cbc691",
+ "sha256": "10kgaq1da5zgz2dzagw2fc5hlh4ik5z6vyfw0lqd7bqpjfg62kgr"
+ }
+ },
{
"ename": "fillcode",
"commit": "85eb403503aa83799a6072bfe21bf66c8177ca73",
@@ -31603,26 +32270,26 @@
"repo": "technomancy/find-file-in-project",
"unstable": {
"version": [
- 20200227,
- 1204
+ 20201111,
+ 407
],
"deps": [
"ivy"
],
- "commit": "506f35e91e06463cca7390da6ebffc411b8c220f",
- "sha256": "1iwfhymbmlmakbga1jlp7w6jlnj0jbb0zs1yxxg8mmj7k9ss2xjr"
+ "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a",
+ "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x"
},
"stable": {
"version": [
5,
7,
- 10
+ 13
],
"deps": [
"ivy"
],
- "commit": "e5bd59c52ddf3cd59bbaa4247770d7b2957a6ea3",
- "sha256": "156sfd5xs831sdlkf7p5m20hzznv1zlf9nm3pfm8n8ixp13fnzj0"
+ "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a",
+ "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x"
}
},
{
@@ -31648,6 +32315,21 @@
"sha256": "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md"
}
},
+ {
+ "ename": "find-file-rg",
+ "commit": "682c5a4d6c772906d88702c3c0a4f45cbcecd636",
+ "sha256": "0md2b37z6y96kid442cyiakxmbgh4rnym7lm3p1pbgzrvkx8dyll",
+ "fetcher": "github",
+ "repo": "muffinmad/emacs-find-file-rg",
+ "unstable": {
+ "version": [
+ 20200827,
+ 704
+ ],
+ "commit": "ed556e092a92e325f335554ab193cef2d8fec009",
+ "sha256": "1db2vv4fgxq26kr9d7n3dc302wv20wwviyaq0lg9i5swy2ng4wj6"
+ }
+ },
{
"ename": "find-temp-file",
"commit": "c01efd0cb3e3bab4661a358c084b645dc7e31736",
@@ -31747,11 +32429,11 @@
"repo": "jming422/fira-code-mode",
"unstable": {
"version": [
- 20200415,
- 2356
+ 20201005,
+ 1607
],
- "commit": "c6945a005b9a581c81e2f3560eab4bd629967364",
- "sha256": "1ylndx5n433zy9y7n79xhl7p0g1f4c0y97ha50d8fqm451jm0569"
+ "commit": "a3a7a75d2b8b15404c37de186162a5f89ba447bf",
+ "sha256": "0az773s1g8c1sahyrci4zclzhyznr3kizmvxs65rpn0pcmcfq1m8"
}
},
{
@@ -31837,8 +32519,8 @@
20200506,
1311
],
- "commit": "5b117bf8d290af5c104d88c413f40e84da0c4ce8",
- "sha256": "13axz8c4v4x43x2ami78kwaj6cpmyqykapj94mqrr3b5qzms502b"
+ "commit": "d26bfaaf231a801f7bccf4c5edb51a521ddb7694",
+ "sha256": "19hmdfrdwiqpsamxsh0zixhgmbkm5pw7p4y4rn0z4k3k0spxajx5"
},
"stable": {
"version": [
@@ -32113,6 +32795,29 @@
"sha256": "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f"
}
},
+ {
+ "ename": "flatbuffers-mode",
+ "commit": "abb03905163b2e277a396b0cf13886c59d3ddbd7",
+ "sha256": "1v4443p69zfsnb2a9x2g97kss21z7yzdx4c13jlyr73066gk67nc",
+ "fetcher": "github",
+ "repo": "Asalle/flatbuffers-mode",
+ "unstable": {
+ "version": [
+ 20200822,
+ 957
+ ],
+ "commit": "c0e9dc220db5f08410f40becf03531938484cb6c",
+ "sha256": "0dahs0q004pgalxrll1f8995q1ws358fk87a1jkm3fazl97p7gx4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "commit": "1b563b450e5353797083bcb03ab02f456e9a7361",
+ "sha256": "17g7y2nzhdwzck63miks4kn2w1nlari0qkc5v6lc4ksiaacispfb"
+ }
+ },
{
"ename": "flatfluc-theme",
"commit": "de15ce71674965c5e0a8564ae2e640bc05dbd589",
@@ -32220,27 +32925,27 @@
"repo": "plandes/flex-compile",
"unstable": {
"version": [
- 20200506,
- 1309
+ 20201110,
+ 122
],
"deps": [
"buffer-manage",
"dash"
],
- "commit": "dc6d920b477fe96a71bc37d593beef5ae8b2ae7e",
- "sha256": "1vcpb0bnklq89vgynnpfs4dmjacaajrzkasgwzix7q4qfzcbid9n"
+ "commit": "fdc8bb4d4030abd678d85be153f7849723e0601d",
+ "sha256": "047nl793p4nimw12hplmpvklbz4wgq1ii7z0jz7yip73sb69dwbq"
},
"stable": {
"version": [
0,
- 5
+ 6
],
"deps": [
"buffer-manage",
"dash"
],
- "commit": "29caf6573eb9bb730a851dec2a234a7cfe912a13",
- "sha256": "17s1v4xwgq98jfa3i57dbmy9ls29xsdhp5ng7bz46dhgmkrksbj5"
+ "commit": "9b09f830897e323b155ef857961ef838fdcf98b9",
+ "sha256": "17dv0zjma0h62p7nhshb63sigg8nyxhj98dknxjdrq0kgzziqfwi"
}
},
{
@@ -32266,14 +32971,15 @@
"repo": "wanderlust/flim",
"unstable": {
"version": [
- 20200303,
- 319
+ 20201117,
+ 825
],
"deps": [
- "apel"
+ "apel",
+ "oauth2"
],
- "commit": "f303f2f6c124bc8635add96d3326a2209749437b",
- "sha256": "08gxrpzxxfgbxznvpj00bjvh8l7afg2h2vaj6iasis9724f3mgl6"
+ "commit": "068b35e863be9245e717e79def55f93580188bc8",
+ "sha256": "00jkappcri9y9yx35pg1gm1x81qmybkisc06rl4zxi9w76ch4rkk"
}
},
{
@@ -32365,11 +33071,11 @@
"repo": "an-sh/flow-minor-mode",
"unstable": {
"version": [
- 20191214,
- 1309
+ 20200905,
+ 1730
],
- "commit": "5db3936d9eba8ccb2beca476afc84675b7b161ca",
- "sha256": "1rnihrhkr1xpwsl6c4cgg75slsqs31bckrlkgw1252ihpl9laa6p"
+ "commit": "804217a15a28f6918fba93c91d495ed7d50b0495",
+ "sha256": "0a4pbk5bx4l2hsqafpqqaz96bw1ffig2yjz16mkgd6zf41rw70la"
},
"stable": {
"version": [
@@ -32388,14 +33094,14 @@
"repo": "PositiveTechnologies/flower",
"unstable": {
"version": [
- 20190215,
- 1746
+ 20201022,
+ 1904
],
"deps": [
"clomacs"
],
- "commit": "6ef1affa2d7090714ccc4494823de28cfc11da35",
- "sha256": "1dp3g52j1i49bv802g27b7yszpxz0i28i4j74qp39qlld3k0gys0"
+ "commit": "0d5dd8b9b844adab1a1b7a9641daa9e98918712c",
+ "sha256": "0d2vl8lclwcn03p4ch0alb5ib0hbjp1ry5g3mkchd0pzwx6wwsrz"
},
"stable": {
"version": [
@@ -32433,11 +33139,11 @@
"repo": "amake/flutter.el",
"unstable": {
"version": [
- 20200718,
- 1434
+ 20201202,
+ 138
],
- "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96",
- "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s"
+ "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e",
+ "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh"
}
},
{
@@ -32455,8 +33161,8 @@
"flutter",
"flycheck"
],
- "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96",
- "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s"
+ "commit": "696228a619f6078b16f9f77071112f6ad2a25c4e",
+ "sha256": "0c39jgxykl1z74r0q7xiamwcnh6slidxrwg2f8ksdvyppgnqldwh"
}
},
{
@@ -32491,8 +33197,8 @@
"deps": [
"cl-lib"
],
- "commit": "17f5c9cb2af18aa6f52910ff4a5a63591261ced5",
- "sha256": "1zny29byq08vic9pzxfkchdary7dsk9ygc1lcb8drai4kd9g5jk8"
+ "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255",
+ "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv"
},
"stable": {
"version": [
@@ -32522,8 +33228,8 @@
"cl-lib",
"flx"
],
- "commit": "17f5c9cb2af18aa6f52910ff4a5a63591261ced5",
- "sha256": "1zny29byq08vic9pzxfkchdary7dsk9ygc1lcb8drai4kd9g5jk8"
+ "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255",
+ "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv"
},
"stable": {
"version": [
@@ -32566,8 +33272,8 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20200610,
- 1809
+ 20201105,
+ 423
],
"deps": [
"dash",
@@ -32575,8 +33281,8 @@
"pkg-info",
"seq"
],
- "commit": "c02cd773dded0215f9417ec04dfe8dabda63ef43",
- "sha256": "15w2b98zylppbfvy653i3a5jrxqvbrz8lqs4pzb39w2mbf8nxibx"
+ "commit": "79c9245ee0bd1722d41c865fef69aa2b1ac08fde",
+ "sha256": "1rmyr04fikdplc3f1wybw8hqagcwhi5ld30a6aa2fm83iamyxzpf"
},
"stable": {
"version": [
@@ -32652,6 +33358,24 @@
"sha256": "1g1m7pm84mkmjx7hdspb5k6n8aqphphxb5gya725qy1wqi950jqz"
}
},
+ {
+ "ename": "flycheck-aspell",
+ "commit": "bdb8a8a66ea40c3d75ea4ab92410b742a289234a",
+ "sha256": "1wmk8an076f5cqxppsdd743p3033pvjbw7kkj5s6wq599my2a5hy",
+ "fetcher": "github",
+ "repo": "leotaku/flycheck-aspell",
+ "unstable": {
+ "version": [
+ 20200830,
+ 2357
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7",
+ "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j"
+ }
+ },
{
"ename": "flycheck-ats2",
"commit": "2d3605bdc402e6b13f53910eafb7f1428a5f749f",
@@ -32696,15 +33420,15 @@
"repo": "flycheck/flycheck-cask",
"unstable": {
"version": [
- 20191030,
- 2253
+ 20200926,
+ 1502
],
"deps": [
"dash",
"flycheck"
],
- "commit": "3457ae553c4feaf8168008f063d78fdde8fb5f94",
- "sha256": "0fw5ikifp0n8jjkcg328hg1sklsgd7b8bsd538dvymk6qhx223zc"
+ "commit": "4b2ede6362ded4a45678dfbef1876faa42edbd58",
+ "sha256": "0fzcknz2gicpx5rqf8qdxiy1g2kppy2qzsgszxm28mbahf0913bb"
},
"stable": {
"version": [
@@ -32803,14 +33527,14 @@
"repo": "ch1bo/flycheck-clang-tidy",
"unstable": {
"version": [
- 20191030,
- 814
+ 20201115,
+ 1232
],
"deps": [
"flycheck"
],
- "commit": "2ae5542960785604a2974548f89e10407e2ccfc1",
- "sha256": "0gpvavwmb4zp5c5b8z60jcsza0zsb29hsg4sapp9d35hk3ranbx5"
+ "commit": "f9ae7306bd6ca08b689b36c1e8f6f6b91d61db5f",
+ "sha256": "1akb41ndwqva34i059cyprsx9b8v3pxgvl082d36x86zplg06ssa"
},
"stable": {
"version": [
@@ -32853,26 +33577,26 @@
"repo": "borkdude/flycheck-clj-kondo",
"unstable": {
"version": [
- 20200414,
- 1444
+ 20201102,
+ 1128
],
"deps": [
"flycheck"
],
- "commit": "5472c26ffdf754a0661357564874ffd4f8598805",
- "sha256": "0nb88mil1nlhv0nalswl3xwndzz91yah52zpri2jfbyvivshpfm4"
+ "commit": "a558bda44c4cb65b69fa53df233e8941ebd195c5",
+ "sha256": "1i8nf2ip0gag3f3p3fh7p4iccdyydzf523r762c66vrixvr5syl9"
},
"stable": {
"version": [
0,
0,
- 2
+ 3
],
"deps": [
"flycheck"
],
- "commit": "353e3481a20fbd577ad79db8bbc6113ce179c195",
- "sha256": "1xgvz2mdacyr7jszrpxs9lm30y0p72ahin98lr385gvsa8gknmhm"
+ "commit": "a558bda44c4cb65b69fa53df233e8941ebd195c5",
+ "sha256": "1i8nf2ip0gag3f3p3fh7p4iccdyydzf523r762c66vrixvr5syl9"
}
},
{
@@ -33161,15 +33885,15 @@
"repo": "atilaneves/flycheck-dmd-dub",
"unstable": {
"version": [
- 20180625,
- 1635
+ 20200824,
+ 852
],
"deps": [
"f",
"flycheck"
],
- "commit": "d7df2895d7d27cc39916816e3c32a60ce0e1d2d9",
- "sha256": "11p1r8gfii7mbh65nrm5hzrz50bmfgx5c4a0zmy6wr219syiggnl"
+ "commit": "39f7fc3f80ea7567a49012d235d22cf640fb0dfa",
+ "sha256": "12vcf4lrpj852lygpz8533m2h8zf54xs05gna2izigj7jqhmqy2y"
},
"stable": {
"version": [
@@ -33485,28 +34209,28 @@
"repo": "jcs-elpa/flycheck-grammarly",
"unstable": {
"version": [
- 20200720,
- 951
+ 20201028,
+ 647
],
"deps": [
"flycheck",
"grammarly"
],
- "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96",
- "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy"
+ "commit": "64e8ffc0ddf05586398a49ae2ad5704cae6eb4c8",
+ "sha256": "1yd95pc00q838af9mwmifwh0ncbndv7jzyqi5l26jxv3zbhmkdq1"
},
"stable": {
"version": [
0,
- 1,
- 5
+ 2,
+ 3
],
"deps": [
"flycheck",
"grammarly"
],
- "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96",
- "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy"
+ "commit": "64e8ffc0ddf05586398a49ae2ad5704cae6eb4c8",
+ "sha256": "1yd95pc00q838af9mwmifwh0ncbndv7jzyqi5l26jxv3zbhmkdq1"
}
},
{
@@ -33517,15 +34241,15 @@
"repo": "flatwhatson/flycheck-guile",
"unstable": {
"version": [
- 20200721,
- 103
+ 20201202,
+ 509
],
"deps": [
"flycheck",
"geiser"
],
- "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02",
- "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5"
+ "commit": "e46d6e5453dd7471309fae6549445c48e6d8f340",
+ "sha256": "12fp99ccshp57bkr9snwqj4bgg356d324fggpxhg0aj7qjgci7fn"
},
"stable": {
"version": [
@@ -33548,8 +34272,8 @@
"repo": "flycheck/flycheck-haskell",
"unstable": {
"version": [
- 20200218,
- 753
+ 20200927,
+ 1603
],
"deps": [
"dash",
@@ -33558,8 +34282,8 @@
"let-alist",
"seq"
],
- "commit": "23cfb9387faf6f70b421bb4c11b6847f0db38dfc",
- "sha256": "0s36fcqvmi3kmvhmmb0vrbgjkxjpx9wkj343f0rjjz1rh4b3n7qv"
+ "commit": "f04842252babd37c0ac60e069272a3477b538332",
+ "sha256": "1icvbc3f8mfpm1p4s7qcvkl5q5p021jjinmbc5js46xgsl3bjkr6"
},
"stable": {
"version": [
@@ -33841,8 +34565,8 @@
"flycheck",
"keg"
],
- "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
- "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540",
+ "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250"
}
},
{
@@ -34065,26 +34789,26 @@
"repo": "GyazSquare/flycheck-objc-clang",
"unstable": {
"version": [
- 20191116,
- 1015
+ 20201003,
+ 1053
],
"deps": [
"flycheck"
],
- "commit": "683d52e7bc3aeabd966c546a1d835d4c7191509b",
- "sha256": "0aymv9y06gzkh1m0jl693wsqvbh3cc5fp5z2yprmqzc98w1lh8bs"
+ "commit": "cea2b5f58da85a53a846da7e12de32fc146b58be",
+ "sha256": "09qvg74fyfbhsi748vv4kl7b7vbnc224ark5vllm1ldjhnj2dq19"
},
"stable": {
"version": [
4,
0,
- 0
+ 1
],
"deps": [
"flycheck"
],
- "commit": "683d52e7bc3aeabd966c546a1d835d4c7191509b",
- "sha256": "0aymv9y06gzkh1m0jl693wsqvbh3cc5fp5z2yprmqzc98w1lh8bs"
+ "commit": "5efd0a929cefacbe1020fe1a80d27630a619a165",
+ "sha256": "10cqqy78jfsmqx6m8i0xfm9iwfjffaf1c29c8918bc9hw813gpaq"
}
},
{
@@ -34228,15 +34952,15 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20200411,
- 531
+ 20201126,
+ 603
],
"deps": [
"flycheck",
"phpstan"
],
- "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
- "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
+ "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a",
+ "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh"
},
"stable": {
"version": [
@@ -34392,15 +35116,47 @@
"repo": "alexmurray/flycheck-posframe",
"unstable": {
"version": [
- 20200817,
- 412
+ 20201122,
+ 2307
],
"deps": [
"flycheck",
"posframe"
],
- "commit": "c928b5b5424fe84a0b346e28bd7d461c80b27482",
- "sha256": "1prjqqhzzaznbsysdipgvcinl3zkbgf19rb061h5mrqbgjw1l8f4"
+ "commit": "66b73ddb93b357fe9b849d2aa14d5cc9e89e9ffd",
+ "sha256": "0hggigwbpcq4w5nrjhp8g7vahl9zdixwrhga8ag8zvrdfr0g1cym"
+ }
+ },
+ {
+ "ename": "flycheck-projectile",
+ "commit": "2760b15caa9b23c344ad9a6685fd6994110cba36",
+ "sha256": "1xpl0p07m95gh187jikiz850396h388d24mg97zr6sa6krq8vv55",
+ "fetcher": "github",
+ "repo": "nbfalcon/flycheck-projectile",
+ "unstable": {
+ "version": [
+ 20201031,
+ 1952
+ ],
+ "deps": [
+ "flycheck",
+ "projectile"
+ ],
+ "commit": "ce6e9e8793a55dace13d5fa13badab2dca3b5ddb",
+ "sha256": "0d0y27k1nzj0clzsw8hnlkgsd5pc05kifmqkr64q50fz4kvg4zx7"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
+ ],
+ "deps": [
+ "flycheck",
+ "projectile"
+ ],
+ "commit": "ce6e9e8793a55dace13d5fa13badab2dca3b5ddb",
+ "sha256": "0d0y27k1nzj0clzsw8hnlkgsd5pc05kifmqkr64q50fz4kvg4zx7"
}
},
{
@@ -34461,14 +35217,14 @@
"repo": "msherry/flycheck-pycheckers",
"unstable": {
"version": [
- 20200807,
- 610
+ 20200828,
+ 1814
],
"deps": [
"flycheck"
],
- "commit": "055830b67cd0f0d7196a5b71bd5cce3197a557a7",
- "sha256": "1zw6993a8l7yf3j8dbagmj051m1z8cdax2pzm0l2p2dxvkm0h4s2"
+ "commit": "e8ce874eea4bba13aead8eb8e0262e94fb51f25e",
+ "sha256": "0i98viqm5plifaw3qdf2sxnk70l32qnkr82gl6j561vqhycxjq40"
},
"stable": {
"version": [
@@ -34565,8 +35321,8 @@
"flycheck",
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -34624,28 +35380,28 @@
"repo": "stan-dev/stan-mode",
"unstable": {
"version": [
- 20200221,
- 2025
+ 20200830,
+ 1032
],
"deps": [
"flycheck",
"stan-mode"
],
- "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
- "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
},
"stable": {
"version": [
10,
- 1,
+ 2,
0
],
"deps": [
"flycheck",
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
}
},
{
@@ -34718,26 +35474,26 @@
"repo": "GyazSquare/flycheck-swift3",
"unstable": {
"version": [
- 20191116,
- 1113
+ 20201003,
+ 916
],
"deps": [
"flycheck"
],
- "commit": "62c93add8ff65d335f6ef8a3123d2d4f53339df5",
- "sha256": "0jh8mb9zscj7bzvis6fplc142s7iqy6hhhwfy2lz34yp4n6ap1p0"
+ "commit": "3fa1615dd67c53b8ce69b8d3beaf412162b89f65",
+ "sha256": "1ss7s9s43wy90vjrck3i710blmarys1w4kqs57190nk1igay0lna"
},
"stable": {
"version": [
3,
1,
- 0
+ 1
],
"deps": [
"flycheck"
],
- "commit": "62c93add8ff65d335f6ef8a3123d2d4f53339df5",
- "sha256": "0jh8mb9zscj7bzvis6fplc142s7iqy6hhhwfy2lz34yp4n6ap1p0"
+ "commit": "35119a559206fd62e87018c605d4f302300e831d",
+ "sha256": "1m7jay1fvi2zljjd0j1ghc1n1cqpz4l8vw94jfywz4l8w0c9xbkh"
}
},
{
@@ -34991,8 +35747,8 @@
"let-alist",
"ycmd"
],
- "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477",
- "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv"
+ "commit": "c17ff9e0250a9b39d23af37015a2b300e2f36fed",
+ "sha256": "0amdz2ss953lm39yky1dv3zp20ig97mxsk7z81694bpxnhn4kxad"
},
"stable": {
"version": [
@@ -35009,6 +35765,21 @@
"sha256": "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"
}
},
+ {
+ "ename": "flymake-aspell",
+ "commit": "bdb8a8a66ea40c3d75ea4ab92410b742a289234a",
+ "sha256": "1q1yhnmybh9w6amwc6gn3ipp7r7mxcxvg1k04hwj7qxryv2f9ws7",
+ "fetcher": "github",
+ "repo": "leotaku/flycheck-aspell",
+ "unstable": {
+ "version": [
+ 20200902,
+ 2226
+ ],
+ "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7",
+ "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j"
+ }
+ },
{
"ename": "flymake-coffee",
"commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -35312,6 +36083,36 @@
"sha256": "0g6h09lz68b4dvqv5sksr7gkab0599fbm07xnc2mk01lzbas43b0"
}
},
+ {
+ "ename": "flymake-grammarly",
+ "commit": "a8a5e3f1d6b2976b0544ca23189f58486f2065f1",
+ "sha256": "08gqywxms7mn4xihj3sqm7kw02zjcfhxm0ldcvwaihjnkxmfrll4",
+ "fetcher": "github",
+ "repo": "jcs-elpa/flymake-grammarly",
+ "unstable": {
+ "version": [
+ 20201028,
+ 647
+ ],
+ "deps": [
+ "grammarly"
+ ],
+ "commit": "28efe445c91daa9a604d518f00cae6b1375179df",
+ "sha256": "05icajswb649g3d3qhj96dzz5zc9faf1hr93ni0039gqk312p48a"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 1
+ ],
+ "deps": [
+ "grammarly"
+ ],
+ "commit": "5e5dc903642d8b66f6400d0ac34ca08b836d8195",
+ "sha256": "14irzjkqjk1ylwwb1w148f1rs8rlhkmi57mplj2mkx9q5hf6v6dz"
+ }
+ },
{
"ename": "flymake-haml",
"commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -35498,14 +36299,26 @@
"repo": "turbo-cafe/flymake-kondor",
"unstable": {
"version": [
- 20200714,
- 646
+ 20200925,
+ 1539
],
"deps": [
"flymake-quickdef"
],
- "commit": "530bf3e6c401d17f6b4f784a1f2524d5ba2d3414",
- "sha256": "06adysd3q1gh92y0cdsnlmb588gdax85ad7pkmi324bixck5ggqx"
+ "commit": "72052b5ba827faf357608cf720a70221192a8282",
+ "sha256": "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 3
+ ],
+ "deps": [
+ "flymake-quickdef"
+ ],
+ "commit": "72052b5ba827faf357608cf720a70221192a8282",
+ "sha256": "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy"
}
},
{
@@ -35683,14 +36496,14 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20200415,
- 1637
+ 20201122,
+ 950
],
"deps": [
"phpstan"
],
- "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
- "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
+ "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a",
+ "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh"
},
"stable": {
"version": [
@@ -35705,6 +36518,24 @@
"sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1"
}
},
+ {
+ "ename": "flymake-proselint",
+ "commit": "481c3e415dd731b06747f8b2ee86ccc2536cfca2",
+ "sha256": "115x8syar7f3crw2pfdcmv60q92i9d270dxw0m251w3906rqhdj2",
+ "fetcher": "github",
+ "repo": "manuel-uberti/flymake-proselint",
+ "unstable": {
+ "version": [
+ 20200927,
+ 640
+ ],
+ "deps": [
+ "flymake-quickdef"
+ ],
+ "commit": "b94950301139846002d2020bc630440ff834bf24",
+ "sha256": "1zlbw4mj0l9p72gw03jrqmaakh7550ha02r3rmxrlqs6gjzqsd1f"
+ }
+ },
{
"ename": "flymake-puppet",
"commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f",
@@ -35904,11 +36735,11 @@
"repo": "federicotdn/flymake-shellcheck",
"unstable": {
"version": [
- 20200329,
- 2005
+ 20200921,
+ 2341
],
- "commit": "78956f0e5bb9c4d35989657a55929e8e3f5691e6",
- "sha256": "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix"
+ "commit": "060da4097c1caadc1eb1d6feac4deaedaadb6dc0",
+ "sha256": "021qmkysx8gmwxnxcx6izs1q1h66ncvrwlvpk1wsxw9lf9symm7c"
}
},
{
@@ -36021,11 +36852,11 @@
"repo": "d12frosted/flyspell-correct",
"unstable": {
"version": [
- 20200601,
- 944
+ 20200904,
+ 526
],
- "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
- "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
+ "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10",
+ "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619"
},
"stable": {
"version": [
@@ -36052,8 +36883,8 @@
"avy-menu",
"flyspell-correct"
],
- "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
- "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
+ "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10",
+ "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619"
},
"stable": {
"version": [
@@ -36084,8 +36915,8 @@
"flyspell-correct",
"helm"
],
- "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
- "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
+ "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10",
+ "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619"
},
"stable": {
"version": [
@@ -36109,15 +36940,15 @@
"repo": "d12frosted/flyspell-correct",
"unstable": {
"version": [
- 20200513,
- 708
+ 20201202,
+ 636
],
"deps": [
"flyspell-correct",
"ivy"
],
- "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
- "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
+ "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10",
+ "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619"
},
"stable": {
"version": [
@@ -36141,15 +36972,15 @@
"repo": "d12frosted/flyspell-correct",
"unstable": {
"version": [
- 20200204,
- 521
+ 20200828,
+ 629
],
"deps": [
"flyspell-correct",
"popup"
],
- "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
- "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
+ "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10",
+ "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619"
},
"stable": {
"version": [
@@ -36173,11 +37004,11 @@
"repo": "rolandwalker/flyspell-lazy",
"unstable": {
"version": [
- 20180224,
- 2106
+ 20201028,
+ 111
],
- "commit": "3ebf68cc9eb10c972a2de8d7861cbabbbce69570",
- "sha256": "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6"
+ "commit": "d57382cf06462931cb354f5630469425fce56396",
+ "sha256": "0ahq75izwjmkzdkj25k3iml76csgkqav912dnlairqsnc9il6bj8"
},
"stable": {
"version": [
@@ -36302,10 +37133,10 @@
},
{
"ename": "focus-autosave-mode",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "10cd1x5b1w7apgxd2kq45lv0jlj7az4zmn2iz4iymf2r2hancrcd",
+ "commit": "d58e591240caec7005d1c61f4cca82d5a6e95a4f",
+ "sha256": "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc",
"fetcher": "github",
- "repo": "Vifon/focus-autosave-mode.el",
+ "repo": "vifon/focus-autosave-mode.el",
"unstable": {
"version": [
20160519,
@@ -36414,11 +37245,11 @@
"repo": "jaalto/project-emacs--folding-mode",
"unstable": {
"version": [
- 20190524,
- 1632
+ 20200901,
+ 953
],
- "commit": "a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a",
- "sha256": "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z"
+ "commit": "8110b4137198aee816a6323d873b547864893da6",
+ "sha256": "00d5qyqz2hbyjbxh293g0k4k4wc5f4gzhy39j8dn7lfc98z4zajy"
}
},
{
@@ -36544,8 +37375,8 @@
20191004,
1850
],
- "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3",
- "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z"
+ "commit": "e086c59a14701cd041641b51c952fa704ee963df",
+ "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
}
},
{
@@ -36622,8 +37453,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20200725,
- 1419
+ 20201209,
+ 57
],
"deps": [
"closql",
@@ -36635,8 +37466,8 @@
"markdown-mode",
"transient"
],
- "commit": "feee7e2fce3f87f7aa113c5edcb1896127ee9d12",
- "sha256": "1nn73hxhp7rziwdnnvz6avn1gkax531f4l72sk0v4ywdwjhnnlgs"
+ "commit": "aef11e481988073a0b842ec1fbe40440540db8bd",
+ "sha256": "0pia5lgfjj04gyq2nvwkfjpwz6l9rrq58mh1j2ql61zzfpfpy46n"
},
"stable": {
"version": [
@@ -36667,20 +37498,20 @@
"url": "https://depp.brause.cc/form-feed.git",
"unstable": {
"version": [
- 20200527,
- 2152
+ 20201116,
+ 1108
],
- "commit": "fc06255e185d32b1616bd86b69b55c1daabbe378",
- "sha256": "05yqyp20bvfk5n1nqyffv1k8l1zl1bpz8q32kzqarm9fim2wv23n"
+ "commit": "26a52410db56fab9888b24b7622d74a2779c719d",
+ "sha256": "17xg7l6d509ngpdmx56z7mqr2iiyslyb3fhhlccifmnlxbvcr15g"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
- "commit": "eac6724c093458745e9ae0e37221077fa2ad0ff6",
- "sha256": "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2"
+ "commit": "7ae9703577d6d58026d0248d59c89e84f658824b",
+ "sha256": "10mcj4x2fjq0ikq9adkd72k9zp6caqib628bmj8d67wwabvzj6mk"
}
},
{
@@ -36691,15 +37522,14 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20200804,
- 1822
+ 20201123,
+ 839
],
"deps": [
- "cl-lib",
"language-id"
],
- "commit": "ccfff41a200e16e3644c2531e984959392e3341a",
- "sha256": "0wqq86gfilrg9jf9yls9wcxy926j44lvzafj92kdmmyzbas1nm9k"
+ "commit": "c4ef7a266838cd3598b6b84e49f2267bb8c64d56",
+ "sha256": "0bz32aca3kvnpbdfyzarh6wd7i0vwc1z6ighk3dbag4dmkk6l47s"
},
"stable": {
"version": [
@@ -36836,26 +37666,26 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20200811,
- 652
+ 20201126,
+ 716
],
"deps": [
"seq"
],
- "commit": "55be196ef20cdc276b3bde1a39444df1cc599f9b",
- "sha256": "14baj9ldssdb5vrc3fl7c7nhc2iff6gxa7v2flcjjnazfg87r3b2"
+ "commit": "d29675d585c12abfa39b8f736384382c7423667d",
+ "sha256": "0gj5zsa271zwbd8n8l6kkan4x3xxs952hdnr8fghc9sfdizd497k"
},
"stable": {
"version": [
3,
- 2,
- 2
+ 3,
+ 3
],
"deps": [
"seq"
],
- "commit": "1405217e69d055b869e804d33feca23cb602f759",
- "sha256": "0rwdwbw9cq8ljvbmgmz9izank8dqjki79l1bw127lli69fs72gyi"
+ "commit": "e46c5ce6b6d97493d73823deec088760446caaa3",
+ "sha256": "095nrkg2bap6rcg9hy3bh0nis4v2f8w8d9hnahkzsa3njlpqa4ka"
}
},
{
@@ -37125,8 +37955,8 @@
20200416,
1605
],
- "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146",
- "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn"
+ "commit": "968cb4580bbd7d23ee78e53152e30e0cdf0f5e41",
+ "sha256": "0v9yriw45rg12mz72gmhwi2mz19h6svh3dsw1fpbww4qcx4mnjvd"
},
"stable": {
"version": [
@@ -37155,14 +37985,14 @@
"friendly-tramp-path",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102",
+ "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399"
},
"stable": {
"version": [
0,
2,
- 3
+ 4
],
"deps": [
"cl-lib",
@@ -37170,8 +38000,8 @@
"friendly-tramp-path",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "1b1ba2033e59e5968380640280bd853701fbbb21",
+ "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs"
}
},
{
@@ -37182,28 +38012,28 @@
"repo": "p3r7/friendly-shell",
"unstable": {
"version": [
- 20200527,
- 830
+ 20200828,
+ 1218
],
"deps": [
"cl-lib",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102",
+ "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399"
},
"stable": {
"version": [
0,
2,
- 3
+ 4
],
"deps": [
"cl-lib",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "1b1ba2033e59e5968380640280bd853701fbbb21",
+ "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs"
}
},
{
@@ -37222,22 +38052,22 @@
"dash",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102",
+ "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399"
},
"stable": {
"version": [
0,
2,
- 3
+ 4
],
"deps": [
"cl-lib",
"dash",
"with-shell-interpreter"
],
- "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
- "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
+ "commit": "1b1ba2033e59e5968380640280bd853701fbbb21",
+ "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs"
}
},
{
@@ -37317,16 +38147,16 @@
"repo": "waymondo/frog-jump-buffer",
"unstable": {
"version": [
- 20200114,
- 1826
+ 20201117,
+ 1803
],
"deps": [
"avy",
"dash",
"frog-menu"
],
- "commit": "1eb289c9b2a4bbebb3065076750f54216ac9c718",
- "sha256": "0qlwjk3a13gb3glib9irgpyx94j933kflky7pbnrl17a53pnryrw"
+ "commit": "39aeb02f5a38f3637b5e1d0560b366daa131d421",
+ "sha256": "1zgzvcrybcx5vvvqhxxhridsfcjggcyb2kxzsmp6fmd4bdhd4crx"
}
},
{
@@ -37360,16 +38190,16 @@
"repo": "fsharp/emacs-fsharp-mode",
"unstable": {
"version": [
- 20200520,
- 1842
+ 20201208,
+ 1852
],
"deps": [
"dash",
"eglot",
"s"
],
- "commit": "3e41fe1391b64eefa66a8a02fce27a12a04e1e01",
- "sha256": "03ln0dmjkg4bnpabnw27vby3jqf40wzvs3znynqqqx7cn53vy5fp"
+ "commit": "848ab1578658b97844e671e4f6dbdbd0f67a52ca",
+ "sha256": "08nyxyxag86nv6cbj9kmyh28kb52h6wf2l1w5qlq9pb00d5ck7h0"
},
"stable": {
"version": [
@@ -37393,7 +38223,7 @@
"repo": "FStarLang/fstar-mode.el",
"unstable": {
"version": [
- 20200624,
+ 20201012,
2201
],
"deps": [
@@ -37404,8 +38234,8 @@
"quick-peek",
"yasnippet"
],
- "commit": "bd28cb8f25538e26287c76efbbc5ef7378d1fbc6",
- "sha256": "1jvvasin29bwxq7cmviv0431jb7p2gq3yh12pyf6f5zinsax97cp"
+ "commit": "3afbf04e4eb21af950cfdb727d8b808164fd9415",
+ "sha256": "1ks949zcqk3dqcxjv2lj9jyz6mnrvcgwg9iaa70lsb772lxza8wj"
},
"stable": {
"version": [
@@ -37435,8 +38265,8 @@
"deps": [
"cl-lib"
],
- "commit": "3fdb0325ca2a6d80e4111af43b1b166808022020",
- "sha256": "0kid3a0qq2qvzndbs1c69z30f2in7q7fzpv6yas84f8y5kkmk220"
+ "commit": "d78ae037780ee687b654ac0e8fc8f1b954493164",
+ "sha256": "0q5vff4mw77864igj5mqspdirc1q22rxa9sg7zcm9kskv8c4r4is"
},
"stable": {
"version": [
@@ -37499,14 +38329,14 @@
"repo": "tomterl/fullframe",
"unstable": {
"version": [
- 20170816,
- 1003
+ 20201022,
+ 939
],
"deps": [
"cl-lib"
],
- "commit": "2c4497f5d66898f5f4cbde3abe97402880e46c2c",
- "sha256": "0jnkri7d23hh392lfc3gwjlis4a0pgn0jpbhm4md94ap263yyylc"
+ "commit": "8cc4aebf4a1054812b34f9704c38c1616571078c",
+ "sha256": "13f1lhdsm2sx9h8k9iz3mv5xqfxkfwji2aa6855z0jwn8rqqzqsf"
},
"stable": {
"version": [
@@ -37589,14 +38419,14 @@
"repo": "diku-dk/futhark-mode",
"unstable": {
"version": [
- 20200627,
- 732
+ 20200823,
+ 1521
],
"deps": [
"cl-lib"
],
- "commit": "9db9fb81e08b6ded43a4eede5220644ce354060d",
- "sha256": "0hcwqsq65hlznsq2k5bviwzyh82sddfb28v5xna0016yphbdng2h"
+ "commit": "88e7bb1eefbe01f781cc4958bc0431fea90b7d93",
+ "sha256": "1srb3a7p0zgsjgbrdsyx7ql68ygg9h8y93781v4zjmzq4z9qfl8x"
}
},
{
@@ -37646,6 +38476,30 @@
"sha256": "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss"
}
},
+ {
+ "ename": "fuzzy-finder",
+ "commit": "e217226f37d9184b175d7e36902b4977fce8a5bf",
+ "sha256": "0irwkc59c66wqhr6vmmdczj678224lng4qjhw9yv4lz3dn06n5i3",
+ "fetcher": "github",
+ "repo": "10sr/fuzzy-finder-el",
+ "unstable": {
+ "version": [
+ 20200909,
+ 907
+ ],
+ "commit": "c19235a35db076eebb5ad31fb42daf6520620f6d",
+ "sha256": "0nwbvgj2z15g88d9mgbc408xhsf3wx8r1ky70cgn7kqfv4wvd25n"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "commit": "f459ee206cbb324c13fe939656b0b9d3a4c3c0b7",
+ "sha256": "0ziziylcaahq491v5m1a8pbrwrifksaj1374rnfvp9d5d9w02lf7"
+ }
+ },
{
"ename": "fvwm-mode",
"commit": "ac39130f8a031d6fe7df4411a5f94f2cdf652449",
@@ -37746,11 +38600,11 @@
"repo": "bling/fzf.el",
"unstable": {
"version": [
- 20180619,
- 145
+ 20201201,
+ 1842
],
- "commit": "521d18933cb586337c4e34281bdc71ac07202c98",
- "sha256": "0fpzjslbhhwvs4nh5dxj9cyxyiw6n8qmg76mvq73k5mc8pk7d4ir"
+ "commit": "5d776acca230d781ba7647185b730c686622f876",
+ "sha256": "0rikrpvgnj1zlcr1fgcmi5xqmhr5xsdpphnqp947jr47q70v0qxx"
},
"stable": {
"version": [
@@ -37880,35 +38734,50 @@
"repo": "koral/gcmh",
"unstable": {
"version": [
- 20200409,
- 1456
+ 20201116,
+ 2251
],
- "commit": "b1bde5089169a74f62033d027e06e98cbeedd43f",
- "sha256": "0k0gh1dr3hipg73mpgkw6hlg27c7c5r8aa61p4vj2rpmf6k90pc5"
+ "commit": "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9",
+ "sha256": "0yh1ap8phv3x44rp0yr6z884xqw2apanbx4c0acqglvj0gaaqx25"
+ }
+ },
+ {
+ "ename": "gcode-mode",
+ "commit": "b7e68005a164c01004ba19c3a8c2aafe81d5f6f4",
+ "sha256": "0r4say2vj2m1dwal00qjha5d0lyshv69cy05frzv6n37wva45k38",
+ "fetcher": "gitlab",
+ "repo": "wavexx/gcode-mode.el",
+ "unstable": {
+ "version": [
+ 20201011,
+ 1745
+ ],
+ "commit": "2192ec743b49d9adfb9116ab410b195725dc886a",
+ "sha256": "0q53795cprhj8g0dkh2njxmpgpgm7a66g4kqdh179m3xn1kinw50"
}
},
{
"ename": "gdscript-mode",
- "commit": "b4414989beecd113ec405116402a5232ac32cb85",
- "sha256": "1clakvkjifqhi847p6zrxxfkr5s3hv33qsh7r96w04pihyd38q9l",
+ "commit": "0694d21374661c7ff94202468d57ddd438c0973d",
+ "sha256": "0jisqiyxdii1kl0kji0gj50ymviq0d7f2xqgjkh08ygdajvpz6cq",
"fetcher": "github",
- "repo": "GDQuest/emacs-gdscript-mode",
+ "repo": "godotengine/emacs-gdscript-mode",
"unstable": {
"version": [
- 20200726,
- 1721
+ 20201026,
+ 1319
],
- "commit": "7aea87bd7b3cd14b1a767e7d835cee896722cd29",
- "sha256": "1cq2k054ngqwanayy7fgkqdb5fq6xcqdglpyxngqmh765lyb7nrb"
+ "commit": "75fe658ab88adbec95f226d24fd9d41c33c68dd5",
+ "sha256": "1b5k5wrlgsmvlfxy8whc26b462vyqqyk6vgsim00nn8ds0p3810n"
},
"stable": {
"version": [
1,
- 2,
+ 4,
0
],
- "commit": "36c92dff1587d7c3c7ff2cd02d8e158cbed55215",
- "sha256": "02by4bvdayldbjlz6jkp36m5rgcy2h5bwhqx2cj7wma6xf6cw3lf"
+ "commit": "ef7a7f2789d0708a624a93b0f7037dd057cd8532",
+ "sha256": "09q0himrz7a6xgz0jmcl85qc5xhk5fwi6d2vw1n8qaiavm96ksdy"
}
},
{
@@ -37996,11 +38865,11 @@
"repo": "jaor/geiser",
"unstable": {
"version": [
- 20200714,
- 1210
+ 20201202,
+ 1922
],
- "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2",
- "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08"
+ "commit": "cd00be69b26e6fd748b183d127d8b6f4c91ba622",
+ "sha256": "0zxaayww9h3alc1h5zlpan28wgva561b4rlb8xk6s6gznpkc3gsp"
},
"stable": {
"version": [
@@ -38061,17 +38930,17 @@
},
{
"ename": "gemini-mode",
- "commit": "2cc0e9039171064cd0fb37b3eb5324c91a88ef7a",
- "sha256": "1mbhv034jk4bwi58z6jc2r4d828v0ir3jwqpgi2mfjnjxk5x5ga5",
+ "commit": "4fd0ef91c2a4259d6e4e8833d687b6aeae14e65a",
+ "sha256": "0a0g3rpvcixnch0903jggffv2wa4s9j91mfsga4yrvwlwzswz6rd",
"fetcher": "git",
- "url": "http://git.carcosa.net/jmcbray/gemini.el.git",
+ "url": "https://git.carcosa.net/jmcbray/gemini.el.git",
"unstable": {
"version": [
- 20200813,
- 1424
+ 20201120,
+ 2054
],
- "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24",
- "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd"
+ "commit": "3b4bcc568ca9e537118f3b803f4218b0d57fee0b",
+ "sha256": "1lc2pgqjyanfwfykrg8a9d5kra4zihdvr612z9x927r16cj470ac"
}
},
{
@@ -38151,15 +39020,15 @@
"repo": "gonewest818/geolocation.el",
"unstable": {
"version": [
- 20200308,
- 2324
+ 20200317,
+ 1559
],
"deps": [
"deferred",
"request-deferred"
],
- "commit": "83ab28e64bc067016b5344dffe93e380e9807e9c",
- "sha256": "0ns7pgi4gbpfb192n9fdhv12zflq74jdmqc518rgh7hqlyp26mf4"
+ "commit": "bc7848832eb0352e3a71f4b9d89d917fe12d18be",
+ "sha256": "1rmnpw5jn06ajij3wq2dfk4blklb16j9gwdncr0c38xsnxm07nv4"
},
"stable": {
"version": [
@@ -38207,8 +39076,8 @@
"repo": "thisch/gerrit.el",
"unstable": {
"version": [
- 20200727,
- 2006
+ 20201114,
+ 420
],
"deps": [
"dash",
@@ -38216,8 +39085,8 @@
"magit",
"s"
],
- "commit": "eb4b182e493a6d5d3e94c9ff5abe0a0206b03c7c",
- "sha256": "16v043avd9sm0rq7951x7045zfxhiadq2q056grkjgcpy2id45lw"
+ "commit": "4c4fbd2b1b38202f701081ea8e892bd8e1a9042f",
+ "sha256": "1j62kwkpi5v84dvv0amacg1kgxh0asbwfq7iygrh6x3xlj3pg288"
}
},
{
@@ -38303,8 +39172,8 @@
20190320,
2208
],
- "commit": "4d9000034d352cd983ae6626f560e434d0b3e9ca",
- "sha256": "1h89prfxdr50drsira3qqvh1mb7v09p4w8jpb7aapq2jl5fl2knc"
+ "commit": "1c43705753e639b34b58c9bf961a80b6610a7109",
+ "sha256": "15hv3d4wc32nidi0pl73i2v673s2lipzsy8llqy6asls2y268qgz"
},
"stable": {
"version": [
@@ -38505,28 +39374,28 @@
"repo": "magit/ghub",
"unstable": {
"version": [
- 20200801,
- 815
+ 20201208,
+ 2056
],
"deps": [
"let-alist",
"treepy"
],
- "commit": "942e7bdabc4b938a0535530c26eb6548504fca24",
- "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5"
+ "commit": "a72a171b3c686b98ea2b5db11ad159b0febbf545",
+ "sha256": "02dh8wyq4ikix7awvib3h2imp6bq25l49yz9n7sjzcvc7b4wf92n"
},
"stable": {
"version": [
3,
- 4,
- 1
+ 5,
+ 0
],
"deps": [
"let-alist",
"treepy"
],
- "commit": "942e7bdabc4b938a0535530c26eb6548504fca24",
- "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5"
+ "commit": "47948b2482517d25d7412df34ae8be0a9f475f37",
+ "sha256": "0lqphkbxrayrcwkwkghfw39wwmc87fdayhl3fy790z7367ilsd1v"
}
},
{
@@ -38568,11 +39437,11 @@
"repo": "Ambrevar/emacs-gif-screencast",
"unstable": {
"version": [
- 20200327,
- 1332
+ 20201110,
+ 1613
],
- "commit": "e39786458fb30e2e9683094c75c6c2cef537d9c4",
- "sha256": "135mkyi8kqsxs0a3qa20splvx4xhl8k91s48yy6gwlz6m81vwvb5"
+ "commit": "1145e676b160e7b1e5756f5b0f30dd31de252e1f",
+ "sha256": "0nn5wqsk6czx3ca917bk7c4n16rs59n5l0925fdklhp532hhgd2r"
},
"stable": {
"version": [
@@ -38735,20 +39604,20 @@
"repo": "ryuslash/git-auto-commit-mode",
"unstable": {
"version": [
- 20200801,
- 748
+ 20200828,
+ 653
],
- "commit": "d4fd94320610100f23de083493d12de3324304b5",
- "sha256": "180rzh53hrd374nf96cz8n6brxvi68fgss21ic5r623hkczhi73b"
+ "commit": "a6b6e0fa183be381463e2b44ef128db1b6c4234b",
+ "sha256": "1vdmrl6qkan3n56idgj2rm4879xc0a9s4w79fpih3w5b6r0cgaj7"
},
"stable": {
"version": [
4,
- 6,
+ 7,
0
],
- "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0",
- "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372"
+ "commit": "df07899acdb3f9c114b72fdab77107c924b3172c",
+ "sha256": "0gpib57f7xza04g3iyihw5v15hb7pncqsmvyggib902yvcxlkvqf"
}
},
{
@@ -38765,8 +39634,8 @@
"deps": [
"s"
],
- "commit": "643c8c292c128ac3d0c4d80f2d4a2e19db711e6c",
- "sha256": "0k7blj6s31llvznwsj94kwpnahb6ga58vkx6542ibdmcgdb59n1d"
+ "commit": "67e38c659c918e98642171ba3f385a15182347f4",
+ "sha256": "1xbxm3fwfzpvkbw9h0bgrb9wxffzd1j1qj7ryzrd7bqr1p1zav2s"
},
"stable": {
"version": [
@@ -38856,16 +39725,16 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200701,
- 2112
+ 20201115,
+ 2313
],
"deps": [
"dash",
"transient",
"with-editor"
],
- "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
- "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
+ "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac",
+ "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1"
},
"stable": {
"version": [
@@ -38889,8 +39758,8 @@
"repo": "emacs-stuff/git-commit-insert-issue",
"unstable": {
"version": [
- 20191008,
- 950
+ 20201008,
+ 955
],
"deps": [
"bitbucket",
@@ -38899,25 +39768,24 @@
"projectile",
"s"
],
- "commit": "51c863d9ba21bf11f6681b54be19b4c04d50d1ba",
- "sha256": "16m3669vm7j0ksfxvp8xqli70z8smb2xlf4cbzgjkfsl3kffbww6"
+ "commit": "aff85933e35eb36df28720d21f2c5b0a21e3646e",
+ "sha256": "1xms52rd8si208vlxp00asz5bs8s7ax1mywa1b1856gil0ygr7qh"
},
"stable": {
"version": [
0,
3,
- 1
+ 2
],
"deps": [
"bitbucket",
"github-issues",
"gitlab",
- "helm",
"projectile",
"s"
],
- "commit": "5f08c17bf93b17915415d435ee41923d924fe20b",
- "sha256": "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"
+ "commit": "a3cc128595eb6040713da308ac53c2d20259ca14",
+ "sha256": "0wxb5dqwvy82vgx6kl8yfg6sn0fi9mi6ghx93hxvayjb6x74p5c3"
}
},
{
@@ -38935,6 +39803,24 @@
"sha256": "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx"
}
},
+ {
+ "ename": "git-grep",
+ "commit": "0878cf8cccf1a8808be3b99cda443972d9f57c60",
+ "sha256": "0jfvs2bmsmjy19vg2ilillj1wkng6psaxr1dvy7nxy929gzp4vcl",
+ "fetcher": "github",
+ "repo": "tychoish/git-grep.el",
+ "unstable": {
+ "version": [
+ 20200920,
+ 1751
+ ],
+ "deps": [
+ "projectile"
+ ],
+ "commit": "12ff6045e9b6aa42f98abd4ddc44d670268a0849",
+ "sha256": "0c1hfh62vdi9ly530crsz2aghapf0s2z9i3xdvfyyynr1gqs3mis"
+ }
+ },
{
"ename": "git-gutter",
"commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
@@ -38943,22 +39829,19 @@
"repo": "emacsorphanage/git-gutter",
"unstable": {
"version": [
- 20200326,
- 1814
+ 20201203,
+ 500
],
- "commit": "2c3242116a42dbbe30fc0844d1ec3c41074cdaba",
- "sha256": "18gbns5mjwr5kirgpzjp4iqmj130qa5m1hs4phx1057qdq11ihrr"
+ "commit": "56308dc1a1196583791cb24aa86b2669d343b9f3",
+ "sha256": "1yad6pyskc28hcva9v9v7d6lxp2dg3j0zvmp9pv2qs1105l590ic"
},
"stable": {
"version": [
0,
- 90
+ 91
],
- "deps": [
- "cl-lib"
- ],
- "commit": "a786465bd527c13e32c73c02b95086560c1be878",
- "sha256": "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5"
+ "commit": "570067d4f4e54ef6003fe442de5536806ff19e98",
+ "sha256": "0zc9f73app1d7j4yb10sy4xidh5252ncyxlvr5kh0kiqk88ck6j9"
}
},
{
@@ -39007,8 +39890,8 @@
"fringe-helper",
"git-gutter"
],
- "commit": "da19a474137876b29b5658ee7e9ae366f2b65c1d",
- "sha256": "015qaaap2cvy4cxl31r27z48zbgd9vyj6rac9yv3caw5zsvzlkiv"
+ "commit": "4f19866494fa1debfa319382913e39a153431634",
+ "sha256": "02gbpgizlsmip2xwn79mb6yhdms38m589kcd6m95izj4ycyhwmdv"
},
"stable": {
"version": [
@@ -39136,20 +40019,20 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20200721,
- 2250
+ 20201124,
+ 155
],
- "commit": "cbaf7033edad8d4712b6e7dc11cad979c6a002de",
- "sha256": "074xqp1apcrmnh2cb9m60gaq78hzybyg5sr09n37ka0sw447rp15"
+ "commit": "151df174a662ae6711f26f160e7759ea014f1a3c",
+ "sha256": "1h28gn5bvjpxqapd66dzlf1gp1nwpd5iajvv2fbldmrlxrilrcz6"
},
"stable": {
"version": [
0,
8,
- 0
+ 1
],
- "commit": "2f61413bec5d94b068140a764ba8c2a732ac8d58",
- "sha256": "1cj04nzqxwvi1f97y36n311nayj31y3iy7kysb31nlfn19y2g4wj"
+ "commit": "9ac2ed9c73176b8bd014fdbb1c500f44fa02e7de",
+ "sha256": "1rs7r8ig6xg0r2gcbya0dgbhmwxrhijfz4z5ayw57c2wqq5p6np7"
}
},
{
@@ -39160,14 +40043,14 @@
"repo": "emacsorphanage/git-messenger",
"unstable": {
"version": [
- 20200321,
- 2337
+ 20201202,
+ 1637
],
"deps": [
"popup"
],
- "commit": "2d64e62e33be9f881ebb019afc183caac9c62eda",
- "sha256": "1w23qjc740bxj95gdzjcy3qldfmx4y19dhcrzh83l9wfz4y566c7"
+ "commit": "a69b6f359bd34b77335619103c82cef07ecdbc7c",
+ "sha256": "0wbinfl3jvkpcky7j6rvw66dnw1k2yjb7jq41kxqnsb5l6qllkaw"
},
"stable": {
"version": [
@@ -39601,17 +40484,18 @@
"repo": "charignon/github-review",
"unstable": {
"version": [
- 20200314,
- 438
+ 20201012,
+ 40
],
"deps": [
+ "a",
"dash",
"deferred",
"ghub",
"s"
],
- "commit": "fab440aeae4fbf6a8192fd11795052e9eb5d27d1",
- "sha256": "19kk55r0qixmvw1q80x3rnvcssrq64k5b5ixp8wjzpg6h65s9vk9"
+ "commit": "db723740e02348c0760407e532ad667ef89210ec",
+ "sha256": "16d09z1p9ljpc6h2kj30qk6hrs5zgixxj7qrgi3i3kc5djcy2km0"
}
},
{
@@ -39823,6 +40707,36 @@
"sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798"
}
},
+ {
+ "ename": "gitlab-pipeline",
+ "commit": "9cc5450e4dd1ea31f719ba6b48d68130cc7ea0ef",
+ "sha256": "1i1dp3qn6yasqs4ay7h3f43spwk9rrqjr411zdvpn6c0hmcs5vfs",
+ "fetcher": "github",
+ "repo": "TxGVNN/gitlab-pipeline",
+ "unstable": {
+ "version": [
+ 20200903,
+ 201
+ ],
+ "deps": [
+ "ghub"
+ ],
+ "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da",
+ "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "ghub"
+ ],
+ "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da",
+ "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984"
+ }
+ },
{
"ename": "gitlab-snip-helm",
"commit": "d73cc8f3490f5e56bc0fda1b7e680d21839f4c98",
@@ -39927,6 +40841,38 @@
"sha256": "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6"
}
},
+ {
+ "ename": "gkroam",
+ "commit": "661420c58d14ffd6f56076279b7d6ffef68e8c3e",
+ "sha256": "0jirij7dzfd02hf5dx5pg7d9l3dkbnimr3288fwjgs4igykhg66h",
+ "fetcher": "github",
+ "repo": "Kinneyzhang/gkroam",
+ "unstable": {
+ "version": [
+ 20201204,
+ 917
+ ],
+ "deps": [
+ "company",
+ "db"
+ ],
+ "commit": "b40555f45a844b8fefc419cd43dc9bf63205a0b4",
+ "sha256": "072r4q03ddy4mkqqlvhsgjh6i5pcjkgzvpv8n7433qgxgdbyhwaa"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 4,
+ 3
+ ],
+ "deps": [
+ "company",
+ "db"
+ ],
+ "commit": "2552444f1037240cce4f459bff3ac2b1f331bbb6",
+ "sha256": "13az89c99jq7rwp5s7n8q06jd25nan1paa1x16733ir6v1fgss3z"
+ }
+ },
{
"ename": "gl-conf-mode",
"commit": "e3117e62d429e44506f7d82fc64252d41bc1a4b6",
@@ -39958,11 +40904,14 @@
"url": "https://git.launchpad.net/global-tags.el",
"unstable": {
"version": [
- 20200520,
- 1816
+ 20201204,
+ 1812
],
- "commit": "f3c93828ab08895bf7eac8a2d3bfd949303a6d1f",
- "sha256": "1ar9pgc31mfv2x26qpvsmiv2lnczfjliplnzjxnrmiccqiabp1y8"
+ "deps": [
+ "async"
+ ],
+ "commit": "5e7738524789d5b95498e3b88621a3877eef5c50",
+ "sha256": "0qw3zi42kgf73k5f41h6dgssa49qp4bpxvw404f7627k4bxjw700"
}
},
{
@@ -40191,11 +41140,11 @@
"repo": "emacsorphanage/gnuplot",
"unstable": {
"version": [
- 20200322,
- 53
+ 20201207,
+ 1056
],
- "commit": "f0001c30010b2899e36d7d89046322467e923088",
- "sha256": "1qnlcfzaihwc6kxdr1h2mrhccnhlwsdqwmcygxi2s01q2ifq1nc1"
+ "commit": "fbb15b630de35b8f1396db6f26e966e9996a5a4f",
+ "sha256": "153sqq9i0ry4949nc33gl9w95kl1xkzf75djspz3lgfhpcs1rsvq"
},
"stable": {
"version": [
@@ -40274,8 +41223,8 @@
"repo": "deusmax/gnus-notes",
"unstable": {
"version": [
- 20200605,
- 1421
+ 20201010,
+ 1228
],
"deps": [
"async",
@@ -40286,8 +41235,8 @@
"org",
"s"
],
- "commit": "2b587ac2e428fe3805443df5306e67d78bdf8ec2",
- "sha256": "0r08dhc6w2zk8is738qd6rkpq03n1fnfr398lsqgn2jaizgsik0l"
+ "commit": "0c87d6300e50124489f46577776319f8935612c8",
+ "sha256": "0vjgk9m0pw254ivpr1db6lzs4a5h820pja174vslzh7dbby4rjg5"
},
"stable": {
"version": [
@@ -40373,8 +41322,8 @@
20190617,
1419
],
- "commit": "3968667bfded60fbbf33f2fba3170e2b6501ec43",
- "sha256": "0rxaxc7b0dkhsd5547hngq24bdvnxig5a7xp9jir59fp2k8xd4aw"
+ "commit": "d0cb218fea13563c1b2bfba3e72716fb860f767c",
+ "sha256": "1ljbgksdnqkgh5m41l95lir5l53r1q1j1rz5nlvhhdv1jlxp19q7"
},
"stable": {
"version": [
@@ -40736,8 +41685,8 @@
"cl-lib",
"go-mode"
],
- "commit": "734d5232455ffde088021ea5908849ac570e890f",
- "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
+ "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88",
+ "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc"
},
"stable": {
"version": [
@@ -40829,11 +41778,11 @@
"repo": "dominikh/go-mode.el",
"unstable": {
"version": [
- 20200425,
- 1740
+ 20201204,
+ 1652
],
- "commit": "734d5232455ffde088021ea5908849ac570e890f",
- "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
+ "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88",
+ "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc"
},
"stable": {
"version": [
@@ -40952,8 +41901,8 @@
"deps": [
"go-mode"
],
- "commit": "734d5232455ffde088021ea5908849ac570e890f",
- "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
+ "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88",
+ "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc"
},
"stable": {
"version": [
@@ -41061,6 +42010,29 @@
"sha256": "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2"
}
},
+ {
+ "ename": "go-translate",
+ "commit": "26092d1830f6a0f46916b0d07afe467ce76e257c",
+ "sha256": "0ls7fy89936jn8kqwyii9214h258ds64fjmfc61mdcqsbg9r07s4",
+ "fetcher": "github",
+ "repo": "lorniu/go-translate",
+ "unstable": {
+ "version": [
+ 20201203,
+ 203
+ ],
+ "commit": "ea63d0ad9816aa1c478c66bd1ff9978e8330d3cb",
+ "sha256": "0v3w3ffls9h4vpalmkvswsrdcny3z1g7p9gdp75lw6pc9xkmkgnz"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "27d9218aa10dc361aa89f666f91aea7fdfb43d1f",
+ "sha256": "0jgicsv8102pk340fn122w0hbhvac2nqcpr16lj7ccjg44qmnrdw"
+ }
+ },
{
"ename": "gobgen",
"commit": "8c9fed22bb8dbfb359e4fdb0d802ed4b5781f50d",
@@ -41087,8 +42059,8 @@
20200708,
2200
],
- "commit": "ad2e6745294843462f78768b5a1cd3b0d3563951",
- "sha256": "00v69c76737yfmy3injhf6l1khj67rr0xvpq0yyjxg4hh9dv4j90"
+ "commit": "f51c8f60e55393cced8cb0bd4a5bf0ab1612caa4",
+ "sha256": "03n6zhxbgqzlrwl7jkmw3d5b78z2yw3qk8xk20x3wk3j58g9kk0j"
},
"stable": {
"version": [
@@ -41124,6 +42096,21 @@
"sha256": "12gga1ghc54r6f2adyaq30hm2yxspvgg54zd4k82c3d6cj51qwci"
}
},
+ {
+ "ename": "goggles",
+ "commit": "18a8df7ef7e5858f07f563058c0df7d630a92695",
+ "sha256": "1d2czwlv2mgd45avkhch29wxp6c7bv8m7k8kmybcwr7frq1c2jm6",
+ "fetcher": "github",
+ "repo": "minad/goggles",
+ "unstable": {
+ "version": [
+ 20201205,
+ 957
+ ],
+ "commit": "a5c527fbf904bac1c73d8b823202ca1f8a0318c9",
+ "sha256": "02kc4vjkf15za7mbcaq60125w6qp2gdgy5jia82hhni2q4h76nvn"
+ }
+ },
{
"ename": "gold-mode",
"commit": "6d1991b63067c581c7576df4b69b509ab5a44d5a",
@@ -41188,14 +42175,14 @@
"repo": "stardiviner/goldendict.el",
"unstable": {
"version": [
- 20200731,
- 1119
+ 20201108,
+ 201
],
"deps": [
"cl-lib"
],
- "commit": "ad5212f6ade58c193287851a46c3f9378fe2f059",
- "sha256": "0lgdrrch9rn23jd90rpcs5zxrv279ds3g9rzq5whl19410dbjamm"
+ "commit": "700f60be192f4d46787e7f009637c15567064f2a",
+ "sha256": "0nn7ilprx465r5yx0q11vghq3cv0a269jzz3q1p1vwllwfj0f31x"
}
},
{
@@ -41209,8 +42196,8 @@
20180221,
2015
],
- "commit": "738671d3881b9731cc63024d5d88cf28db875626",
- "sha256": "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"
+ "commit": "83fdc39ff7b56453e3793356bcff3070b9b96445",
+ "sha256": "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"
}
},
{
@@ -41272,8 +42259,8 @@
20180130,
1736
],
- "commit": "25e977d641fc204a38263a2272f92307c545121b",
- "sha256": "1dgna85s3gwb0a2504min4ch0xih4ygnv8ia2jvx3wyxgn436z1x"
+ "commit": "d5b510476350b9ba99a83a7ceee114012f515394",
+ "sha256": "169aijgk0viyyq3s6sw6fl61ajw6gan9kwv2igawwki5ljfc2rkr"
}
},
{
@@ -41284,15 +42271,15 @@
"repo": "jd/google-contacts.el",
"unstable": {
"version": [
- 20180919,
- 1314
+ 20201012,
+ 1056
],
"deps": [
"cl-lib",
"oauth2"
],
- "commit": "2273582713712a58e71156a8a29972d42e8e690e",
- "sha256": "1iw5khd3mcgq7vmpm2xw1s713glc8c569n4mgrmmggg73sjnj4kf"
+ "commit": "8923c238fe0906184d2254b33ba72792ed12cd47",
+ "sha256": "0s07bcd1d9z9y0cl68baikcf3b781r4r1xi04yyi65l25ds36pg3"
}
},
{
@@ -41353,8 +42340,8 @@
20200809,
1430
],
- "commit": "0ab218f9e1a620af7b4b22d9c82b8d83ff5f4606",
- "sha256": "1z0jbjgjnb36cj14l6khnxmrcfvbmlw89sc9dbkw6j7a3k51nlc0"
+ "commit": "0270073331de9358f29d049a27aa9145697d6dc7",
+ "sha256": "12nhl3h0f1kmv7ak9lh0p96k0f2284k20ilwn3ail7p2kpp8affk"
},
"stable": {
"version": [
@@ -41491,8 +42478,8 @@
20200506,
1250
],
- "commit": "0e5965f897c8c976d6b2ca2471dec0dec9b29bbb",
- "sha256": "0cvrb23p1m83kd6p5ah04pgzc5gic7q88gnnad9p8d0a7ajh2vbi"
+ "commit": "a549cd031859e24fd37a779323e1542aefe86d43",
+ "sha256": "0smjajazr86r8f1szw1xdrinfbn455xhl6bbhyhhmrk6sw0pnc6n"
},
"stable": {
"version": [
@@ -41512,20 +42499,20 @@
"repo": "jcs-elpa/goto-char-preview",
"unstable": {
"version": [
- 20200717,
- 730
+ 20200927,
+ 509
],
- "commit": "11fb6b8c77c6191f839f86afc8c8ca3341919058",
- "sha256": "14wcz9azp1c66jz1wz75v0ijbsk5hjmchcm36k7phbn3hjag99ji"
+ "commit": "6209973933bec4081145dbcb8e3e442cb29a8c52",
+ "sha256": "1ckpdgfr7da37fwx9pw0vc8bdcmbpdpygfn8gkwwmz3yjk3021h7"
},
"stable": {
"version": [
0,
- 0,
- 2
+ 1,
+ 0
],
- "commit": "446e5236227d6b3f180be2eb5ef2209aef947553",
- "sha256": "0dd5iq9xkvqavabipg1iz9zk1rnz830grhzw0z1l89b1vvgzpd62"
+ "commit": "6209973933bec4081145dbcb8e3e442cb29a8c52",
+ "sha256": "1ckpdgfr7da37fwx9pw0vc8bdcmbpdpygfn8gkwwmz3yjk3021h7"
}
},
{
@@ -41536,14 +42523,11 @@
"repo": "emacs-evil/goto-chg",
"unstable": {
"version": [
- 20200603,
- 1911
+ 20201101,
+ 1029
],
- "deps": [
- "undo-tree"
- ],
- "commit": "85fca9f7d8b04be3fbb37cc5d42416f3c4d32830",
- "sha256": "0laq44dfwcdhphrkwsklxa0146sl9y841mmjwn5gc0z4d5npz0ql"
+ "commit": "2af612153bc9f5bed135d25abe62f46ddaa9027f",
+ "sha256": "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv"
},
"stable": {
"version": [
@@ -41602,20 +42586,20 @@
"repo": "jcs-elpa/goto-line-preview",
"unstable": {
"version": [
- 20200717,
- 733
+ 20200927,
+ 252
],
- "commit": "b1df7fe72b0281704d277a69dfd9e2b8214a328b",
- "sha256": "00862y6r5xbq5crb581xh1b18dqigc8k42di9mjc6zvslxq8n6qd"
+ "commit": "66817b66ce124b2961df3521faa3adc87943d0d9",
+ "sha256": "0w9cqp5xcqnncwpb90xvirvm05bknsaxhd51y2wkhqr7j5xi489i"
},
"stable": {
"version": [
0,
- 0,
- 6
+ 1,
+ 1
],
- "commit": "a4173abfffda03ad27e695a316adfe560a97f00e",
- "sha256": "0bh70d2isl3kdzxyidjrxhs7sh8rqr8cmdwil7ksp9a28mz3l55p"
+ "commit": "66817b66ce124b2961df3521faa3adc87943d0d9",
+ "sha256": "0w9cqp5xcqnncwpb90xvirvm05bknsaxhd51y2wkhqr7j5xi489i"
}
},
{
@@ -41635,8 +42619,8 @@
"magit-popup",
"s"
],
- "commit": "609218c5232673cec215d088eb01d043120de385",
- "sha256": "0wg2sn5zfcsdnv6ymy0a13px7j6pkgmdd9dpss98l70xf3b6g590"
+ "commit": "b59d258e04802f51b9c9e733f0febda6a7e1ffa4",
+ "sha256": "0cbm2bg7r19a8qgbqkpdnv5pdj8lrd0aklssv7lj0bwrm8330jna"
},
"stable": {
"version": [
@@ -41862,30 +42846,30 @@
"repo": "jcs-elpa/grammarly",
"unstable": {
"version": [
- 20200720,
- 948
+ 20201028,
+ 612
],
"deps": [
"request",
"s",
"websocket"
],
- "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075",
- "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf"
+ "commit": "cda079ea8e14455230108994c1bba53ba63a3bdc",
+ "sha256": "1c6c1bp23r6kpp5xk65njcc9prxgglkdzb9k4px961mbmc4s8hsl"
},
"stable": {
"version": [
0,
- 1,
- 3
+ 3,
+ 0
],
"deps": [
"request",
"s",
"websocket"
],
- "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075",
- "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf"
+ "commit": "1fd3ed0fad915d3c5c1a2eb055bb3b91a949be21",
+ "sha256": "0spvnfa1ckzxnw4478jikdddij8wayrnyla5wv812l3y5c235pid"
}
},
{
@@ -42017,11 +43001,11 @@
"repo": "davazp/graphql-mode",
"unstable": {
"version": [
- 20191024,
- 1221
+ 20201001,
+ 2113
],
- "commit": "7c37aee28bf8c8ffb3da73df5571c4e1e352562b",
- "sha256": "0hjzqmrc024b98nisvn2ld8gn3bslg8ip19d1fnid3m8q9zk8w8b"
+ "commit": "2371316a750b807de941184d49ca19d277ecadcd",
+ "sha256": "07k0r4khzx58m6bb13lsczlxakzipl9zxn68ymag4ibim5wf2j3n"
}
},
{
@@ -42251,8 +43235,8 @@
20200725,
725
],
- "commit": "281ada2c93bac7043c6f665fac065a17d4247bdc",
- "sha256": "14gsmxpp8znk2w2yszdpwb8dx0hxbpy2rjr7rshs3bvqjib8rzyp"
+ "commit": "91da46f29c455c3cd24b2a6b20ff2db2c4ce8cd6",
+ "sha256": "08bw5mllx3hsgz8b43dlqdqh2y8asw735623r174prhv84rnq1cq"
},
"stable": {
"version": [
@@ -42383,20 +43367,20 @@
"repo": "ROCKTAKEY/grugru",
"unstable": {
"version": [
- 20200810,
- 1411
+ 20201116,
+ 430
],
- "commit": "2f304daa39df10ebe9e4cb982af5343bca252c6d",
- "sha256": "1bry2iqab6shyhlmka7334yqc5k4c9hl1qrigz2p9km9hv45r7hw"
+ "commit": "521d51a02a3fb76b01b35090ee102d0562cba0e4",
+ "sha256": "105gcz6wmli73s68ha1lqp66p9w8qqfzn190rylrzmwhnar4kkaq"
},
"stable": {
"version": [
1,
- 10,
+ 14,
0
],
- "commit": "d71007802389028a70d0ccbf5c57330241add7cc",
- "sha256": "1gr8jdm8g7cxysf1f83mkfwp3la6bcd08r8gw5v9ms4k217nx2is"
+ "commit": "ce3cc60a3ff3dc2fdc0e3edef7cc51fd4ccb3411",
+ "sha256": "0g8dz1p4gmd3lq8mjmpim5132l4wvc0r0aymiqffjcbmplsil3qx"
}
},
{
@@ -42445,8 +43429,8 @@
"deps": [
"autothemer"
],
- "commit": "746a5f36cf4ff3959f2d007598d5cb248cfc1879",
- "sha256": "1j66ffg1xl37nggckm38fmapxm0v7bycvpggxdx0s8q7hqlikk9f"
+ "commit": "d4129a18e6cf476a472b4dc7dc12e8aafc17beca",
+ "sha256": "1yr8k4ymr8hinq4mrlxngsk39616p7k43n1brqww1xc84b4pvw00"
},
"stable": {
"version": [
@@ -42534,6 +43518,38 @@
"sha256": "0bv6acy3b6pbjqm24yxgi7xdd3x0c2b7s5sq65sb3lxf8hy5gdf6"
}
},
+ {
+ "ename": "gsnip",
+ "commit": "25651d2cb02aaae51999eb30f36639450d6ceec7",
+ "sha256": "1ihmcvzgn72vqhfiy60spskany5jqlk4iyph8ak40nigiqj44dsw",
+ "fetcher": "github",
+ "repo": "kaiwk/gsnip",
+ "unstable": {
+ "version": [
+ 20200928,
+ 357
+ ],
+ "deps": [
+ "aio",
+ "log4e"
+ ],
+ "commit": "c8bff61b10cd33de9d6f5fd84e4b27f48c772304",
+ "sha256": "0lw1psy1258vbvnl4j918hkzwqa65g94azbq84fvf2lgv4lbvgln"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "aio",
+ "log4e"
+ ],
+ "commit": "c8bff61b10cd33de9d6f5fd84e4b27f48c772304",
+ "sha256": "0lw1psy1258vbvnl4j918hkzwqa65g94azbq84fvf2lgv4lbvgln"
+ }
+ },
{
"ename": "gtk-pomodoro-indicator",
"commit": "a58f1acaafc459e055d751acdb68427e4b11275e",
@@ -42581,14 +43597,14 @@
"repo": "tmalsburg/guess-language.el",
"unstable": {
"version": [
- 20200707,
- 1058
+ 20201124,
+ 1136
],
"deps": [
"cl-lib"
],
- "commit": "256230072f4f828e07db6ab17b6b7e90891b7308",
- "sha256": "0yqvrd7b43ibzszzcw8zg0ifqz7v4ply5wdgq1zclk3xgsn9n3pr"
+ "commit": "6aa88cf267593f85b63a770a890bb93f04dd53c2",
+ "sha256": "0nqqnvdchlflg01if4v5qrc214q8s8d1y02xkal627a0yy4lz2a2"
}
},
{
@@ -42663,8 +43679,8 @@
"repo": "alezost/guix.el",
"unstable": {
"version": [
- 20200730,
- 930
+ 20201025,
+ 1644
],
"deps": [
"bui",
@@ -42673,8 +43689,8 @@
"geiser",
"magit-popup"
],
- "commit": "58a840d0671091e3064e36244790ef8839da87d6",
- "sha256": "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"
+ "commit": "41fba4eec845e050be92bfe76c0f7980bbe821bd",
+ "sha256": "058s6nq1px7xzcq3mhyh3qfg81kcv579rnih9bha66jidxb7dggj"
},
"stable": {
"version": [
@@ -42719,8 +43735,8 @@
20200708,
728
],
- "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b",
- "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm"
+ "commit": "fcb13d46f85dda886249bfaa19bcb777fe9f8a6a",
+ "sha256": "10iwpl57dbgn2icqn4g9n65x64r190j15qv27f100sd3n0a1x7xg"
},
"stable": {
"version": [
@@ -42769,11 +43785,11 @@
"repo": "rodw/gvpr-lib",
"unstable": {
"version": [
- 20131208,
- 1718
+ 20201007,
+ 2054
],
- "commit": "3d6cc6f4416faf2a1913821d12ba6eb624362af0",
- "sha256": "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s"
+ "commit": "ef6ec2d4a4c9de68078c94a0e43b05bf77ec4674",
+ "sha256": "11g9gdn9b22fypk4nmjqbs04xkmqdxdgx0mzahwnqlpjv47q9sdg"
}
},
{
@@ -42840,14 +43856,14 @@
"repo": "hhvm/hack-mode",
"unstable": {
"version": [
- 20200526,
- 2210
+ 20201006,
+ 43
],
"deps": [
"s"
],
- "commit": "572c3b41bed91ea543434c04914a7a0c45fec7c7",
- "sha256": "12r14846dpgn03h1gn58aff3p8swlp0zlajhzpqpzp2s7kvl0f6f"
+ "commit": "9079bc333e715a13e57ab366522b15d0307e32cd",
+ "sha256": "0qigmp1fwphp909vq0h4kj5m97knnwjvjw3w9d1i074gwdq54j9g"
},
"stable": {
"version": [
@@ -42893,11 +43909,11 @@
"repo": "clarete/hackernews.el",
"unstable": {
"version": [
- 20200604,
- 1557
+ 20201019,
+ 5
],
- "commit": "019a727b41e2726516841048a2b5b04f2ed2301a",
- "sha256": "1b4vlk3l1mm8jz0kkyjbddfnx963vzsq4gprci8aw203fjnxhbdx"
+ "commit": "c793275565372f63bf9dc1229d5b893a5bd0278e",
+ "sha256": "1fld3q2j58ka130v7gqm24ngw5ghy9vk63141y7bkjs5zb8mahpl"
},
"stable": {
"version": [
@@ -43047,10 +44063,10 @@
},
{
"ename": "handle",
- "commit": "da5debb55f7b34dcbcea81675bddd872bdb7fd69",
- "sha256": "032rfk3hiv0ps0p332gkf67vqs5nif8hhraiv3zlybxblzhcxaw1",
- "fetcher": "gitlab",
- "repo": "jjzmajic/handle",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "0r0675hhficyhpz41sxpi2ah06918aa3df1sxsx7vqh4pbv2ixl8",
+ "fetcher": "github",
+ "repo": "wurosh/handle",
"unstable": {
"version": [
20191029,
@@ -43288,19 +44304,19 @@
"repo": "haskell/haskell-mode",
"unstable": {
"version": [
- 20200531,
- 2255
+ 20201120,
+ 755
],
- "commit": "41683c0e634bb3f54eac8747919a82132e1714fe",
- "sha256": "1fxj11in90xvpbqhxx5c3qynkd8yfainpbf8cvdh3gdgpifrc0gg"
+ "commit": "0d39c847fddddc5b76fe3c706e34ab45439760bc",
+ "sha256": "1rbl2yalcipqp7k2161ygmrmy2dr96jlkyk35jqb5i143gyg59w2"
},
"stable": {
"version": [
17,
- 1
+ 2
],
- "commit": "17357211a16394884a981fe0c062f94250b40300",
- "sha256": "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn"
+ "commit": "e72677668f5fc7cc148008e885a0f256e245dd43",
+ "sha256": "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5"
}
},
{
@@ -43368,8 +44384,8 @@
20181110,
1859
],
- "commit": "386c098c93a744f6b30ad937d193eebf0fd79e1b",
- "sha256": "0m1cn59fzsfqc6j1892yaaddh6g6mwiqnp1ssxhic5fcm2xk00rz"
+ "commit": "c12337a13ec3a1f04400d0ea51e6120ebe79efb9",
+ "sha256": "0nk7wm8ns721smbyr7wqxp3s4wbpwg594rcy79ai3fkfy1lb6k4y"
}
},
{
@@ -43479,20 +44495,20 @@
"repo": "emacsorphanage/haxe-mode",
"unstable": {
"version": [
- 20200204,
- 1015
+ 20201018,
+ 1357
],
- "commit": "9449b2b8bc733faa130d3ab68b97ac1ae1db3bff",
- "sha256": "1xpjwzd8vd41hs3i3yy4l1w0q0pk8s12bgky5q524n03pdq4n756"
+ "commit": "5e8183a275babdc7604ae01fc94853e60cb04a32",
+ "sha256": "0141xzgvv1xzlsaxls4qy9dzl57g1qy5r02x4qydq1p417r30pqc"
},
"stable": {
"version": [
0,
3,
- 2
+ 3
],
- "commit": "ed99906a808ff4a00bf6b0e231c30c240a563954",
- "sha256": "1lnx8qrqix2n3bvw8blqc7msghfy1w1dzyga9s8c9z5pawqrbm85"
+ "commit": "5e8183a275babdc7604ae01fc94853e60cb04a32",
+ "sha256": "0141xzgvv1xzlsaxls4qy9dzl57g1qy5r02x4qydq1p417r30pqc"
}
},
{
@@ -43622,30 +44638,30 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20200818,
- 742
+ 20201117,
+ 815
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba",
- "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0"
+ "commit": "75562eec4879e7f72119ceee40ab5087c705267e",
+ "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3"
},
"stable": {
"version": [
3,
- 6,
- 4
+ 7,
+ 0
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592",
- "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz"
+ "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd",
+ "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y"
}
},
{
@@ -43745,25 +44761,25 @@
"repo": "emacsorphanage/helm-ag",
"unstable": {
"version": [
- 20200811,
- 1304
+ 20200915,
+ 1650
],
"deps": [
"helm"
],
- "commit": "4ee2174c4e27e02c75a487a235de4d80c663aa08",
- "sha256": "1sc9ksfb3s5p5kqriz5402r785fklw3ykz8fb107xykl9kdjnzy3"
+ "commit": "db52f860b50aa4d5edfa1c6c97802d36aef7f78b",
+ "sha256": "1l95vskrvk88a2glpn2pdylcpy7qxqg5qgmjnh9w24xfyc77g513"
},
"stable": {
"version": [
0,
- 62
+ 64
],
"deps": [
"helm"
],
- "commit": "08aaab53b8876caba619f956945a8152ece47182",
- "sha256": "0xgbpp8xqdiyvfs64x0q909g77ml28z3irw2lnasvpsg0dfdm2zy"
+ "commit": "6a3e738c1bb5e80c7ea80f7166fda34a714284d8",
+ "sha256": "0ml9yp3qaiwn7iixyxvsj3fxn7gw913qxisr47df57q4ka912law"
}
},
{
@@ -43792,14 +44808,43 @@
"repo": "emacs-helm/helm-apt",
"unstable": {
"version": [
- 20200719,
- 1131
+ 20200823,
+ 1546
],
"deps": [
"helm"
],
- "commit": "f6204e2333881291b007e4859d9446994e988653",
- "sha256": "08gxfby2i80nmzlbj39p0nnicg95swzjxc222wksvggfxvvln5f7"
+ "commit": "42923e367f6ccc1c94b1a5c070993e0ad96c9ea3",
+ "sha256": "1q5pxd0vjxqrvk0gf0nxbc9b77xidaijkddh6zz3j7fbjmzyrp4x"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "42923e367f6ccc1c94b1a5c070993e0ad96c9ea3",
+ "sha256": "1q5pxd0vjxqrvk0gf0nxbc9b77xidaijkddh6zz3j7fbjmzyrp4x"
+ }
+ },
+ {
+ "ename": "helm-atoms",
+ "commit": "6463d30672315419f3092864f321670c7b663507",
+ "sha256": "0bjinkajlzl8xqb0pia8bmb0d24a1xxvikamqy92x1f2p4brwr7s",
+ "fetcher": "github",
+ "repo": "dantecatalfamo/helm-atoms",
+ "unstable": {
+ "version": [
+ 20201013,
+ 1723
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "7e6f91a16f556c96ae1b0d1f965ea56861bb6372",
+ "sha256": "0r61r1w8n5lvri7b32abahx0indim7hz6c9y95l54blqjx4yqzf0"
}
},
{
@@ -43915,8 +44960,8 @@
"cl-lib",
"helm"
],
- "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35",
- "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5"
+ "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c",
+ "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix"
},
"stable": {
"version": [
@@ -44084,8 +45129,8 @@
"bufler",
"helm"
],
- "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f",
- "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs"
+ "commit": "d623605be961316be378ffcd1e97a85069f2f7cc",
+ "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2"
},
"stable": {
"version": [
@@ -44157,15 +45202,15 @@
"repo": "emacs-jp/helm-c-yasnippet",
"unstable": {
"version": [
- 20200520,
- 1519
+ 20201118,
+ 1009
],
"deps": [
"helm",
"yasnippet"
],
- "commit": "89cc8561e7e57e9d1070ee3641df019c7f49c5dd",
- "sha256": "1b6wwz7j9alwmxmk3wvf862ynznkdm1jk5r456dn8ykkvfrs7nlv"
+ "commit": "28699d9a9caa8b4d37fd66368d93b6c65828c235",
+ "sha256": "15f4bdarr66jlr7a31r9zn37l6v3fmrqhizz41lqcllkwz0nqh6h"
},
"stable": {
"version": [
@@ -44521,26 +45566,26 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20200803,
- 1032
+ 20201019,
+ 715
],
"deps": [
"async"
],
- "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba",
- "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0"
+ "commit": "75562eec4879e7f72119ceee40ab5087c705267e",
+ "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3"
},
"stable": {
"version": [
3,
- 6,
- 4
+ 7,
+ 0
],
"deps": [
"async"
],
- "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592",
- "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz"
+ "commit": "5ad6c83681fda7bfd5a745fedecaa924630253dd",
+ "sha256": "0lxq13bsbh7xawgsq08kjm7s28x9yl8mid3538flv5kcc1rv2b9y"
}
},
{
@@ -44704,14 +45749,14 @@
"repo": "emacs-helm/helm-dictionary",
"unstable": {
"version": [
- 20200406,
- 1632
+ 20201006,
+ 1511
],
"deps": [
"helm"
],
- "commit": "1dfec049c7851754a5967329a60e9e9a9f805423",
- "sha256": "042rn38myq8b2024mdpisakmqysp34mmhvbdnw433vl9qxw6pikd"
+ "commit": "b316a1d55e58645d59a84d33851d46fab3cd54b5",
+ "sha256": "0rggi6jd5f6dp50d08k9xba470drlhg9qa5a0y3cy4y2nlq0y7rn"
}
},
{
@@ -44861,16 +45906,16 @@
"repo": "emacs-helm/helm-emms",
"unstable": {
"version": [
- 20200322,
- 1309
+ 20201205,
+ 1635
],
"deps": [
"cl-lib",
"emms",
"helm"
],
- "commit": "37e5aa029abfa5a5c48636314de8157142944fa2",
- "sha256": "0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg"
+ "commit": "43d387504a292b36e4e4246abdc9090c1717a561",
+ "sha256": "0pgrjqhw1xjl5xy329621idg517bfaafvqb3f5wxci6fhm4x46gc"
},
"stable": {
"version": [
@@ -44926,14 +45971,14 @@
"repo": "jixiuf/helm-etags-plus",
"unstable": {
"version": [
- 20170113,
- 1414
+ 20201003,
+ 1424
],
"deps": [
"helm"
],
- "commit": "704f0991ee4a2298b01c33aafc224eef322e15e3",
- "sha256": "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9"
+ "commit": "52598fe69636add4b62cd9873041de5c6db9b7ac",
+ "sha256": "1mpwka62lk040693hllb5hrsf4n5vwkx6khi9i9dbyyc5xgppjm0"
},
"stable": {
"version": [
@@ -45072,36 +46117,6 @@
"sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v"
}
},
- {
- "ename": "helm-fd",
- "commit": "ea8d504faa73bc0a649b13738ed7c6a76e2fad88",
- "sha256": "1hlq0xxi616flykay9jr96rqgvs53dmlk50h25982jpl6xb63g9y",
- "fetcher": "github",
- "repo": "lerouxrgd/helm-fd",
- "unstable": {
- "version": [
- 20190923,
- 48
- ],
- "deps": [
- "helm"
- ],
- "commit": "84a2aa656473f2921e35abad62b158b3813ee944",
- "sha256": "14bdcr4db500sqv5p47jdkjp06hys35bpb07fp40v39r9pbzfdla"
- },
- "stable": {
- "version": [
- 0,
- 1,
- 0
- ],
- "deps": [
- "helm"
- ],
- "commit": "2891ca941b5a70facf35d5a8bbc791fc41ab0284",
- "sha256": "16szlby36g393mwnywl59iyngrinnsd9xilsgadr6l9hngas4anm"
- }
- },
{
"ename": "helm-file-preview",
"commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
@@ -45110,26 +46125,26 @@
"repo": "jcs-elpa/helm-file-preview",
"unstable": {
"version": [
- 20190903,
- 331
+ 20200927,
+ 528
],
"deps": [
"helm"
],
- "commit": "d7e0c1814299fc0e345e159f02733cee5277716e",
- "sha256": "07767jm0wqnn4qavnvnsf6wzfsvsk5bfba2sm16l5036sj4dyjxn"
+ "commit": "59adbf2d3c67b174a354f0dd64f647b4391ab8d0",
+ "sha256": "1x2ds29k4wwv406j49nzjkh43scahmrshx4lssqrkc9cay7210nx"
},
"stable": {
"version": [
0,
1,
- 4
+ 5
],
"deps": [
"helm"
],
- "commit": "52dbc68cf7484d66c40593733770c0c61b383ef0",
- "sha256": "1xrq5481mri9nfdwkn14zjq1zgl31w6aywca6sr1by5cqggqrqr1"
+ "commit": "59adbf2d3c67b174a354f0dd64f647b4391ab8d0",
+ "sha256": "1x2ds29k4wwv406j49nzjkh43scahmrshx4lssqrkc9cay7210nx"
}
},
{
@@ -45190,27 +46205,27 @@
"repo": "emacs-helm/helm-fish-completion",
"unstable": {
"version": [
- 20200622,
- 1255
+ 20200908,
+ 1504
],
"deps": [
"fish-completion",
"helm"
],
- "commit": "f055dab2f14462ff130841d4ab421f34baab39d5",
- "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922"
+ "commit": "2a2001b3a876da3c468ffec8935572509c485aac",
+ "sha256": "1j2vfngq3512naaayv9kx0d1q2zg1xgs69l8afc7swg72h0l0imw"
},
"stable": {
"version": [
0,
- 5
+ 6
],
"deps": [
"fish-completion",
"helm"
],
- "commit": "f055dab2f14462ff130841d4ab421f34baab39d5",
- "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922"
+ "commit": "2a2001b3a876da3c468ffec8935572509c485aac",
+ "sha256": "1j2vfngq3512naaayv9kx0d1q2zg1xgs69l8afc7swg72h0l0imw"
}
},
{
@@ -45374,28 +46389,28 @@
"repo": "jcs-elpa/helm-fuzzy",
"unstable": {
"version": [
- 20190905,
- 526
+ 20200927,
+ 532
],
"deps": [
"flx",
"helm"
],
- "commit": "152d54bcd7137e4f5df54cf213e578c9d71864bd",
- "sha256": "1msnagb1mxxi9c64j54j9r95l98jha2n6qdgs236b953lz8d9wwf"
+ "commit": "72d618f95d6531854a60322d88b242825016f8e6",
+ "sha256": "0bpnspq7c3akny8blsp75br11g6fh425v9hxfpwyk8iqs5zwvlb7"
},
"stable": {
"version": [
0,
1,
- 5
+ 6
],
"deps": [
"flx",
"helm"
],
- "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7",
- "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9"
+ "commit": "72d618f95d6531854a60322d88b242825016f8e6",
+ "sha256": "0bpnspq7c3akny8blsp75br11g6fh425v9hxfpwyk8iqs5zwvlb7"
}
},
{
@@ -46039,10 +47054,10 @@
},
{
"ename": "helm-jira",
- "commit": "b91a22c2117403e278a8116ea1180bed736ae1e3",
- "sha256": "1fb2hk97zlr30gzln8b5x7xc3v119ki8kbiyh7shxnaqx7dy1ihs",
+ "commit": "7cbfe0c151c0828123ca164a7b02dccf6eaeca15",
+ "sha256": "06igiximhy9kwd351b6j80vfxs978gppm505013ayi6npc2x9rcr",
"fetcher": "github",
- "repo": "DeX3/helm-jira",
+ "repo": "romandecker/helm-jira",
"unstable": {
"version": [
20180802,
@@ -46148,8 +47163,8 @@
"helm",
"lean-mode"
],
- "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
- "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
+ "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7",
+ "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb"
}
},
{
@@ -46295,16 +47310,16 @@
"repo": "emacs-lsp/helm-lsp",
"unstable": {
"version": [
- 20200808,
- 713
+ 20200910,
+ 518
],
"deps": [
"dash",
"helm",
"lsp-mode"
],
- "commit": "4263c967267b0579956b3b12ef32878a9ea80d97",
- "sha256": "1j0w6391ivw7gyx03vmmhccj25d5p94dnbblhd6vxl8d22azdfq3"
+ "commit": "fc09aa0903ee6abe4955e9a6062dcea667ebff5a",
+ "sha256": "1gcs6aky8h6g9wkrqjl8j50zm4lnvnjv4xcfxxg2z0j7vln81pbx"
},
"stable": {
"version": [
@@ -46486,14 +47501,14 @@
"repo": "emacs-helm/helm-mu",
"unstable": {
"version": [
- 20190819,
- 1311
+ 20200823,
+ 1534
],
"deps": [
"helm"
],
- "commit": "481964fb26c59ea280a1ec7bce192d724ddf7d12",
- "sha256": "08cszx5iqr65sz66ank722c1kdvjff2k7kvhxdilhf3gb6f8ph9p"
+ "commit": "c02bba3c6e52e623951781c98a1cf2ce923439e6",
+ "sha256": "0i9k03x6gnwfsf3r7m3yhmgf3y9hnc895mv5x4zdv1jazr4gc8gf"
}
},
{
@@ -46648,18 +47663,18 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20200505,
- 1053
+ 20201203,
+ 847
],
"deps": [
"dash",
"helm",
- "helm-org",
+ "helm-org-ql",
"org-multi-wiki",
"org-ql"
],
- "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14",
- "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39"
+ "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb",
+ "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls"
},
"stable": {
"version": [
@@ -46676,6 +47691,57 @@
"sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0"
}
},
+ {
+ "ename": "helm-org-ql",
+ "commit": "e95bb45018c2c257e18af7428395dd1020074689",
+ "sha256": "1lx331qb9nfisz0yknd2yb8w4zxxcdqqkgywcf1irc63kvlhdi6r",
+ "fetcher": "github",
+ "repo": "alphapapa/org-ql",
+ "unstable": {
+ "version": [
+ 20201123,
+ 1102
+ ],
+ "deps": [
+ "dash",
+ "helm-org",
+ "org-ql",
+ "s"
+ ],
+ "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a",
+ "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 5
+ ],
+ "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679",
+ "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn"
+ }
+ },
+ {
+ "ename": "helm-org-recent-headings",
+ "commit": "9ac277ed37b6dd8b7c9d31a283442d5365d9e7f9",
+ "sha256": "0n2bqiaqyk2hkbwa5wk9y1wyms9vin95f515m8crkqyh7g2rnsia",
+ "fetcher": "github",
+ "repo": "alphapapa/org-recent-headings",
+ "unstable": {
+ "version": [
+ 20201118,
+ 737
+ ],
+ "deps": [
+ "dash",
+ "helm",
+ "org",
+ "org-recent-headings",
+ "s"
+ ],
+ "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187",
+ "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y"
+ }
+ },
{
"ename": "helm-org-rifle",
"commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
@@ -46693,8 +47759,8 @@
"helm",
"s"
],
- "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f",
- "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49"
+ "commit": "5e13a0e59606b40088927870dab116a8eab8e66c",
+ "sha256": "0mz77gd4q38mkbcsdcl730nc5s7cr6y67iagcdxa7wk5v46h8l45"
},
"stable": {
"version": [
@@ -46996,16 +48062,16 @@
"repo": "bbatsov/helm-projectile",
"unstable": {
"version": [
- 20200625,
- 443
+ 20201208,
+ 1837
],
"deps": [
"cl-lib",
"helm",
"projectile"
],
- "commit": "2f3a2a03d6cb9419c25b432637aa11c8d2f9f3b7",
- "sha256": "0h6r8v2lj6abjz73iv8568ijs7l37j76nf58h4p9r9ldpdigihzz"
+ "commit": "e3d541c59505cd8c5843bbcf237c12e3d3288990",
+ "sha256": "171cykxdn38245fjphx9qx3zcdgrc5wvnp89bq53pvqjqk6b32d2"
},
"stable": {
"version": [
@@ -47394,8 +48460,8 @@
"helm",
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -47512,6 +48578,42 @@
"sha256": "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl"
}
},
+ {
+ "ename": "helm-searcher",
+ "commit": "aafea99e6091ada48708db7a42ffe13effa17a41",
+ "sha256": "063453h22811inn55z09kfz5a42lzjw3mv41ghwypnqgy0lnjs0r",
+ "fetcher": "github",
+ "repo": "jcs-elpa/helm-searcher",
+ "unstable": {
+ "version": [
+ 20201001,
+ 838
+ ],
+ "deps": [
+ "f",
+ "helm",
+ "s",
+ "searcher"
+ ],
+ "commit": "7b3016faeca201843d849c00d11665a90c1709fb",
+ "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 4
+ ],
+ "deps": [
+ "f",
+ "helm",
+ "s",
+ "searcher"
+ ],
+ "commit": "7b3016faeca201843d849c00d11665a90c1709fb",
+ "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p"
+ }
+ },
{
"ename": "helm-selected",
"commit": "acc087661e614d9f30c23fe4a65c020bd3656a29",
@@ -47620,21 +48722,21 @@
"repo": "emacs-helm/helm-sly",
"unstable": {
"version": [
- 20191104,
- 1054
+ 20201120,
+ 1108
],
"deps": [
"cl-lib",
"helm",
"sly"
],
- "commit": "b1567c27c0b421b9e25e350f0c83b9c7fe0fee6b",
- "sha256": "0ihcqysz5cvn94rrvjz5l4whzmxcjrfrinas180x8iycpyvzkwk6"
+ "commit": "ccf8e83644bc1b2113eab46693e64d3f0c56198f",
+ "sha256": "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx"
},
"stable": {
"version": [
0,
- 4,
+ 5,
1
],
"deps": [
@@ -47642,8 +48744,8 @@
"helm",
"sly"
],
- "commit": "9a4d91ba738ca06ceab2dea3c1e09fd45a67d488",
- "sha256": "0b2dx9nzh5233lkix3lz81c9cv626lk2hjpcjiikwvyp6y0q92ys"
+ "commit": "ccf8e83644bc1b2113eab46693e64d3f0c56198f",
+ "sha256": "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx"
}
},
{
@@ -47772,15 +48874,15 @@
"repo": "jamesnvc/helm-switch-shell",
"unstable": {
"version": [
- 20200817,
- 1725
+ 20200831,
+ 1329
],
"deps": [
"dash",
"helm"
],
- "commit": "9cab3dfd2f006148e969555bc3bfb6456d1b3f84",
- "sha256": "0z1785cw5sbcyqs2zbi35b5y6ac9lws1wxp89la7hwdlzwzk1c2a"
+ "commit": "e9927561cfc62c8427e9d10526518d643f4bc26d",
+ "sha256": "1l4irigdirvbn1xh0py135q5463z8axdh0y0icvzinn7z1z0141j"
}
},
{
@@ -47821,28 +48923,28 @@
"repo": "emacs-helm/helm-system-packages",
"unstable": {
"version": [
- 20200502,
- 751
+ 20201114,
+ 1019
],
"deps": [
"helm",
"seq"
],
- "commit": "d6ad2f682d744048ea0ac47c470be5a159a6541b",
- "sha256": "01zsl1g8r3rkgwpdphgmbljjnrhk6mmk2rjqhykjk5f3bdk02rwk"
+ "commit": "c331c69de0a37d2bc4d6f882cc021a905e7e56f9",
+ "sha256": "13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa"
},
"stable": {
"version": [
1,
10,
- 1
+ 2
],
"deps": [
"helm",
"seq"
],
- "commit": "2b4636dc861ffe2c4a2025b67ab40460f85b9563",
- "sha256": "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f"
+ "commit": "c331c69de0a37d2bc4d6f882cc021a905e7e56f9",
+ "sha256": "13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa"
}
},
{
@@ -48129,14 +49231,14 @@
"repo": "brotzeit/helm-xref",
"unstable": {
"version": [
- 20191108,
- 859
+ 20201004,
+ 1817
],
"deps": [
"helm"
],
- "commit": "6b4a8bd91f5eaf82f51bd31b03f6587387fe6983",
- "sha256": "03b57sm98v25bqyy9d2pccfnlfxkvaxmvismhxmai4kfv8d84azj"
+ "commit": "23f1174cfca7667d95828dcd388c655a4a9c877d",
+ "sha256": "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk"
}
},
{
@@ -48240,8 +49342,8 @@
"repo": "Wilfred/helpful",
"unstable": {
"version": [
- 20200506,
- 816
+ 20201012,
+ 614
],
"deps": [
"dash",
@@ -48250,13 +49352,13 @@
"f",
"s"
],
- "commit": "c0662aa07266fe204f4e6d72ccaa6af089400556",
- "sha256": "1k61k7hhrfi8rzsniy15almvnvdsv85l7bmlaqs695pvanr5zlgh"
+ "commit": "584ecc887bb92133119f93a6716cdf7af0b51dca",
+ "sha256": "04kk8rrkgkggjxqppivc4dbn13dkc786dv0masby0wy58vlxpsfv"
},
"stable": {
"version": [
0,
- 17
+ 18
],
"deps": [
"dash",
@@ -48265,8 +49367,8 @@
"f",
"s"
],
- "commit": "429f1fb5f588cc6124513335e8eca3b4ef15735a",
- "sha256": "0v2y0x9pwi08y2mgjjiw5brfb5haa7pbmy4540glw904ffxxcblj"
+ "commit": "5a5eb62ae1f9cfdd4897ec6e878ec96231c52bdd",
+ "sha256": "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc"
}
},
{
@@ -48301,10 +49403,10 @@
},
{
"ename": "hercules",
- "commit": "c0a3b713c6c8465dc461d9776ccd27f06659993e",
- "sha256": "1ggb8ax18nvcrcf1rqf8lkjjxb90kl05ivk0110h6pb9270x03hy",
- "fetcher": "gitlab",
- "repo": "jjzmajic/hercules.el",
+ "commit": "b95fa8694bd49595da9fb56454e6539e76feff97",
+ "sha256": "13c70hncl53xvnx54mz9hd9763zx7kwwcr5p2fsqyfrcj0qcganl",
+ "fetcher": "github",
+ "repo": "wurosh/hercules",
"unstable": {
"version": [
20200420,
@@ -48542,8 +49644,8 @@
20190425,
842
],
- "commit": "be2634dc1f08a5e781d02ef301c727246863756f",
- "sha256": "05v3p2n92xjz035m5p0m5wd85ygngbvjd8y09r5sx1mi5ya2k0v2"
+ "commit": "fed505b8e71bf51772887c8a94bb57f5b8838b63",
+ "sha256": "0bsmnyhpsa7x4jp4zc4inyi0rrjm34fbxa3m49hw8kq5ap7dps5k"
},
"stable": {
"version": [
@@ -48694,11 +49796,11 @@
"repo": "DarthFennec/highlight-indent-guides",
"unstable": {
"version": [
- 20200528,
- 2128
+ 20200820,
+ 2328
],
- "commit": "a4f771418e4eed1f3f7879a43af28cf97747d41c",
- "sha256": "0zwp7kh10b0gxwp6128am94fwc5lmn73qar13qzyh3r1jsc8f95y"
+ "commit": "cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6",
+ "sha256": "0wh1sfbbbz52ppr0fkl0csc4n46ipx36dli9pp9nsvpz9r28pc1g"
}
},
{
@@ -48709,11 +49811,11 @@
"repo": "antonj/Highlight-Indentation-for-Emacs",
"unstable": {
"version": [
- 20181204,
- 839
+ 20201110,
+ 1327
],
- "commit": "d03803f2c06749c430443a3d24e039cbafc9c58f",
- "sha256": "1jq0gf4kcx9hvrw40rnw5c2qynjpjw1vsjbi2i4lqjbsnfnxn4wz"
+ "commit": "4fc4e346c17e4e975a8c8ece3d4e7240357e2869",
+ "sha256": "1laj0h8vm058miwv0pl8hsh5pyfg98h4y9szzq03ilry4ifx9jz5"
},
"stable": {
"version": [
@@ -48793,11 +49895,14 @@
"repo": "tsdh/highlight-parentheses.el",
"unstable": {
"version": [
- 20180704,
- 1102
+ 20200920,
+ 832
],
- "commit": "f0bd58c8dadd2db703b7bfd09e911b5fda05b3df",
- "sha256": "14jzh0vr2sig2ql1iq2x7svvk8ayvy9ahz04y407f53h70ifbmdl"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca",
+ "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc"
},
"stable": {
"version": [
@@ -48938,20 +50043,20 @@
},
{
"ename": "hindent",
- "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
- "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
+ "commit": "e5c071ae1fe6c174842824b0a2006d7697de9387",
+ "sha256": "0cvbl9lfr3k1lszkx8dshnid8ai7zdxjglawiczvazbmvj69gkjl",
"fetcher": "github",
- "repo": "chrisdone/hindent",
+ "repo": "mihaimaruseac/hindent",
"unstable": {
"version": [
- 20180518,
- 902
+ 20200904,
+ 2236
],
"deps": [
"cl-lib"
],
- "commit": "50242bb64e946555defc9fff11ab32bcb05300b6",
- "sha256": "0k062mswihnpl1h7r0w37siv57fi5k90956ji2vix9r9qc33zsxc"
+ "commit": "1917b7b9ac2cb3dcb152f4435de61d1858a4064b",
+ "sha256": "0rpmmzwjqij5v8k33qlpq323za96447pdwrwzwk4474n4v5xsp50"
},
"stable": {
"version": [
@@ -49156,11 +50261,11 @@
"repo": "ideasman42/emacs-hl-block-mode",
"unstable": {
"version": [
- 20200404,
- 702
+ 20201126,
+ 818
],
- "commit": "6dc75e71b0b179d7c087cf7de51823f5810d671a",
- "sha256": "142nrxq72dkl45lq93c076nl2ifdl6vdgiydpcs4lwg0crja8qzl"
+ "commit": "82f42045c11ad8c6f13db3a32dcda970a378d164",
+ "sha256": "1ydks5mrzsxj7q3kvv8ji6vy4jxfra7lhd3vfyqldp3inhz3rpkz"
}
},
{
@@ -49306,14 +50411,19 @@
"repo": "grimnebulin/emacs-hmac",
"unstable": {
"version": [
- 20180429,
- 2010
+ 20201004,
+ 1819
],
- "deps": [
- "cl-lib"
+ "commit": "f2b99a9a10becfff207cf9418c6dce78364b1a4b",
+ "sha256": "0qlvfzyvxxhdacc8wl4mb451jjf4dv0gnkq7341cqz0gp4yy1n73"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
],
- "commit": "30132cd3fee7d3d91a9f04709d49ca0dcb96d565",
- "sha256": "0l4msj1i8amcn10dk1shcyh6hn49iphma1q03kp2h84ga79xdpi3"
+ "commit": "f2b99a9a10becfff207cf9418c6dce78364b1a4b",
+ "sha256": "0qlvfzyvxxhdacc8wl4mb451jjf4dv0gnkq7341cqz0gp4yy1n73"
}
},
{
@@ -49566,20 +50676,26 @@
"repo": "ericdallo/hover.el",
"unstable": {
"version": [
- 20200321,
- 1819
+ 20201206,
+ 2227
],
- "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008",
- "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s"
+ "deps": [
+ "dash"
+ ],
+ "commit": "c9c0593b2bffd6a494f570d707fe8d4e97718da4",
+ "sha256": "16baysl5qpcl48gd64g7sq0bpdhjw21az7r7w21gfj12s2njqydf"
},
"stable": {
"version": [
1,
- 1,
+ 2,
3
],
- "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008",
- "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s"
+ "deps": [
+ "dash"
+ ],
+ "commit": "cd362d80b72f45707e95f08824a5d7e7ae91d956",
+ "sha256": "19a7qb3v3ss2dcw6sd5hqd8xsn2yh4ymfl0j0csq4f7d9r15adn8"
}
},
{
@@ -49605,16 +50721,16 @@
"repo": "thanhvg/emacs-howdoyou",
"unstable": {
"version": [
- 20200805,
- 1739
+ 20201002,
+ 1901
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "6bf4d5964299c5b51a2299869c0402079869343b",
- "sha256": "0rzyh71w5ccimzy1wm489sj96119bnn86mdfshhyk753h9ldjjgp"
+ "commit": "e7c2e75a0365bca16e8910e295f330c35fa016ae",
+ "sha256": "1wsbd4rjfh27w5qzrzd1h6xpqp7s5amw33wdaa2cfp7c67pnm4kc"
}
},
{
@@ -49625,14 +50741,14 @@
"url": "https://scm.osdn.net/gitroot/howm/howm.git",
"unstable": {
"version": [
- 20190818,
- 1144
+ 20201015,
+ 1133
],
"deps": [
"cl-lib"
],
- "commit": "4f550d35935abc943e37e1f2da78c52218ac7c8d",
- "sha256": "1rcyqyb48lsqpsa65ggd7ks88rk53frjhgrwr357b057kcqjic4n"
+ "commit": "ce77dfbb50815d55081b2462541954d11a76f308",
+ "sha256": "05z1473s63qjsn41y32zk9hli9mcy4nfx3iv79a6yl5yp4x0ivg6"
}
},
{
@@ -49661,14 +50777,14 @@
"repo": "Wilfred/ht.el",
"unstable": {
"version": [
- 20200217,
- 2331
+ 20201119,
+ 518
],
"deps": [
"dash"
],
- "commit": "fff8c43f0e03d5b98deb9f988522b839ce2ca253",
- "sha256": "0v89jrz0igkj1w4jxi365nqny2vqr1wjmrvknzdlrm7g0islinwc"
+ "commit": "2850301d19176b8d3bb6cc8d95af6ab7e529bd56",
+ "sha256": "1qajlsqsvrngzbb1qss7xadrajgdk4pc6nvvyw6443p6947yx7rk"
},
"stable": {
"version": [
@@ -49690,11 +50806,11 @@
"repo": "TobiasZawada/html-check-frag",
"unstable": {
"version": [
- 20160131,
- 535
+ 20201106,
+ 1748
],
- "commit": "feb89765eafd69dfcf07afeebded8985dc456e7c",
- "sha256": "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay"
+ "commit": "b9d1f2003a126c2e8b6d469964ec2278ad55c9df",
+ "sha256": "1glkix6ixk4ya7b9np7h82y395g6cb880yy5hrx0iyim02cb0r87"
}
},
{
@@ -49804,20 +50920,20 @@
"repo": "jcs-elpa/htmltagwrap",
"unstable": {
"version": [
- 20190517,
- 511
+ 20200929,
+ 559
],
- "commit": "35c62dd95c580fad49f84c5270cd69810455fedd",
- "sha256": "1gh6acc21lfnng4hlgf6wv5pv4zcs9j44i25grrac0714sa2lm81"
+ "commit": "8cb33f9513d79e44a602927f35d5a3bb0dccbb92",
+ "sha256": "0x72qh6pmaw3dfnx296flbvbm1sxgljz4997jkjwiss2pr7qsgx0"
},
"stable": {
"version": [
0,
0,
- 2
+ 3
],
- "commit": "3260d9267b51019328c30a6317f28e4a2dd7d522",
- "sha256": "15rfg4z8lhwadgnr58r3skmzmkxs5phnqr1ap4bjd9pq618amdbn"
+ "commit": "8cb33f9513d79e44a602927f35d5a3bb0dccbb92",
+ "sha256": "0x72qh6pmaw3dfnx296flbvbm1sxgljz4997jkjwiss2pr7qsgx0"
}
},
{
@@ -49828,15 +50944,15 @@
"repo": "emacs-pe/http.el",
"unstable": {
"version": [
- 20181008,
- 2121
+ 20201010,
+ 920
],
"deps": [
"edit-indirect",
"request"
],
- "commit": "1bbfff5994e16ffc185c4ac28d792cb040da3351",
- "sha256": "0bs2l487mn8zkx3h7zgynm5cq54w8wlr150izaxynqddcpkrr44h"
+ "commit": "5fdceed1fbf36e274e578e349a53ce922c574774",
+ "sha256": "0anpwnbjif6aahv8wg4mrd6afch9brnzgbgcx05p18dnc1hjxzbm"
}
},
{
@@ -49965,11 +51081,11 @@
"repo": "humanoid-colors/emacs-humanoid-themes",
"unstable": {
"version": [
- 20200403,
- 1939
+ 20201208,
+ 1625
],
- "commit": "22c9a0987c7d746d7eb9fe850f93f232d91cae14",
- "sha256": "1h3v76p17mzigwr0kpjlm5fgas4vvrm59g73l1699pnq1n1i5kgx"
+ "commit": "d1d12a59daa4ba542854e9b59d73f1763219fb54",
+ "sha256": "1mxjx5ib5xzjmr0dbk0bsjr8mkxiq4yjwrhfah3xw7lm51j0d74n"
}
},
{
@@ -49995,11 +51111,11 @@
"repo": "nflath/hungry-delete",
"unstable": {
"version": [
- 20200807,
- 2257
+ 20201007,
+ 2024
],
- "commit": "671d941de0176255b79820a662d5a694607cf28a",
- "sha256": "1cnbyixm1dihcvvfqx591qcjcrs963d2swn9rbrwkplm4a5fyxhf"
+ "commit": "0513152525c38519a5597db2d6495b56dd9cc3f0",
+ "sha256": "0250s6snh5z3w1g98rfgahzh8ys51gl3l5sk7b2wi39h2rdlzcqg"
},
"stable": {
"version": [
@@ -50019,16 +51135,16 @@
"repo": "hylang/hy-mode",
"unstable": {
"version": [
- 20200730,
- 2340
+ 20201010,
+ 1351
],
"deps": [
"dash",
"dash-functional",
"s"
],
- "commit": "55e84cadbdb63427a8d531992df3990414a26688",
- "sha256": "0mrml5cy3isgy5mybxm8mrzqcrxrw4nn9yxchyjakkqzvfjk8gm1"
+ "commit": "5253533ddbd55f58168d00940352a82a66d38fec",
+ "sha256": "0zdy0j99slklblvgggyihkj3w7iy296jbj0mk3ni7k8mvx859hcr"
},
"stable": {
"version": [
@@ -50083,11 +51199,11 @@
"repo": "Riyyi/emacs-hybrid-reverse",
"unstable": {
"version": [
- 20200819,
- 240
+ 20200830,
+ 331
],
- "commit": "18b1b786fb4346ad31ec76df75cb672ef5cc7cbf",
- "sha256": "03wgxhly8n3j05l9k3pzixczj4xzqd499k0l3d4nngsxps2v67w3"
+ "commit": "a28044a1dc42920b5107986dadef8322877c3d81",
+ "sha256": "0fxybcmnrgfa0xyj562nng6ff6jm9dk78bwdc8vs6ffyccd6dmij"
}
},
{
@@ -50145,15 +51261,15 @@
"repo": "abo-abo/hydra",
"unstable": {
"version": [
- 20200711,
- 1210
+ 20201115,
+ 1055
],
"deps": [
"cl-lib",
"lv"
],
- "commit": "112e689f75b59398d8eca79ac6562dca12b8a959",
- "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d"
+ "commit": "2d553787aca1aceb3e6927e426200e9bb9f056f1",
+ "sha256": "13zjw64x728pm1a44lzzv9s9r5kkss0ncwqzzczhk8bvmsi7m1l3"
},
"stable": {
"version": [
@@ -50170,11 +51286,41 @@
}
},
{
- "ename": "hyperlist-mode",
- "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
- "sha256": "0c3jdwbarxvnczfx2g3g1m53kiyjls7l48s6l4bzxl2w4x8axvsw",
+ "ename": "hyperkitty",
+ "commit": "d9cec9706c0f06b631777c30ae38198d60b61c7f",
+ "sha256": "1axxjpmmhwc0b4f8hvq3cz4crmd9xajlhzj2lm4r942pdf3n7bp3",
"fetcher": "github",
- "repo": "Vifon/hyperlist-mode",
+ "repo": "maxking/hyperkitty.el",
+ "unstable": {
+ "version": [
+ 20200927,
+ 106
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "ad65766fee2675bf123491544707b056b89b52ce",
+ "sha256": "1h819sxbzpcnr6mkl6aw9qxhyhkydppwwwqsgyw9qfil9sk8hyff"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 2
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "fcb923616e69d8f72c2f4a666d381a6a66bc12bc",
+ "sha256": "0s9vabpzcziqab0f2zclyvw6ly1h8d065mijafg7jhxgsiicnx4v"
+ }
+ },
+ {
+ "ename": "hyperlist-mode",
+ "commit": "894fc311ce17af18e02ea64909905e84967efbc9",
+ "sha256": "1jmfgj2ziihwpzylj57pbbdn0vhddk49vbzwl0s6fjc4mf1kipsb",
+ "fetcher": "github",
+ "repo": "vifon/hyperlist-mode",
"unstable": {
"version": [
20200515,
@@ -50198,8 +51344,8 @@
"deps": [
"s"
],
- "commit": "825ac47887bf2f63e7dc2ecce264a52d9f0fae70",
- "sha256": "00bjwgg67y6igm2k2rwrw4n35jiw5akhl01mhbggwy999gb01cg2"
+ "commit": "a7ea085baf4a51cac0513cb57216677722938781",
+ "sha256": "004bdas6339af8zzb2agc27vb86wwbxxinp1n4fhswnlb2llr18c"
},
"stable": {
"version": [
@@ -50244,6 +51390,21 @@
"sha256": "16rwqfg517ask3y6mqxw689w8xx4i51nq8js5wnzbz9a55aj776n"
}
},
+ {
+ "ename": "i3wm-config-mode",
+ "commit": "c1268384df42cd7a0946c269d5e5544113d7dcd2",
+ "sha256": "0kh3ws9y4pvjr59ga1jxsgsldp4sjfyfq9a1mgzh6gkfmjshkkmf",
+ "fetcher": "github",
+ "repo": "Alexander-Miller/i3wm-Config-Mode",
+ "unstable": {
+ "version": [
+ 20201105,
+ 2022
+ ],
+ "commit": "c70bdc1367e461299e13a4797bc9d9d950184edd",
+ "sha256": "1kpnm7ph0ydm0h5jxwff316yy4aff6ml9x7f4z5zgm4wmgn0bxc5"
+ }
+ },
{
"ename": "ialign",
"commit": "072f1f7ce17e2972863bce10af9c52b3c6502eab",
@@ -50474,11 +51635,11 @@
"repo": "oantolin/icomplete-vertical",
"unstable": {
"version": [
- 20200616,
- 2322
+ 20201206,
+ 759
],
- "commit": "a5871d39c5850ac4d9aac48350eaa1d31f3aaef7",
- "sha256": "00sp2n8kb38nrkgs11m3jpijj9qnsdmy3sp37c1v6p7lgnzly80i"
+ "commit": "ef12199fdf53c4a0fe7691850e133dabba58b147",
+ "sha256": "04zfnjyy7v4acgh6bhkd71vmwhsghjncjyvn945jm6lx473k3j35"
},
"stable": {
"version": [
@@ -50497,15 +51658,15 @@
"repo": "plandes/icsql",
"unstable": {
"version": [
- 20190815,
- 501
+ 20201110,
+ 512
],
"deps": [
"buffer-manage",
"choice-program"
],
- "commit": "5e5cd04e3f3ad9963c29759293c1f7a54257866b",
- "sha256": "0y9nsdkw8sahb3vgrgc278dys7m3nqzq6wgcifhhcsvv1bgs93hd"
+ "commit": "155051cc4122cc71e5b72c1e330b5115fe2dfde5",
+ "sha256": "04jrlkks3s3yri86vy3dk173yz76h4bnbk0vmby5lqpx2r1zvgh5"
},
"stable": {
"version": [
@@ -50960,11 +52121,11 @@
"repo": "creichert/ido-vertical-mode.el",
"unstable": {
"version": [
- 20180618,
- 2101
+ 20201012,
+ 1514
],
- "commit": "16c4c1a112796ee0bcf401ea39d3e2643a89feaf",
- "sha256": "10cfm765qwba0bnablwy8c4mjxvb1lwm89d16svwhp1pn20an6a8"
+ "commit": "5a6e17048528c328c129db6dccfe605f301ddef2",
+ "sha256": "19mwbz6a67a76pm9820w3rvz0mb54gx09nq5fzz4lkwn94578kyn"
},
"stable": {
"version": [
@@ -51082,11 +52243,11 @@
"repo": "victorhge/iedit",
"unstable": {
"version": [
- 20200807,
- 853
+ 20201125,
+ 342
],
- "commit": "59430e8c11c1fa9a294a070a3b1d571bd3887806",
- "sha256": "1phm9n25hdg7v7gjjb5l173hrsgb64rc5frmdpchkd7li4ka4g91"
+ "commit": "313997a2504e565a34e84fdb59a5a7ffd223328b",
+ "sha256": "08gaz5ia70hg66a4i4gdyhnaggpf7m39gqilbx88dy9ccg4lywa0"
},
"stable": {
"version": [
@@ -51122,11 +52283,11 @@
"repo": "jrosdahl/iflipb",
"unstable": {
"version": [
- 20200731,
- 1655
+ 20201128,
+ 833
],
- "commit": "d48884212499cd128d103c5ceba3173a90ebd2b4",
- "sha256": "0qbdaf41zpm846jjkr9sgarb7iivpvb1qj5izsd5v4w1sz6igwf4"
+ "commit": "4a5f051d4850024343663bdaec6f0bdff7cd930e",
+ "sha256": "07lx4nmmya6kxcvapadj002fvyjkz0c7wpca1bx2pzs2j6z6mfw2"
},
"stable": {
"version": [
@@ -51329,6 +52490,21 @@
"sha256": "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9"
}
},
+ {
+ "ename": "imbot",
+ "commit": "93148f04643d7b7325232e9badbca166aba26759",
+ "sha256": "1mn1qb65q87r36jl7r8ygvcy1xg004wfm4ali4xcb87ahid0y0mk",
+ "fetcher": "github",
+ "repo": "QiangF/imbot",
+ "unstable": {
+ "version": [
+ 20201204,
+ 801
+ ],
+ "commit": "17b586307065f868a999e58fab30749d1b722aa2",
+ "sha256": "14c48zgdi54i9yz8ya6vgclafzqpfnjxsxf4dvzxcn74p4sb246z"
+ }
+ },
{
"ename": "imenu-anywhere",
"commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
@@ -51443,20 +52619,20 @@
"repo": "petergardfjall/emacs-immaterial-theme",
"unstable": {
"version": [
- 20200818,
- 638
+ 20201202,
+ 1801
],
- "commit": "d7f18842f5e97977684c3dbb550c418b7625b343",
- "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw"
+ "commit": "d965b9b29e1ade16aa92b934ac888616409a95c5",
+ "sha256": "1s72wj88rannk0byz3689yff3wks4k80xcxkcmh1c4gja6zbj99r"
},
"stable": {
"version": [
0,
- 5,
- 5
+ 6,
+ 2
],
- "commit": "d7f18842f5e97977684c3dbb550c418b7625b343",
- "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw"
+ "commit": "fe8875f116cead5bff6befb6c77a6ebb6f20a490",
+ "sha256": "0gpy8pvaw66pvas1j1f74aa6fyxm1z43kqlan297l4jviw4rh4gs"
}
},
{
@@ -51530,6 +52706,36 @@
"sha256": "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf"
}
},
+ {
+ "ename": "impatient-showdown",
+ "commit": "dab7093f0c678fcb381e048a49044dd26032cf6f",
+ "sha256": "0iyh3681cvlamz5x73b3kls2l6yp6l2d8m0bq4m3m1aaq4pbl3qv",
+ "fetcher": "github",
+ "repo": "jcs-elpa/impatient-showdown",
+ "unstable": {
+ "version": [
+ 20200914,
+ 221
+ ],
+ "deps": [
+ "impatient-mode"
+ ],
+ "commit": "9ad16da9f78ae242b0a6fb1de388d5f4f1264207",
+ "sha256": "0h665wxnz3l97dxgk2rw3v0sdhb2lr30iqmf4q304wk7ljxg6lig"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 2
+ ],
+ "deps": [
+ "impatient-mode"
+ ],
+ "commit": "b0c2da8e5936809f534c055beb6540b4f8721ed4",
+ "sha256": "0kpcxiiwgg430cm8ci21h583fxpff5ayn11al1md50sc26gc456n"
+ }
+ },
{
"ename": "import-js",
"commit": "6f26b8281f9bd05e3c8f2ef21838275711e622c9",
@@ -51760,8 +52966,8 @@
"repo": "NicolasPetton/Indium",
"unstable": {
"version": [
- 20200116,
- 1247
+ 20201103,
+ 2040
],
"deps": [
"company",
@@ -51770,14 +52976,14 @@
"json-process-client",
"seq"
],
- "commit": "59f12cb1bc73bb399e00b2c6c69d21bdcb9c0955",
- "sha256": "06x20zapygdgh7i2nr3c8xk8znrpp69yl5vpz08kkix7vssr9sxx"
+ "commit": "b870d1ed6b350d3753e7a148c61c373ca76ba78a",
+ "sha256": "1fscqkpk3z6pxgy1kf548jbck5p57k02badm7j8ggixbvng63d3g"
},
"stable": {
"version": [
2,
1,
- 4
+ 7
],
"deps": [
"company",
@@ -51786,8 +52992,8 @@
"json-process-client",
"seq"
],
- "commit": "9614d63fa5a5126bd5b68d62410894371da081bf",
- "sha256": "1cvc9nk1cbym0ah6z0zmgv9bywj3lxvcaflywmavnn4gvxg67m9n"
+ "commit": "7211c9f18b397c3dde713c33495a39de3fcd9998",
+ "sha256": "0rln6pq5zjh3h54l72ni2637y9z3jx67ks8bmmj1b99is8508vg8"
}
},
{
@@ -51819,8 +53025,8 @@
"deps": [
"clojure-mode"
],
- "commit": "2c8e46b584be71fe1a585c9072da86382710dc59",
- "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b"
+ "commit": "e291da3cd0c11271ad7372594139974057612172",
+ "sha256": "1cnr72s3d224l7wk742hlj5mlgr65pchfc2w6dz9gx3ww6by9b8l"
},
"stable": {
"version": [
@@ -51888,11 +53094,11 @@
"repo": "nonsequitur/inf-ruby",
"unstable": {
"version": [
- 20200730,
- 1456
+ 20200826,
+ 1458
],
- "commit": "9f0f79ff459c7c417e8931ca020db121e24b45b5",
- "sha256": "0h0kxgihjrabklnwfphaf86b67q0wmfjywffrydhdmlidi56rbis"
+ "commit": "b0124578db09b64902c8ca981b02e74bec92ef36",
+ "sha256": "0ivk80x6sfns4c5s21sr4qrg1zysqq3s8rz2hx8s55f7jbq4k51w"
},
"stable": {
"version": [
@@ -52190,20 +53396,20 @@
"repo": "Kungsgeten/ink-mode",
"unstable": {
"version": [
- 20200611,
- 1807
+ 20201105,
+ 2242
],
- "commit": "f610a2e7a5a5b176bdc831c66e52f85dc0e7e450",
- "sha256": "0bssmf9nsg58xavf55wz1y7akw90bacxqd2czhmj4fnmykqd7cnz"
+ "commit": "63c7ef39acf434a1682951bcf352e8fe1e1ac6d9",
+ "sha256": "1akjzbivwgpywfbazid8r8300nm5wnsj0nw5hmb25xlrcxl88y79"
},
"stable": {
"version": [
0,
3,
- 0
+ 2
],
- "commit": "f883fefb739d62e75a3f7247ea5c6ba8a0895c23",
- "sha256": "1hr1n0xzjs84a2rgz4mfhhz3d2a7ibgn3wx4kg3qbjlwlwz17x0d"
+ "commit": "71d215712067729eb92e766a3b2067e7f3254183",
+ "sha256": "00k2jihpk5xi3pnsdcdxhi570lw6acsdpc0impwvm9zq9mw3rik3"
}
},
{
@@ -52214,11 +53420,11 @@
"repo": "ideasman42/emacs-inkpot-theme",
"unstable": {
"version": [
- 20200616,
- 434
+ 20201103,
+ 139
],
- "commit": "0a5f50c3aa590404ae81cdb08eb869ffc04da625",
- "sha256": "0hnhq51r0rrl2i3hiwzqzax6cwm3j480w1w2nn8hy61x5p37wn06"
+ "commit": "fb5839ae7307a56a7f4d7ba71d05c9ecc051927e",
+ "sha256": "1qxmzdhyhh71yivdix1qg4d4wkv7rzfljby03bliv46165i2xsms"
}
},
{
@@ -52283,6 +53489,21 @@
"sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q"
}
},
+ {
+ "ename": "insert-char-preview",
+ "commit": "d8f3ae2c4ed25ee4ba28b787270f7abd35d7392c",
+ "sha256": "1zs4rv310ry0a5fhji9b0r6xmyh6lr799c49adg3ghy5y6kgp7ry",
+ "fetcher": "gitlab",
+ "repo": "matsievskiysv/insert-char-preview",
+ "unstable": {
+ "version": [
+ 20201023,
+ 2108
+ ],
+ "commit": "0e4a62b5407fb1bed8920a4c13cf9a91065e15ad",
+ "sha256": "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg"
+ }
+ },
{
"ename": "insert-esv",
"commit": "de7f7ac1b8e67da50a1bce7f23a0805f8b8dfc06",
@@ -52291,14 +53512,14 @@
"repo": "sam030820/insert-esv",
"unstable": {
"version": [
- 20200808,
- 1832
+ 20201201,
+ 722
],
"deps": [
"request"
],
- "commit": "cf23d1d7e230c0b9212f8eeceff398f86c991b07",
- "sha256": "0jqz6krd8b606nqr4q169qcg7dbbwa86gi2rcxvnx5i3jhfhrmab"
+ "commit": "067bdd92ab2fccdfdee3d8707aa570527c74fd6a",
+ "sha256": "10dh7rbr4fhz5db5vm5za8x6cnjbrlgc98af5qr0462zc9gq7xif"
},
"stable": {
"version": [
@@ -52342,20 +53563,20 @@
"repo": "psachin/insert-shebang",
"unstable": {
"version": [
- 20180403,
- 1214
+ 20201203,
+ 1648
],
- "commit": "af5f95ff98e2432837f5aa848ba38dd626e82fce",
- "sha256": "0rdh4bzwq60m641r41kbsgzpkx8hxl7vx82y1cf7zp8zk8la4pd8"
+ "commit": "cc8cea997a8523bce9f303de993af3a73eb0d2e2",
+ "sha256": "0wvcdv2lfv68r3zyfzr9yahm3gvc60yzk8zi39l70vsgzh4yfq91"
},
"stable": {
"version": [
0,
9,
- 6
+ 7
],
- "commit": "adfa473f07443b231914d277c20a3419b30399b6",
- "sha256": "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"
+ "commit": "d5cf5bad3ea3e5dc86fb19eb3545149935e10dbd",
+ "sha256": "14yqqjfanwwysrcxxdnxr2b2ybywzil7ywrwxnh3rsyv8fs2ymry"
}
},
{
@@ -52606,24 +53827,6 @@
"sha256": "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s"
}
},
- {
- "ename": "ioccur",
- "commit": "308c27227795560adf8c979ba1d046286549843d",
- "sha256": "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6",
- "fetcher": "github",
- "repo": "thierryvolpiatto/ioccur",
- "unstable": {
- "version": [
- 20200326,
- 1341
- ],
- "deps": [
- "cl-lib"
- ],
- "commit": "59350b2066d61444f93c8a51b16353e746486e4c",
- "sha256": "1055db76008a5nkb243ciq680fg4nn5yzkdv4x8sd1mq1hrs33qh"
- }
- },
{
"ename": "iodine-theme",
"commit": "6893ce6309f1e3b3457c99e84611044e653b827a",
@@ -52781,15 +53984,15 @@
"repo": "Sarcasm/irony-mode",
"unstable": {
"version": [
- 20200130,
- 849
+ 20201018,
+ 1707
],
"deps": [
"cl-lib",
"json"
],
- "commit": "1e1aabaa686a08767ab33e5cd43ce8f0ebf8d020",
- "sha256": "1v3q0k93sviv2nn6qsi8f0537w2g0g6c3wamaidlcb019a5rj4vn"
+ "commit": "76fd37f9616f5c851106654c8fb5eb98670d351f",
+ "sha256": "1kbskyfw04l8cra6phlxblhkn38p5l6mm2xyjdsxxlfhcc0vwi02"
},
"stable": {
"version": [
@@ -52850,26 +54053,26 @@
"repo": "jcs-elpa/isearch-project",
"unstable": {
"version": [
- 20200717,
- 807
+ 20200907,
+ 1453
],
"deps": [
"f"
],
- "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64",
- "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj"
+ "commit": "1077b395e1c34a734120faf1f3a7feae6dc4d9c5",
+ "sha256": "1zdlk6s0j0825wy2blpxhsg5pxaybk5adxxpjvm6jj9r612xyn73"
},
"stable": {
"version": [
0,
2,
- 4
+ 6
],
"deps": [
"f"
],
- "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64",
- "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj"
+ "commit": "1077b395e1c34a734120faf1f3a7feae6dc4d9c5",
+ "sha256": "1zdlk6s0j0825wy2blpxhsg5pxaybk5adxxpjvm6jj9r612xyn73"
}
},
{
@@ -53097,11 +54300,11 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200818,
- 1250
+ 20201110,
+ 1021
],
- "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
- "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f",
+ "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6"
},
"stable": {
"version": [
@@ -53128,8 +54331,8 @@
"avy",
"ivy"
],
- "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
- "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f",
+ "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6"
}
},
{
@@ -53140,16 +54343,16 @@
"repo": "tmalsburg/helm-bibtex",
"unstable": {
"version": [
- 20200429,
- 1606
+ 20201014,
+ 803
],
"deps": [
"bibtex-completion",
"cl-lib",
"swiper"
],
- "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35",
- "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5"
+ "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c",
+ "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix"
},
"stable": {
"version": [
@@ -53199,15 +54402,15 @@
"repo": "wandersoncferreira/ivy-clojuredocs",
"unstable": {
"version": [
- 20200714,
- 1111
+ 20201129,
+ 2355
],
"deps": [
"edn",
"ivy"
],
- "commit": "0ea57b70a144ecfa80fbd2ec383ebabedb524c37",
- "sha256": "1hqs45573651jw248zcyczby4fwp4pdgil2n9rk4lvgb89531qlz"
+ "commit": "8b6de19b3578c72d2b88f898e2290d94c04350f9",
+ "sha256": "1jlax3qymv8j516g319cqs8q6vq34pdrlg7mwwb2vsklynd291c5"
}
},
{
@@ -53449,8 +54652,8 @@
"hydra",
"ivy"
],
- "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
- "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f",
+ "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6"
},
"stable": {
"version": [
@@ -53584,15 +54787,28 @@
"repo": "tumashu/ivy-posframe",
"unstable": {
"version": [
- 20200528,
- 553
+ 20201124,
+ 404
],
"deps": [
"ivy",
"posframe"
],
- "commit": "44749562a9e68bd43ccaa225b31311476fab1251",
- "sha256": "12wj8v483jjnpjvcgkhlm0p971s06c58c3fd73pgnzzppf0fn7xd"
+ "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a",
+ "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 5,
+ 3
+ ],
+ "deps": [
+ "ivy",
+ "posframe"
+ ],
+ "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a",
+ "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr"
}
},
{
@@ -53610,8 +54826,8 @@
"ivy",
"prescient"
],
- "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
- "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
+ "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95",
+ "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0"
},
"stable": {
"version": [
@@ -53665,14 +54881,14 @@
"repo": "Yevgnen/ivy-rich",
"unstable": {
"version": [
- 20200601,
- 104
+ 20201125,
+ 433
],
"deps": [
"ivy"
],
- "commit": "10970130b41c6ef9570893cdab8dfbe720e2b1a9",
- "sha256": "0zpkgj2q16hncafpbap32ypm3666j2vvcrwsn78mca9i82j7xg7l"
+ "commit": "c0a164ce42920df0629c87dad5ea1bddc79ceac3",
+ "sha256": "0x2q8gnj324rnpyryyas8b1b9sljsp7dgwhn9rv0kjn99j1vaphy"
},
"stable": {
"version": [
@@ -53702,8 +54918,8 @@
"ivy",
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -53718,6 +54934,42 @@
"sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
}
},
+ {
+ "ename": "ivy-searcher",
+ "commit": "6263a1c7140f349fe3eef8542e57f6a817b9e868",
+ "sha256": "0alvk5n5m8lpf6bllqbdprlc49pdf2z3mdfp7zkjmw7w9n3gzsla",
+ "fetcher": "github",
+ "repo": "jcs-elpa/ivy-searcher",
+ "unstable": {
+ "version": [
+ 20201001,
+ 834
+ ],
+ "deps": [
+ "f",
+ "ivy",
+ "s",
+ "searcher"
+ ],
+ "commit": "8eb55ff22b4b833094232acb35ec46261f069fa3",
+ "sha256": "0in9xihr2v6xn7iqlj5zz0h127bg4yf9hmrfvgxn53pcivzj9vw9"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 8
+ ],
+ "deps": [
+ "f",
+ "ivy",
+ "s",
+ "searcher"
+ ],
+ "commit": "8eb55ff22b4b833094232acb35ec46261f069fa3",
+ "sha256": "0in9xihr2v6xn7iqlj5zz0h127bg4yf9hmrfvgxn53pcivzj9vw9"
+ }
+ },
{
"ename": "ivy-todo",
"commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
@@ -53876,30 +55128,6 @@
"sha256": "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a"
}
},
- {
- "ename": "iy-go-to-char",
- "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f",
- "sha256": "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz",
- "fetcher": "github",
- "repo": "doitian/iy-go-to-char",
- "unstable": {
- "version": [
- 20141029,
- 1546
- ],
- "commit": "04ab4f5f3a241cbbc9b8c178a22b412a62f632f9",
- "sha256": "0bcm3y3qvsrk7gd23xfzz5bgcnm3h4l63w9hv8cr9n86sm8475m1"
- },
- "stable": {
- "version": [
- 3,
- 2,
- 1
- ],
- "commit": "77b40d64eef9dad11eca59f4e3fbc6e849de7434",
- "sha256": "1mb0k4lmbkbpn6qzzg8n14pybhd5zla77ppqac6a9kw89fj2qj4i"
- }
- },
{
"ename": "j-mode",
"commit": "410134ab2145adad3648b1024bfe4f6801df82c9",
@@ -54011,8 +55239,8 @@
20200506,
1247
],
- "commit": "76e006dddd491aecccfcb06939db56f9f7daa56d",
- "sha256": "18mz9yiz94xbvjlrpfxgfvv87s3rv3pv4b8y9c5yywr12zp6jbag"
+ "commit": "5d9bb7b953bd9daed9ca15bf27428db4301d60f8",
+ "sha256": "03gzbixxrbf1m9p19j0q72q2wi22viss28kf15az5a0891w10vck"
},
"stable": {
"version": [
@@ -54047,14 +55275,14 @@
"repo": "emacs-jp/japanese-holidays",
"unstable": {
"version": [
- 20190317,
- 1220
+ 20201030,
+ 1053
],
"deps": [
"cl-lib"
],
- "commit": "45e70a6eaf4a555fadc58ab731d522a037a81997",
- "sha256": "041rww8ngvjmgkiviqwq6wci8wgh4bs0wjjc8v8lqpwqhbzf65jy"
+ "commit": "a2075babc0c2158addeb6bec4fb4be604e75002c",
+ "sha256": "1n91ipgzxy36s96lv9w36wqcmlw2mjcm7rkj61z1infpgs6rm3v9"
}
},
{
@@ -54110,11 +55338,11 @@
"repo": "rudi/jastadd-ast-mode",
"unstable": {
"version": [
- 20161219,
- 926
+ 20200926,
+ 1820
],
- "commit": "a29fdb470cbf0a398164950a3b0d2217de48e0c0",
- "sha256": "01fv0ixkshy7i6wzcgq6xvijvh3n402vyhmh3qzjwi9p0vxvdyxv"
+ "commit": "b7a0e32b669e726c8ccc348dd6b18ad4a7c70e1b",
+ "sha256": "1669lchqh07pd5c0b2xv8230dz0189hdn86vm37x8hnv8l742jg6"
}
},
{
@@ -54125,15 +55353,15 @@
"repo": "dakrone/emacs-java-imports",
"unstable": {
"version": [
- 20170913,
- 1410
+ 20201115,
+ 545
],
"deps": [
"pcache",
"s"
],
- "commit": "e96ff44ed48b362ab6227b8b802b84d84f78bcaa",
- "sha256": "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p"
+ "commit": "7083b5efeb23ded95e6c1d2ab0319837851eb42f",
+ "sha256": "0q1wqy946vmz54d0bsfvgs33ma78zfzdvgcprm0s5dczkn434ixd"
},
"stable": {
"version": [
@@ -54238,11 +55466,11 @@
"repo": "donderom/jazz-theme",
"unstable": {
"version": [
- 20200417,
- 2042
+ 20201026,
+ 1027
],
- "commit": "b6694f09e10aa7df14836aac2f6615c32aa572dd",
- "sha256": "1mjzfr2iz72n3ds6d0sqhqd2a5kcfn8d2kji9hqmydmplg247apx"
+ "commit": "0b5bfe7a30590326bdf38120fb4bc25fff21a509",
+ "sha256": "1k1aqi71vqz4smwymkg8h1i502fnld3iwwg04df2c5gk9j5cl7x8"
}
},
{
@@ -54253,11 +55481,11 @@
"repo": "synic/jbeans-emacs",
"unstable": {
"version": [
- 20180309,
- 1625
+ 20200924,
+ 1946
],
- "commit": "3caa95998d8492a2ca6c17971de499ca15609871",
- "sha256": "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r"
+ "commit": "a63916a928324c42bfbe3016972c2ecff598b1ae",
+ "sha256": "1kw5czn7ddzhjhdhb8jpqbd2ha8s68fkk4m4iir09wnqdg6icvl8"
}
},
{
@@ -54495,14 +55723,14 @@
"repo": "john2x/jenkinsfile-mode",
"unstable": {
"version": [
- 20200725,
- 2325
+ 20200929,
+ 428
],
"deps": [
"groovy-mode"
],
- "commit": "00d259ff9b870d234540e00e1d7c83cccdb063b8",
- "sha256": "0srf6xdjnrd4v4ks9pal7i48wmkcl4q5ry7d0yzfx1c9pz2qg9zx"
+ "commit": "65bf3925852c35c6bd499978f08f83c1193f4347",
+ "sha256": "0w38g88yykslg71xr99ff4vx1ffgy90b7xqvvdflr189gwk3avx1"
}
},
{
@@ -54513,8 +55741,8 @@
"repo": "Emiller88/emacs-jest",
"unstable": {
"version": [
- 20200625,
- 1611
+ 20201130,
+ 1920
],
"deps": [
"cl-lib",
@@ -54525,8 +55753,8 @@
"projectile",
"s"
],
- "commit": "4c6ddd3304e199211f0fbdc8a5b83ccbfe1f7fcc",
- "sha256": "1v940c6p77dhs3rf016qqzhaniifkfsspbkpknf7vdssxgk9g1a5"
+ "commit": "b70698d25ffeaa99520d4571659abb3005657398",
+ "sha256": "1n3qn9zgc09bpblv7rmm7lxdaz2ii7wjws0vd30ppdc8dy301gfp"
}
},
{
@@ -54576,6 +55804,30 @@
"sha256": "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"
}
},
+ {
+ "ename": "jetbrains-darcula-theme",
+ "commit": "f4b9f64cae9ab15388352e0d93f34f7e73dbe201",
+ "sha256": "1d31aw9nmgj7m5hvj0qq290v1cfn12ljlvnc6f25g7003a68fv9z",
+ "fetcher": "github",
+ "repo": "ianpan870102/jetbrains-darcula-emacs-theme",
+ "unstable": {
+ "version": [
+ 20200927,
+ 1317
+ ],
+ "commit": "7a934115238d7b80df230a5ba7a70d866bc18c66",
+ "sha256": "087fj39m7gmi3bx2q983afal3738rc5zxnfs4d4c72z065z7gsss"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "05ee1876d58e7858b4526bdcd3ed5ef5e0a67ddf",
+ "sha256": "018zsi3k4yrv1dvgjbnwg3d8kyh4qd22cns3iqkk8br9bzxlv133"
+ }
+ },
{
"ename": "jg-quicknav",
"commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f",
@@ -54689,6 +55941,21 @@
"sha256": "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij"
}
},
+ {
+ "ename": "jmt-mode",
+ "commit": "387b4908dba66caf154103b678ae2d49d530a5d5",
+ "sha256": "1p6fivdcbx76nialqmykbfzfxgx4svjm8b94npwmqcbc3a6liz01",
+ "fetcher": "github",
+ "repo": "Michael-Allan/Java_Mode_Tamed",
+ "unstable": {
+ "version": [
+ 20201205,
+ 2020
+ ],
+ "commit": "c2a0d4aec1dfbc12a705dccb42d33259aef63690",
+ "sha256": "05hyjiskwki6ls2yfbjvs9qdy2d4zzkm9rhd5v4lpdpshdgdwj07"
+ }
+ },
{
"ename": "jonprl-mode",
"commit": "d26b6aea2b0567b971c4f013b58b598e9eb76af6",
@@ -54954,16 +56221,16 @@
"repo": "jakoblind/js-import",
"unstable": {
"version": [
- 20190218,
- 1319
+ 20201209,
+ 735
],
"deps": [
"dash",
"f",
"projectile"
],
- "commit": "2ab3b120cc94ebf4bee2d959c8869440bc4c7484",
- "sha256": "1fv8lpjanyn6chf502lz0j438hfxhqz1b0z2kxsd4jgy20ixchmg"
+ "commit": "0eac79d8d6277dde1c5de39c4bd529bc042f092a",
+ "sha256": "17l570zd8d9r1lg1yfri2w7628p7wp7nm5flq5iwm4v85048pair"
}
},
{
@@ -55052,14 +56319,14 @@
"repo": "mooz/js2-mode",
"unstable": {
"version": [
- 20200725,
- 112
+ 20201209,
+ 225
],
"deps": [
"cl-lib"
],
- "commit": "40aab27581279d0fdbfeb9afeb85f39d401a927f",
- "sha256": "0ysd0ji3vvk2zpjcg1wl7b2hva8471vq0ypib4h6spnpjdr43vzk"
+ "commit": "f7816bdd3e8e84ed1d64b6a13c9ba488363b7e91",
+ "sha256": "05j8m9bdljzscbl343aqqfcjxgvshrlygzqhd2wi8089mby7f59y"
},
"stable": {
"version": [
@@ -55118,14 +56385,26 @@
"repo": "redguardtoo/js2hl",
"unstable": {
"version": [
- 20200729,
- 146
+ 20201119,
+ 816
],
"deps": [
"js2-mode"
],
- "commit": "0255339dbb9fdfb009c94beefdc60e78baae11a7",
- "sha256": "19vw96z28zgkkb93zq6ndslc20yg3qip44fqzvnsf8qr9wxxl3g1"
+ "commit": "d970dd53dec76f9f72ade5b1f8717dea3d45bb3c",
+ "sha256": "0i46frhgmkw6qga1mki9bsrm6zncyca9fr81n1sadmgwfl1rxl28"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 4
+ ],
+ "deps": [
+ "js2-mode"
+ ],
+ "commit": "334028e4c8df957a55986566fe099bb4e325cb00",
+ "sha256": "0yvyv842vzbrhs41fz7lw57x7pb7k3y7d8qif158xdhilfsd2fw0"
}
},
{
@@ -55366,11 +56645,11 @@
"repo": "Sterlingg/json-snatcher",
"unstable": {
"version": [
- 20150512,
- 347
+ 20200916,
+ 1717
],
- "commit": "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c",
- "sha256": "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw"
+ "commit": "b28d1c0670636da6db508d03872d96ffddbc10f2",
+ "sha256": "1nxvi2iqcfp802rn3d2q4b91904nnxfp8w2d4zgak26ry7pjl90h"
},
"stable": {
"version": [
@@ -55399,26 +56678,32 @@
},
{
"ename": "jsonnet-mode",
- "commit": "ba17372732723f73e8eeb6e7c47abc0edeb20da4",
- "sha256": "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia",
+ "commit": "eb347c74506cdc1e6a815848fab5387662bd164e",
+ "sha256": "0j9mwmy103vqk8yp61jbs2rj3aa0a5jqcf46r8k9a46zgsmfkxpc",
"fetcher": "github",
- "repo": "mgyucht/jsonnet-mode",
+ "repo": "tminor/jsonnet-mode",
"unstable": {
"version": [
- 20200812,
- 1558
+ 20201207,
+ 1825
],
- "commit": "c8422a617438c79ade98f8d9eeb2086dacb0378c",
- "sha256": "1r2ic7gbngbwmjjcigphj8jamaff42s7bsn6xz7yfzrci0gm8jrd"
+ "deps": [
+ "dash"
+ ],
+ "commit": "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1",
+ "sha256": "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i"
},
"stable": {
"version": [
0,
- 0,
- 1
+ 1,
+ 2
],
- "commit": "efe768fdcff25d746674fbbf229b9e1a7efea4f1",
- "sha256": "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"
+ "deps": [
+ "dash"
+ ],
+ "commit": "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1",
+ "sha256": "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i"
}
},
{
@@ -55484,11 +56769,11 @@
"repo": "JuliaEditorSupport/julia-emacs",
"unstable": {
"version": [
- 20200717,
- 1915
+ 20200917,
+ 713
],
- "commit": "b5f5983d2b232c8bba4c5eff75cccdb787c19d98",
- "sha256": "0pxaga920bab6n5byag6h0wql2akiybhsh9nlinfx708i9dzmvv6"
+ "commit": "8ea90c7927f6d87a291cfb0216f34dacf43c722e",
+ "sha256": "1ymanbalx41xri5kiqs83a80a72yr9831if6cz2m24pg3g7rwr9c"
},
"stable": {
"version": [
@@ -55546,26 +56831,24 @@
},
{
"ename": "julia-snail",
- "commit": "5510bd5788fc1dab3049100f9a993d89fcd10601",
- "sha256": "0bbz4r0xygx9hcddk5r64w9hycvxqvl7y6z53smlwns1pj7n9wvp",
+ "commit": "2fdf6e0c44266e764ce13489fcd43664cb6e5469",
+ "sha256": "0ymkz9cgacasw7dlc202lj24kimjkv5y3lrk516qrcfvhv3hg06n",
"fetcher": "github",
"repo": "gcv/julia-snail",
"unstable": {
"version": [
- 20200810,
- 1941
+ 20201128,
+ 135
],
"deps": [
- "cl-lib",
"dash",
"julia-mode",
- "parsec",
"s",
"spinner",
"vterm"
],
- "commit": "44d06e18cf9ded6c05936ce10aca0a73f768f457",
- "sha256": "0hpypirqc2hd1zga5qjcx2i7vp3h2vif76npd0j10hiimxal1kxz"
+ "commit": "83f1110a41748cf15ad88924a13f943e58da1409",
+ "sha256": "1f8nxdiq508m2y7r9wbx0gpab03n4zz546qd1x40czxh2xv932ib"
},
"stable": {
"version": [
@@ -55573,19 +56856,46 @@
0,
0,
-1,
- 4
+ 5
],
"deps": [
- "cl-lib",
"dash",
"julia-mode",
- "parsec",
"s",
"spinner",
"vterm"
],
- "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a",
- "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y"
+ "commit": "34498596550b0f819106db8dd6e80dd01332c345",
+ "sha256": "05hrvidpgsinvq7n56c3kfk23x561djchsa10vybjk027fqfvlwb"
+ }
+ },
+ {
+ "ename": "julia-vterm",
+ "commit": "401185621fd57899b314a205ea1ffd9765e570c8",
+ "sha256": "1992mnbpiw9pr2vy8ad4hmb4q02va4ha5995dwqyc2h9hzld35qa",
+ "fetcher": "github",
+ "repo": "shg/julia-vterm.el",
+ "unstable": {
+ "version": [
+ 20201202,
+ 845
+ ],
+ "deps": [
+ "vterm"
+ ],
+ "commit": "d4d5c50f1542d1128e334d32ce385891e0dca7e2",
+ "sha256": "13qi16qlx860a32bfl4l68szfgphv1vr0cd2k151zvqhdsf7fach"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 10
+ ],
+ "deps": [
+ "vterm"
+ ],
+ "commit": "f7b790a49e15644fd4f36795efa412c59e33e49b",
+ "sha256": "1bdhkcy6pr387wf3s13vd5gyy4dwwy8blfdpk83lf7hw7grqzph2"
}
},
{
@@ -55714,10 +57024,10 @@
},
{
"ename": "jupyter",
- "commit": "a63a933e193a52e60950331ec982c5f5cdfaa5d9",
- "sha256": "0p83mkvip1gn5ag2j6s68wzfgg2sf15iyxh7ylads3yw44h26wvi",
+ "commit": "794d1599a68558b090cade556a77fe1f9aebf31c",
+ "sha256": "1h8qcgga4jfxpqw1icfbzrk2qbxsjcslm182q4pgzr43ajids9zv",
"fetcher": "github",
- "repo": "dzop/emacs-jupyter",
+ "repo": "nnicandro/emacs-jupyter",
"unstable": {
"version": [
20200417,
@@ -55792,8 +57102,8 @@
"deps": [
"yaml-mode"
],
- "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743",
- "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad"
+ "commit": "bbceb256bf2b6a56c86aed5963102fb4898aadc9",
+ "sha256": "16ani1d8c9g3v1zpwxcczm5bjbkymd86i1adcvc9xcaz46v7sb3w"
},
"stable": {
"version": [
@@ -55937,16 +57247,16 @@
"repo": "jmorag/kakoune.el",
"unstable": {
"version": [
- 20200621,
- 1818
+ 20201111,
+ 2159
],
"deps": [
"expand-region",
"multiple-cursors",
"ryo-modal"
],
- "commit": "ea8dde5dfe59c54d7729b141024976535b472573",
- "sha256": "04ixj4cpw5iayxxwly5sr19lfnyss5cac0vsd0q1x3ys57y9v9im"
+ "commit": "fa27e48b49d42ed6d8b4492d7c734b0f1e647fc1",
+ "sha256": "1qg6crhqraj78frdqbqr260j9l0h8cdp96bqzwjwai8ia16zskn7"
}
},
{
@@ -55987,6 +57297,24 @@
"sha256": "0g2n73habz844f64p1x66kxpvadv9zh34qmxhql34c3w2sm9mmwf"
}
},
+ {
+ "ename": "kana",
+ "commit": "fd6195cbdf831359a4037db1c0b1ae22769d3464",
+ "sha256": "026mqg1mhhkhqvm90nx3lxwsd6i42gbjx5sy7vkfh2hgxx3jwjrm",
+ "fetcher": "github",
+ "repo": "chenyanming/kana",
+ "unstable": {
+ "version": [
+ 20201012,
+ 1415
+ ],
+ "deps": [
+ "dash"
+ ],
+ "commit": "b93cdbf72a1c818d1a48530ef20c5dec64d7945e",
+ "sha256": "1ikpwghvqjf3bc60xmils2prx99lm1x326mw4gic8n7z9kasqizd"
+ }
+ },
{
"ename": "kanban",
"commit": "c5c918900ad97075d788b3de658cddbb0c94f5d0",
@@ -56059,28 +57387,28 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20200817,
- 1844
+ 20201206,
+ 914
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "380bcb745c9bbf7328b7f190680a0e51231e3c3e",
- "sha256": "1yw1c97ynjjr3md2shrhviiqycaggcmzhkb0i5y49b2w2mdvp1fa"
+ "commit": "65e46afa01da61506d23c16266fa4065b25aec6d",
+ "sha256": "1k3l0yvhkwv0mjhb0z5bq187ixw7avsjf2hyqq46dn3lp1xm0wyv"
},
"stable": {
"version": [
1,
6,
- 0
+ 1
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "3e2c700aa1cf9f0ee17486ef9a7a68f77fb9946a",
- "sha256": "07lydl1b8fz4g4q22ffrl6li9kc3zp9zq5rpqghzr9b8f56ddfqj"
+ "commit": "1114a8d84b60eaf8cadb628a29e0eaf6b5906f69",
+ "sha256": "0hfwxbsq9hdascs2vp56yw86m0ha9148596gm27yiqm6di51l571"
}
},
{
@@ -56170,11 +57498,11 @@
"repo": "carldotac/kdeconnect.el",
"unstable": {
"version": [
- 20180126,
- 2340
+ 20201019,
+ 2211
],
- "commit": "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853",
- "sha256": "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i"
+ "commit": "0f84d916bece8cc4dbfc67a95851f560c5e8e47b",
+ "sha256": "16hyrhq4nydszfpvbjqjjx7kp0w0a9ajw9ybsklgg36074dxip2y"
}
},
{
@@ -56185,11 +57513,11 @@
"repo": "ifosch/keepass-mode",
"unstable": {
"version": [
- 20200216,
- 723
+ 20200928,
+ 2106
],
- "commit": "09dcc1da15808b5b6c22bc5d0cb4e2ba5d425ef8",
- "sha256": "0r3aczydp6435alirl9c2gbb1a92c9mv6ibk9h57ds30z9ia31jr"
+ "commit": "f3d19b4deb14053785e660f1995994581536aecc",
+ "sha256": "1krxcsvqf9f4mi34kn2zgf82z1cai133sgpfa70f5wczqibhfg99"
},
"stable": {
"version": [
@@ -56209,14 +57537,14 @@
"repo": "conao3/keg.el",
"unstable": {
"version": [
- 20200726,
- 228
+ 20201204,
+ 406
],
"deps": [
"cl-lib"
],
- "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
- "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540",
+ "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250"
}
},
{
@@ -56230,8 +57558,8 @@
20200601,
333
],
- "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
- "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540",
+ "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250"
}
},
{
@@ -56249,6 +57577,21 @@
"sha256": "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9"
}
},
+ {
+ "ename": "key-assist",
+ "commit": "32020840f8164cd72cfbf0a5621f1f4171bff642",
+ "sha256": "0142i6vxnb80w61y3wv4fdxk92mxaciq014g8zd0iylqmrlaysnz",
+ "fetcher": "github",
+ "repo": "Boruch-Baum/emacs-key-assist",
+ "unstable": {
+ "version": [
+ 20201109,
+ 1358
+ ],
+ "commit": "dda02615b45a86c806d61e0484e08aa51343f8d8",
+ "sha256": "08zxn25jbd3sqwd2bsbnh9kj8jf5jygyf8x4i8i6k89jw2fd7mds"
+ }
+ },
{
"ename": "key-chord",
"commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1",
@@ -56378,20 +57721,20 @@
"repo": "tarsius/keycast",
"unstable": {
"version": [
- 20200612,
- 2247
+ 20201117,
+ 1552
],
- "commit": "038475c178e90c7bad64d113db26d42cad60e149",
- "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl"
+ "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8",
+ "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr"
},
"stable": {
"version": [
1,
0,
- 3
+ 4
],
- "commit": "038475c178e90c7bad64d113db26d42cad60e149",
- "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl"
+ "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8",
+ "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr"
}
},
{
@@ -56475,14 +57818,14 @@
"repo": "tarsius/keymap-utils",
"unstable": {
"version": [
- 20200413,
- 1858
+ 20201125,
+ 1434
],
"deps": [
"cl-lib"
],
- "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705",
- "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n"
+ "commit": "6cefdf42d95a20565d51974d73ad38749c46cddd",
+ "sha256": "0qlp9hfb3kzp36c03zjxv7sxgsikqmfjm0ynvgqch3bccwqbsz1v"
},
"stable": {
"version": [
@@ -56635,14 +57978,14 @@
"repo": "DamienCassou/khardel",
"unstable": {
"version": [
- 20191124,
- 1257
+ 20201019,
+ 553
],
"deps": [
"yaml-mode"
],
- "commit": "5ee835a4429c58dec3900e4fa3d7cc1e778c969b",
- "sha256": "0k2q0m7g9bj4k5xc4cldhi7cfbb114g016abyzq3q3jaymja195z"
+ "commit": "ca021fad32430e3f3a995d4158e73b5ee485258d",
+ "sha256": "0p210q71cn7a4sg82638mxc4v8b2lyi6yv888fjzwnxc804ahwxc"
},
"stable": {
"version": [
@@ -56813,8 +58156,8 @@
20180702,
2029
],
- "commit": "f34c43f235f35767ed04765a90d68b23807436ba",
- "sha256": "06pgjd79kvkpznniw90hrsb7fvc0y3hhnxs6pyay869d50vbyw53"
+ "commit": "e16794aa7d98f5b849222971f7a56fe8ab9a3d9c",
+ "sha256": "0chaxdwnbxwn0zx6w8bwx6sc3adb835rbppmbj1mdbj2hcx0zghd"
},
"stable": {
"version": [
@@ -56822,10 +58165,10 @@
0,
0,
-1,
- 3
+ 4
],
- "commit": "20c14b2a2bac73288a4c2808843910364565f66a",
- "sha256": "1mf3if96cvxc8sqy22h4j2aq320ngw6q2286psvpq9v1mhv0wna4"
+ "commit": "d74461b200a2182581f229082b041a4c70a673cb",
+ "sha256": "0ymk105915prhmxw3nmmgr756hzxpxwds860x5aim8jjgxhky446"
}
},
{
@@ -57003,11 +58346,11 @@
"repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode",
"unstable": {
"version": [
- 20191102,
- 1510
+ 20200925,
+ 1541
],
- "commit": "8e6dd578f2b3d77ac33b6384d2bfe1b1f6799a1a",
- "sha256": "12gwy76kz4qjw1qxma4q9pk9s2arzr5p95ni5vzizm2p4x4c5a8x"
+ "commit": "0e4bafb31d1fc2a0a420a521c2723d5526646c0b",
+ "sha256": "09inpgwmnnqaakyn4r4xs8kax8b89dw94kvl521x6d43h9zl5i70"
}
},
{
@@ -57101,24 +58444,31 @@
"repo": "abrochard/kubel",
"unstable": {
"version": [
- 20200812,
- 2143
+ 20201111,
+ 1534
],
"deps": [
"dash",
"s",
- "transient"
+ "transient",
+ "yaml-mode"
],
- "commit": "55099f130803b56eb1f7595ba34a313df4ec138a",
- "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw"
+ "commit": "746c990d05af22942136b8f9ebe91e40ec044cec",
+ "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd"
},
"stable": {
"version": [
2,
- 0
+ 1
],
- "commit": "6fafe9c2b8edcb9df96965a315474c83a90b1809",
- "sha256": "1q1wkwsx9dyjw1b6cxnz1w0xi8r75x7n6iq18v038ny2k110m6g9"
+ "deps": [
+ "dash",
+ "s",
+ "transient",
+ "yaml-mode"
+ ],
+ "commit": "746c990d05af22942136b8f9ebe91e40ec044cec",
+ "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd"
}
},
{
@@ -57136,20 +58486,20 @@
"evil",
"kubel"
],
- "commit": "55099f130803b56eb1f7595ba34a313df4ec138a",
- "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw"
+ "commit": "746c990d05af22942136b8f9ebe91e40ec044cec",
+ "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd"
},
"stable": {
"version": [
2,
- 0
+ 1
],
"deps": [
"evil",
"kubel"
],
- "commit": "6fafe9c2b8edcb9df96965a315474c83a90b1809",
- "sha256": "1q1wkwsx9dyjw1b6cxnz1w0xi8r75x7n6iq18v038ny2k110m6g9"
+ "commit": "746c990d05af22942136b8f9ebe91e40ec044cec",
+ "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd"
}
},
{
@@ -57160,16 +58510,16 @@
"repo": "chrisbarrett/kubernetes-el",
"unstable": {
"version": [
- 20200114,
- 436
+ 20200911,
+ 756
],
"deps": [
"dash",
"magit",
"magit-popup"
],
- "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b",
- "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb"
+ "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509",
+ "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg"
},
"stable": {
"version": [
@@ -57201,8 +58551,8 @@
"evil",
"kubernetes"
],
- "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b",
- "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb"
+ "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509",
+ "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg"
},
"stable": {
"version": [
@@ -57337,11 +58687,11 @@
"repo": "ksjogo/labburn-theme",
"unstable": {
"version": [
- 20200309,
- 1556
+ 20200822,
+ 2153
],
- "commit": "d11537a2060df7e992217ede8f65d6c11de49458",
- "sha256": "0aqdl3hq76r315h2h75lxgbyb7hw3hdg49n72frm1wx7hj372d0g"
+ "commit": "4ef2892f56c973907361bc91495d14204744f678",
+ "sha256": "1kpin7r1a1la9s4khrn6rwhgkbib9j7lgyqk9b48fzjhp1h25mgq"
},
"stable": {
"version": [
@@ -57361,11 +58711,26 @@
"repo": "HenryNewcomer/laguna-theme",
"unstable": {
"version": [
- 20191229,
- 19
+ 20200928,
+ 2159
],
- "commit": "0da19f68ba22a39c02d83063f5b4936401ce4d97",
- "sha256": "1r8di1cmhcx2vfk3fsydx24spib1fi4wihnxa41favnkjzklz9jv"
+ "commit": "61b18f6362b94e42ea5ab19a6f2debc2bd917eda",
+ "sha256": "0x46ns9gky937ygnsz899b1c1inffh8zw8icq9ja10pmvx6lh94h"
+ }
+ },
+ {
+ "ename": "lakota-input",
+ "commit": "65110d2232914d55ac87c64276be9a9ccf748b9e",
+ "sha256": "1cjaxp04bm2ncp2b1qkarbrkf4srn075kvf6m5lcpmvj7mfdaz6r",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~shoshin/lakota-input.git",
+ "unstable": {
+ "version": [
+ 20200823,
+ 2146
+ ],
+ "commit": "b74b9de284a0404a120bb15340def4dd2f9a4779",
+ "sha256": "1zn5n34jhjk1shjinjh3nv0x9y61gp7n5ywvmxwijffhva58h3w6"
}
},
{
@@ -57376,15 +58741,16 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20200706,
- 1546
+ 20200929,
+ 612
],
"deps": [
"eglot",
+ "highlight",
"math-symbol-lists"
],
- "commit": "665cb18e484b8e41b0314fc442422b671cda2962",
- "sha256": "0qsd30xnhzcvfdk0p2adzrbzl6hw4z5is0wwirzr79qx025zm4gf"
+ "commit": "75449aee4864f46dd75738206ce01ea6f54c1d7f",
+ "sha256": "0r1mrhvqs65a2v12ymp88viz6dybrrac4ym98g0alnmr19nqrq2d"
}
},
{
@@ -57491,26 +58857,26 @@
"repo": "lassik/emacs-language-id",
"unstable": {
"version": [
- 20200726,
- 1813
+ 20201109,
+ 1105
],
"deps": [
"cl-lib"
],
- "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60",
- "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn"
+ "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1",
+ "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn"
},
"stable": {
"version": [
0,
- 7,
+ 8,
1
],
"deps": [
"cl-lib"
],
- "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60",
- "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn"
+ "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1",
+ "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn"
}
},
{
@@ -57521,20 +58887,26 @@
"repo": "PillFall/Emacs-LanguageTool.el",
"unstable": {
"version": [
- 20200507,
- 610
+ 20201111,
+ 515
],
- "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300",
- "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54"
+ "deps": [
+ "request"
+ ],
+ "commit": "531ab81bf66c778616a326b93d4eedd509dd795e",
+ "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59"
},
"stable": {
"version": [
0,
- 2,
+ 3,
0
],
- "commit": "e7faecf8a7eec8086aafc48a5c4f1908bb5c4300",
- "sha256": "1nb5l1xpgz9z6xplb64a3nx8vis70r9dl0xxly5hddy67i49si54"
+ "deps": [
+ "request"
+ ],
+ "commit": "531ab81bf66c778616a326b93d4eedd509dd795e",
+ "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59"
}
},
{
@@ -57545,8 +58917,8 @@
"repo": "mihaiolteanu/lastfm.el",
"unstable": {
"version": [
- 20200701,
- 715
+ 20201203,
+ 640
],
"deps": [
"anaphora",
@@ -57555,8 +58927,8 @@
"request",
"s"
],
- "commit": "cfa5e9b0b1f54884dc36ae5d8f35e3c6b841ef74",
- "sha256": "1m1qf5f7kq7d720inkks6wwwn4hf40lrz4755gwnnn6d5zf0b1ix"
+ "commit": "31e889476d2003da9a088848ca5212efceb31f7e",
+ "sha256": "0wp9j6ly3sylxzsbmx5nfj815wp2gxh8q5ka1xmfi2y1gy0vw3gp"
},
"stable": {
"version": [
@@ -57791,8 +59163,8 @@
"deps": [
"colorless-themes"
],
- "commit": "736f7a105535901b4783d19534e7855920e25115",
- "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
+ "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136",
+ "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72"
},
"stable": {
"version": [
@@ -57867,11 +59239,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20200817,
- 1226
+ 20201110,
+ 1438
],
- "commit": "7d2f13a103ff275f64086f4ad12308266d1fb48a",
- "sha256": "1ggcbnpahxxjm4h21z9pl9164jwv7mhq4n6k5zagna863a9hlrbw"
+ "commit": "ef0bdd4c4b51e498ad20ded8db3bd81f57054966",
+ "sha256": "1x1192vs2gss5j0722bw296xsvs25f12m3faj26z5dsb8kiw7kgv"
},
"stable": {
"version": [
@@ -57891,16 +59263,16 @@
"repo": "conao3/leaf-convert.el",
"unstable": {
"version": [
- 20200812,
- 1306
+ 20201012,
+ 41
],
"deps": [
"leaf",
"leaf-keywords",
"ppp"
],
- "commit": "d716e0bc3be91a79c791e7a4cb8335132a69d195",
- "sha256": "0a2rqylqzvvfs62rrqkigga9jaxs89b2l8sdzkfb30vwp0y3d0sb"
+ "commit": "c5bce825e4a171076c8f93692111979bcb428cdc",
+ "sha256": "09g4ibd0afdv54cim45ab69cc7zsmx8n0100wqwakmhvpq8g4kf6"
}
},
{
@@ -57911,14 +59283,14 @@
"repo": "conao3/leaf-keywords.el",
"unstable": {
"version": [
- 20200812,
- 1025
+ 20201204,
+ 1545
],
"deps": [
"leaf"
],
- "commit": "c38d9d0d8cdb5a95df788af784e4eb989b674622",
- "sha256": "19a1wrzikbzn2lswf5xwy8145a60mrj9ndj7cx29qrbr8fjcz431"
+ "commit": "ef29ef0ba8e0168f14e5255491c1668673269a37",
+ "sha256": "04z5yir4anb0wnspya8gvcbyjb1qnwkhvb4k0dxivh5l35vr34v8"
},
"stable": {
"version": [
@@ -57938,16 +59310,16 @@
"repo": "conao3/leaf-manager.el",
"unstable": {
"version": [
- 20200812,
- 1004
+ 20200920,
+ 1643
],
"deps": [
"leaf",
"leaf-convert",
"ppp"
],
- "commit": "baea372b3cfc7e1ad6d341d2f06e2932dcebf801",
- "sha256": "031qgwc3pdxxqzkbdkaxd9lq4chngjba1s6q01wm98i5bdj4n4r0"
+ "commit": "b9aaa539677d1492cb16ee595c2e81bf29967475",
+ "sha256": "0klp0yjpf8njdavwh71i7wkl5yrjh42wgakigizgb1l1sksp9iy9"
},
"stable": {
"version": [
@@ -58002,8 +59374,8 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20200620,
- 919
+ 20200930,
+ 604
],
"deps": [
"dash",
@@ -58012,8 +59384,8 @@
"flycheck",
"s"
],
- "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
- "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
+ "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7",
+ "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb"
}
},
{
@@ -58208,24 +59580,6 @@
"sha256": "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7"
}
},
- {
- "ename": "lenlen-theme",
- "commit": "47d5b3c931cdbc2351e01d15e2b98c78081c9506",
- "sha256": "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9",
- "fetcher": "github",
- "repo": "zk-phi/lenlen-theme",
- "unstable": {
- "version": [
- 20170329,
- 245
- ],
- "deps": [
- "color-theme-solarized"
- ],
- "commit": "b8a6412c81633b10fb98ba0930f55b25071c084a",
- "sha256": "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7"
- }
- },
{
"ename": "lentic",
"commit": "cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1",
@@ -58280,6 +59634,21 @@
"sha256": "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww"
}
},
+ {
+ "ename": "leo",
+ "commit": "666936cc58ade8790c327f9b8b7754182a5a174d",
+ "sha256": "06wrnfnx4snccczaxii19bsn45psm6fsx820i1whpwdbf7qyn3vg",
+ "fetcher": "github",
+ "repo": "mtenders/emacs-leo",
+ "unstable": {
+ "version": [
+ 20201122,
+ 2210
+ ],
+ "commit": "b9d8f6705dcec4fcefd4209c18a043c355988c3a",
+ "sha256": "053w15s7lr5y4vay6057by15lymk4n18a8a6hac3a4jrjkzj2f8j"
+ }
+ },
{
"ename": "less-css-mode",
"commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -58349,11 +59718,20 @@
"repo": "fniessen/emacs-leuven-theme",
"unstable": {
"version": [
- 20200707,
- 1143
+ 20201115,
+ 1052
],
- "commit": "a116202c82613c087440d2e8a6a504b08f1862ce",
- "sha256": "1pqv4idkbqbxxvdfqxwf5rq2isl1jikba5nd0z8d7fr09wv48pv7"
+ "commit": "dd56f8df0d134c40f93abcfd2382cfddd97c7cad",
+ "sha256": "0d466z7ggcgh8rhx7245jl7zf1cd1dmpg1z3kq46yxqai4wzvdxv"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 1,
+ 2
+ ],
+ "commit": "c72db2d5aeb5ed8e4ca066c803ae8d30e7540f79",
+ "sha256": "1mv5lv98b3351cwkiw51bq8xx4hmnvk93sx6lkdmq0sciw2qz22i"
}
},
{
@@ -58394,18 +59772,18 @@
"repo": "rvirding/lfe",
"unstable": {
"version": [
- 20170121,
- 1254
+ 20201007,
+ 2214
],
- "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a",
- "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w"
+ "commit": "f7c80281c7005ba5965a8fc410708c08119cfee6",
+ "sha256": "1k6zxyyq0ah3z3gicyxlhj95rnh1rylap33ff945y3h2nl32wlsi"
},
"stable": {
"version": [
1,
3
],
- "commit": "af14b1439097850ffa39935419ed83f5bcaa6d09",
+ "commit": "d8337516ab09edd4b281a27ac85684b81cdeb8bd",
"sha256": "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"
}
},
@@ -58447,26 +59825,26 @@
"repo": "DamienCassou/libelcouch",
"unstable": {
"version": [
- 20190820,
- 1632
+ 20200923,
+ 1836
],
"deps": [
"request"
],
- "commit": "29e369df4f96c7ad95bb33292de7a44122e0b4e7",
- "sha256": "1xaa90dy1jq1yzcn9px931sgqsrsbwrc89lv0lss975jr827kfg2"
+ "commit": "5ae35266c9a2eb33f0c708bc8c0687339cee9133",
+ "sha256": "0vk7m8napg3ss4d9cgsrhkycb5k07q440lspxihy047556l6q3cm"
},
"stable": {
"version": [
0,
- 9,
+ 11,
0
],
"deps": [
"request"
],
- "commit": "fd90ff7989632452434fc19a609805f7276821f3",
- "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1"
+ "commit": "5ae35266c9a2eb33f0c708bc8c0687339cee9133",
+ "sha256": "0vk7m8napg3ss4d9cgsrhkycb5k07q440lspxihy047556l6q3cm"
}
},
{
@@ -58477,11 +59855,11 @@
"repo": "merrickluo/liberime",
"unstable": {
"version": [
- 20200804,
- 147
+ 20201106,
+ 858
],
- "commit": "2a6f1bca1aff64a9136368c4afa15c0ea1042893",
- "sha256": "1nvpy2mclcyi75clcnic7ap5rihccvgf7yn10an4y50sas8g2jiv"
+ "commit": "8d4d1d4f2924dc560bce1d79680df36dcc086d49",
+ "sha256": "0gk2y14lsfc9nw31xhrxqvlf834l8kyjnsqi7rhfk2sl6j1p669v"
},
"stable": {
"version": [
@@ -58531,11 +59909,11 @@
"repo": "mpdel/libmpdel",
"unstable": {
"version": [
- 20200105,
- 1537
+ 20201026,
+ 1122
],
- "commit": "95cb45ecea933e7befb2a5a6a6e7d15651c8746a",
- "sha256": "0g0gsah4y12d2hrk2rsraxqjnd52fkikr0pgcrbrv2mcnqhs8c5m"
+ "commit": "e26060d2139841ef206704e7e0d2f9fa06a1884b",
+ "sha256": "0i48sdhrx1nqnca1kk1iaghb6b3nsxshs6bdd0zfs03b425hhlsv"
},
"stable": {
"version": [
@@ -58570,6 +59948,54 @@
"sha256": "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl"
}
},
+ {
+ "ename": "license-snippets",
+ "commit": "ee306fc9417ecde096af42f9690a139b197ca1c5",
+ "sha256": "0kfvqg7cal0g254d81ryq71vl6vd2bz9sxarxw1f00qsf239mz5r",
+ "fetcher": "github",
+ "repo": "sei40kr/license-snippets",
+ "unstable": {
+ "version": [
+ 20201117,
+ 1619
+ ],
+ "deps": [
+ "yasnippet"
+ ],
+ "commit": "6014e9f4ce1fa2054309343f08bd6751620b56a5",
+ "sha256": "0mrcxczz6j7alpq3fb2fcs24pl4y54i6rm8ly8xb0ib1r98kp874"
+ }
+ },
+ {
+ "ename": "license-templates",
+ "commit": "39a65e959db4f618f7fa36b1c61bf44f48fef8ad",
+ "sha256": "0sp73i9lcgmdci4d8q2fa8sjrc0a0syswn6wd151sgxzk00jmsl2",
+ "fetcher": "github",
+ "repo": "jcs-elpa/license-templates",
+ "unstable": {
+ "version": [
+ 20200906,
+ 2047
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "ef80eff8b7be117f9c48bdc6d9a62e56b0a93554",
+ "sha256": "1z6qd4bcpwdpvi6w9yrkrnk2ypllhm6k4zjl8v1p8k0j93dbn3ny"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 3
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "ef80eff8b7be117f9c48bdc6d9a62e56b0a93554",
+ "sha256": "1z6qd4bcpwdpvi6w9yrkrnk2ypllhm6k4zjl8v1p8k0j93dbn3ny"
+ }
+ },
{
"ename": "light-soap-theme",
"commit": "053be1123bb934d80b4d6db0e7e39b59771be035",
@@ -58593,26 +60019,26 @@
"repo": "jcs-elpa/line-reminder",
"unstable": {
"version": [
- 20200816,
- 1151
+ 20200914,
+ 611
],
"deps": [
"indicators"
],
- "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e",
- "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs"
+ "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5",
+ "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds"
},
"stable": {
"version": [
0,
4,
- 3
+ 4
],
"deps": [
"indicators"
],
- "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e",
- "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs"
+ "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5",
+ "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds"
}
},
{
@@ -58626,8 +60052,8 @@
20180219,
1024
],
- "commit": "ffa07b82102945f18efb4430a6554835c450f6bf",
- "sha256": "1zpqydk8s01f1qmk8aycn67pw48mll0rvrnrjd9q41p2aklhncms"
+ "commit": "ab112e3de44c062d9bebd2e2b32c6c9b9812c43e",
+ "sha256": "1zhdp4k1jm23n28x58vflxw7znxgwmg4711awq5qgicn7srj8vw3"
},
"stable": {
"version": [
@@ -58650,8 +60076,8 @@
20180422,
247
],
- "commit": "a018ba90549384d52ec58c2685fd14a0f65252be",
- "sha256": "0bwc4d2gnfhaqzn455nzrvd9lys7z7ay2v1hxgwp99ndqq93ws6i"
+ "commit": "31bce4b79fe16251b7cf118f0d343b0b46f72360",
+ "sha256": "0r3jqkwwsrcj37m0kvk587aanl2wi50z44q2srhk85aiad4in598"
}
},
{
@@ -58711,8 +60137,8 @@
20191111,
446
],
- "commit": "c9cad101100975e88873636bfd426b7a19304ebd",
- "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi"
+ "commit": "bdf0aa7761d1c1a3bc0652b2fdc4a54b3acdb06a",
+ "sha256": "1vm9m36ab7hs58xqzr4g8lp2s78qzlcsy57f8yajrhibwfh5jrs6"
},
"stable": {
"version": [
@@ -58731,15 +60157,14 @@
"repo": "noctuid/link-hint.el",
"unstable": {
"version": [
- 20200718,
- 1737
+ 20201127,
+ 2144
],
"deps": [
- "avy",
- "cl-lib"
+ "avy"
],
- "commit": "be735e5b57dfad891a7394c116b584bf005fe3b4",
- "sha256": "0vg0pmvyya3gncih6rj83zx6qjm5gh9qs4svxb8f3wd053ppnvk9"
+ "commit": "09ba5727d8ba4a2e5d4f5ce924aaebbc7478ff13",
+ "sha256": "1qw9msvmmb2mzjw4frpnnhp63n5jcwgwxpbbpbaxwbm0pv33zjah"
}
},
{
@@ -58939,8 +60364,8 @@
"repo": "abo-abo/lispy",
"unstable": {
"version": [
- 20200818,
- 1151
+ 20201109,
+ 1728
],
"deps": [
"ace-window",
@@ -58949,8 +60374,8 @@
"iedit",
"zoutline"
],
- "commit": "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70",
- "sha256": "13hzkh0rij40d58v6h232s784p40q1qv24n6bycd89lacn8xrcsr"
+ "commit": "5c8a59ae7dd3dd342e7c86a8c0acdbd13e2989f3",
+ "sha256": "0738v9bp4dlxbwsnykvc35yh4dl4pvw25jl8srb7r3744ydvgyii"
},
"stable": {
"version": [
@@ -58969,30 +60394,6 @@
"sha256": "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6"
}
},
- {
- "ename": "lispyscript-mode",
- "commit": "bf912fa20edc9cff12645381b303e37f2de14976",
- "sha256": "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr",
- "fetcher": "github",
- "repo": "krisajenkins/lispyscript-mode",
- "unstable": {
- "version": [
- 20170720,
- 1917
- ],
- "commit": "def632e3335b0c481fbcf5a17f18b0a8c58dd12f",
- "sha256": "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6"
- },
- "stable": {
- "version": [
- 0,
- 3,
- 5
- ],
- "commit": "9a4200085e2a15725a58616d131a56f5edce214b",
- "sha256": "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk"
- }
- },
{
"ename": "lispyville",
"commit": "b5d96d3603dc328467fcce29d3ac1b0a02833d51",
@@ -59240,14 +60641,14 @@
"repo": "sulami/literate-calc-mode.el",
"unstable": {
"version": [
- 20200703,
- 723
+ 20201025,
+ 2003
],
"deps": [
"s"
],
- "commit": "e855bd718fa7d0d70b8f43264e10664369dd3a37",
- "sha256": "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01"
+ "commit": "a50e897a816cb5580ad6ec867eeaae212e0e4798",
+ "sha256": "0z6y5f1rj28lbr30m6g4a9l6ahs66whi8861g4cx9xzhs84nwv5g"
}
},
{
@@ -59363,20 +60764,20 @@
"repo": "lassik/emacs-live-preview",
"unstable": {
"version": [
- 20200730,
- 1517
+ 20201010,
+ 1948
],
- "commit": "b099cd4d9d4b30d432ffd2ca76f8db1b4c13cd08",
- "sha256": "1sgl9152f16wlafpd1d2sik044h3dplx0ins3b9kwkm0hxgncdfj"
+ "commit": "603a4a1759fbec92e7a1cabc249517c78e59ce7e",
+ "sha256": "1kbfv6qs1wpj0ydg9mc139ifn29rnk6c9p6y5jnvzj15qbd0iih4"
},
"stable": {
"version": [
0,
1,
- 1
+ 2
],
- "commit": "448d6d2b0912a46acd7d9a9b186b53425b1a7626",
- "sha256": "1by62z8pch148ar47453bybg7q9drja73rq3pwcn9jb0yb6gn1xl"
+ "commit": "603a4a1759fbec92e7a1cabc249517c78e59ce7e",
+ "sha256": "1kbfv6qs1wpj0ydg9mc139ifn29rnk6c9p6y5jnvzj15qbd0iih4"
}
},
{
@@ -59390,8 +60791,8 @@
20200709,
422
],
- "commit": "fdc85e5f2ddc72934be704ac90d5436d379c3381",
- "sha256": "1g74m9v5818v8wg2zsm4zb74lzw28zfvlpv98b2dkqzikpxgz362"
+ "commit": "185da3530e3145b7fea7d15e33a8b581bbe3a111",
+ "sha256": "1w32nzp0ym16wsagj933595wic7x8iswgr0fwpv4hkagvcgbqzn2"
},
"stable": {
"version": [
@@ -59486,11 +60887,11 @@
"url": "https://hg.serna.eu/emacs/lms",
"unstable": {
"version": [
- 20200616,
- 1814
+ 20201011,
+ 1051
],
- "commit": "8090ba32866033c3ab580190cc79cac61463a180",
- "sha256": "0l97i08k9qqr76xniac912id0hx5f56psf3v3l4mprs5k8myihj6"
+ "commit": "ee479b60f2a4a49389c5962021e897eb686e7c20",
+ "sha256": "08k0d3rbf00w7056bsbrk782iaji19vhfw9dy2s41dwcd4v1w4ql"
}
},
{
@@ -59534,11 +60935,11 @@
"repo": "rocky/emacs-load-relative",
"unstable": {
"version": [
- 20200722,
- 1109
+ 20201130,
+ 2202
],
- "commit": "85b88d6fbf472381dfdaf0a762215b7e35ceee9b",
- "sha256": "0jajdk2685d1jdw72hp4g0pq9xwbwbnls79nizkydamwhnj8sfcp"
+ "commit": "ff2a827144353d29d70392fd95c14c15df207011",
+ "sha256": "1g8awvbn4f3g611svi58n9sk188skkn7a9jng6nbxbi9diiy3vvz"
},
"stable": {
"version": [
@@ -59753,11 +61154,11 @@
"repo": "dertuxmalwieder/logpad.el",
"unstable": {
"version": [
- 20190927,
- 2043
+ 20201113,
+ 917
],
- "commit": "ff80fd198b196c4db9ca88ae8cf858cae491e121",
- "sha256": "0hc6lp6qmiq9qhn6lx7whfv2w1zz5g2j6azzd9vs695kcbqk5qm7"
+ "commit": "166543873e665936b468d9f120155cce515da3f8",
+ "sha256": "1zk14cif28pz45i2f6p8x1b1cvz0xqjhicj75cb87icy7gvpf2pa"
}
},
{
@@ -59791,28 +61192,27 @@
"repo": "doublep/logview",
"unstable": {
"version": [
- 20200331,
- 2111
+ 20201014,
+ 2033
],
"deps": [
"datetime",
"extmap"
],
- "commit": "c67298a215136617de60c9041904ee6a455dcd4f",
- "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5"
+ "commit": "5a543c53d04d32f0adcc023253888198e0b69589",
+ "sha256": "01vvyf7bbkaj8338dinp6x1w4alld165njb0sh432gdkpa6y2wkm"
},
"stable": {
"version": [
0,
- 13,
- 1
+ 14
],
"deps": [
"datetime",
"extmap"
],
- "commit": "c67298a215136617de60c9041904ee6a455dcd4f",
- "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5"
+ "commit": "249663d768a4ab763e0e7bc6974cff047e774794",
+ "sha256": "1cchmr25z5zj7rgb2fyxkaq8kpw7i5yg1pvn42dvm09c2wrfbj46"
}
},
{
@@ -59991,14 +61391,14 @@
"repo": "abo-abo/lpy",
"unstable": {
"version": [
- 20200722,
- 1159
+ 20201027,
+ 1425
],
"deps": [
"lispy"
],
- "commit": "c6744639ee313ee6dd4bc1e14b651d944b2ee1fd",
- "sha256": "1vypwkx3020wx95cg34zi03pgarbjdhxpchbfvsj6bkd5v4bq6mc"
+ "commit": "c3da907fdc1c7da8b0c19721605bf63d9d1be404",
+ "sha256": "1znjl9v72sy87ir6ia1qkgrfnxdgh9fk5pdl4k002labmsi2aw93"
}
},
{
@@ -60009,8 +61409,8 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20200814,
- 1405
+ 20201206,
+ 1725
],
"deps": [
"dap-mode",
@@ -60021,14 +61421,14 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "437c548d411c9e166b7c658fd45294775235fd5f",
- "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr"
+ "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8",
+ "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc"
},
"stable": {
"version": [
1,
- 14,
- 6
+ 17,
+ 11
],
"deps": [
"dap-mode",
@@ -60039,8 +61439,8 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "437c548d411c9e166b7c658fd45294775235fd5f",
- "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr"
+ "commit": "8180a46ea8699c461a49904432492c7e4e1f6df8",
+ "sha256": "1ms87gzz7ai4ziaigsrpjn8a659yq5c4h1rs1s0f1gdb3qxk43zc"
}
},
{
@@ -60051,33 +61451,15 @@
"repo": "emacs-lsp/lsp-docker",
"unstable": {
"version": [
- 20200222,
- 505
+ 20201102,
+ 1802
],
"deps": [
"dash",
"lsp-mode"
],
- "commit": "5053b697d1541afd436bc4a93f51b6afd8f2b79f",
- "sha256": "0kxvzhrm8l99bmf3zjig7axkfm5mn0yl4l4yfxpvvfsb04iqj10k"
- }
- },
- {
- "ename": "lsp-elixir",
- "commit": "c875a05e68d09ecf37f7e13149f2624c70164ea3",
- "sha256": "0mimb67swcq2yis0s6w2bkk7sgqv7lyvz1hrh48h2q6qr3ywmq0n",
- "fetcher": "github",
- "repo": "elixir-lsp/lsp-elixir.el",
- "unstable": {
- "version": [
- 20190105,
- 2059
- ],
- "deps": [
- "lsp-mode"
- ],
- "commit": "9fd091c092144a09c0df2d477257c1f4c37bb985",
- "sha256": "0m5hxlx0cnx4rdcz5chxqp074z9h1wj1nvg8dzmilsnmg3kmsshx"
+ "commit": "38f75193f7a8a0e095975104f3ff1c58b3c7c59c",
+ "sha256": "0ghbcih8hshiyw0mwr2qjhzjbs1sikxl1ih4m41fk4pzd86vjbm4"
}
},
{
@@ -60088,15 +61470,15 @@
"repo": "emacs-lsp/lsp-focus",
"unstable": {
"version": [
- 20200809,
- 1413
+ 20200906,
+ 1917
],
"deps": [
"focus",
"lsp-mode"
],
- "commit": "c8270663c1fa8650cf0e248caa6a8e3d8f25d80d",
- "sha256": "13d7s2pm7nqz06bj6qkibi50f69slqwz6dc0fik97glxnlqqqva5"
+ "commit": "d01f0af156e4e78dcb9fa8e080a652cf8f221d30",
+ "sha256": "1pi6vmykp6x5c1yz9cgcf4nc5cbkbxhxqmp6g9aipwd8kwii1xx6"
},
"stable": {
"version": [
@@ -60120,15 +61502,15 @@
"repo": "emacs-lsp/lsp-haskell",
"unstable": {
"version": [
- 20200527,
- 2014
+ 20201011,
+ 1941
],
"deps": [
"haskell-mode",
"lsp-mode"
],
- "commit": "17d7d4c6615b5e6c7442828720730bfeda644af8",
- "sha256": "1kkp63ppmi3p0p6qkfpkr8p5cx8qggmsj73dwphv90mdq0nrfsx8"
+ "commit": "4d85cb3693d893ec34d8a0be9794d468a0a28b7b",
+ "sha256": "1pz07l4iywvcfmgfymh8avz5lp0yirqxbrv14ncl8p6dv9yrfwyb"
}
},
{
@@ -60157,16 +61539,16 @@
"repo": "emacs-lsp/lsp-ivy",
"unstable": {
"version": [
- 20200701,
- 2043
+ 20201113,
+ 2220
],
"deps": [
"dash",
"ivy",
"lsp-mode"
],
- "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d",
- "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1"
+ "commit": "c70ee8b54357c56d1b972393ee53e57a2e545fbb",
+ "sha256": "01klra1yr3jk2fhk1s07ziygkfvv5qxgi8v30i8z13v5v4vi5mfx"
},
"stable": {
"version": [
@@ -60190,8 +61572,27 @@
"repo": "emacs-lsp/lsp-java",
"unstable": {
"version": [
- 20200804,
- 1609
+ 20201105,
+ 1758
+ ],
+ "deps": [
+ "dap-mode",
+ "dash",
+ "dash-functional",
+ "f",
+ "ht",
+ "lsp-mode",
+ "markdown-mode",
+ "request",
+ "treemacs"
+ ],
+ "commit": "f43b00acd86801aff76c9cdc01f9d7f4b83bf14f",
+ "sha256": "1xpjjz7m06yazlw7qp7i278f7v4a3n80kpcvck35ahg5ar8i111j"
+ },
+ "stable": {
+ "version": [
+ 3,
+ 1
],
"deps": [
"dap-mode",
@@ -60206,24 +61607,6 @@
],
"commit": "260016236fa0520b5b6ec7f51ca2086288524cba",
"sha256": "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h"
- },
- "stable": {
- "version": [
- 3,
- 0
- ],
- "deps": [
- "dash",
- "dash-functional",
- "f",
- "ht",
- "lsp-mode",
- "markdown-mode",
- "request",
- "treemacs"
- ],
- "commit": "811760ad89a29939c28f47d0925f58d9eeea9fa3",
- "sha256": "1grcapmd9k0a128vhgpy2a5dh6iqmf8bdvz0hykl4v7d55vcm423"
}
},
{
@@ -60283,28 +61666,28 @@
"repo": "non-Jedi/lsp-julia",
"unstable": {
"version": [
- 20200511,
- 1444
+ 20200912,
+ 1106
],
"deps": [
"julia-mode",
"lsp-mode"
],
- "commit": "b342e5f74f9b815d2a7db9fffee7b9c46850d293",
- "sha256": "13haa9jvcq6wvj8g1bnqrrczg1j50lwk41pr4n7q0i7313r8f89v"
+ "commit": "c523c250c4bd2777203101ab417e9b7312472f46",
+ "sha256": "0zgxgghsx9dw4b0i4p0l1kvp3bka7aw80iyr7x05sp1mwwchh2gb"
},
"stable": {
"version": [
0,
- 2,
+ 3,
0
],
"deps": [
"julia-mode",
"lsp-mode"
],
- "commit": "9f158a290168149fd301a1c1c2016600106ad5be",
- "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv"
+ "commit": "72e26d0c1d34e3dd16ff6427af883bd0136015d3",
+ "sha256": "0f4zmvn13x468p6vpfixx3ghlrygdgdyx8xpb7nx232pv38156dn"
}
},
{
@@ -60345,8 +61728,8 @@
"repo": "emacs-lsp/lsp-metals",
"unstable": {
"version": [
- 20200727,
- 1925
+ 20201123,
+ 851
],
"deps": [
"dap-mode",
@@ -60358,8 +61741,8 @@
"lsp-treemacs",
"treemacs"
],
- "commit": "039aa72439e3c52cfef4bcde416ba49d88ac0991",
- "sha256": "12b2f1d07rqnbj27whdkk74c3fkqp7qrsqmwnyv0ysc870w29sb0"
+ "commit": "31dafff1ebcddb860567e9b0681731adf25b54e6",
+ "sha256": "0r2mhns4r58fcsyrb25610ayzll9qhza9rfjh3cz7kl6dzvpwv2l"
},
"stable": {
"version": [
@@ -60382,14 +61765,14 @@
},
{
"ename": "lsp-mode",
- "commit": "1a7b69312e688211089a23b75910c05efb507e35",
- "sha256": "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9",
+ "commit": "525ea5927f1c66dc56b49aab40667be15a7ea063",
+ "sha256": "0vjk60avwydap3zacygmrxsapbkfxb26k89km38633sg3788xqx9",
"fetcher": "github",
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20200819,
- 1349
+ 20201209,
+ 735
],
"deps": [
"dash",
@@ -60400,8 +61783,8 @@
"markdown-mode",
"spinner"
],
- "commit": "4145a70ce1d4bfb2463606ba34c5965080b080d9",
- "sha256": "01nji47mh79ip67vagi8yb5dd9kscnvg4070zklnfyp9v0rfl73r"
+ "commit": "597febf55bffd5b30e3fac58ede4d0fe1f297f1a",
+ "sha256": "02agyi2599brzp3z936x0nwj8ylk0cackbq78dghnyrvm2438vri"
},
"stable": {
"version": [
@@ -60440,8 +61823,8 @@
"lsp-mode",
"lsp-treemacs"
],
- "commit": "b462cfa9b8071c624b905baf37a255d808ac6376",
- "sha256": "1wig6hr5g0q0lg7zkqw1bfgagpx1ndpga75lnxaqpm0f0rgwdc33"
+ "commit": "88319a61a06e27fc1d3ea2e7b853ec1692b4c166",
+ "sha256": "0007lv95cqh8makipas2m4rkllig5zvi51hv3zadlhw57xnvlhjw"
}
},
{
@@ -60452,8 +61835,21 @@
"repo": "emacs-lsp/lsp-origami",
"unstable": {
"version": [
- 20200809,
- 1537
+ 20200914,
+ 1846
+ ],
+ "deps": [
+ "lsp-mode",
+ "origami"
+ ],
+ "commit": "aa309589668d32a8b4bb23c8f41163f6ae208f7b",
+ "sha256": "1l5n01icyp00ljcs5sfk3wbp74gn53p0mj1l4fqdpi70c1wahwmv"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
],
"deps": [
"lsp-mode",
@@ -60477,8 +61873,8 @@
"deps": [
"lsp-mode"
],
- "commit": "54dd19d88cd561061ac3103dc452d6854e5899fa",
- "sha256": "1kg8n215hg8x9gxi2sdjyk8whbir20p3fzc50za1iwhiq3gzx1fw"
+ "commit": "669460d93b87fb876df11b2b68229677e7ad1a26",
+ "sha256": "17w48yfcb2qwjz2pg1kmmijf1s2b0qb4kcz5jsmz3x8swhq4kb22"
},
"stable": {
"version": [
@@ -60536,16 +61932,16 @@
"repo": "emacs-lsp/lsp-pyright",
"unstable": {
"version": [
- 20200810,
- 354
+ 20201014,
+ 1620
],
"deps": [
"dash",
"ht",
"lsp-mode"
],
- "commit": "9603dda12afaae9c82608c7d3762f98b24b8563f",
- "sha256": "1xh0q356q7sy68m9syfbclabamdnw5y772inspn5y8640ig4rg21"
+ "commit": "d9e7d3cf1bdc8ee0395c8df4408b05ee3ba9c22a",
+ "sha256": "092ivkhyhqwyzf94k8bjzykzx28lazyipi8ghz4lbkc57wwmjx39"
}
},
{
@@ -60556,14 +61952,14 @@
"repo": "emacs-lsp/lsp-python-ms",
"unstable": {
"version": [
- 20200811,
- 1204
+ 20201023,
+ 1750
],
"deps": [
"lsp-mode"
],
- "commit": "a884a9a4eb1a3acd3d70c776aec5e968bbdc1731",
- "sha256": "02fws6ph1ikpx86709dswlag180m6b34nchqcsfcvx4zp7qg2wj2"
+ "commit": "c4ebc7a11398733055a1dc07f9cffacd04d1c2dc",
+ "sha256": "0sdvqnk598gdzjrzrgwqg2m8fzs9dpbbzsp70hqnrkp14x9jklmi"
},
"stable": {
"version": [
@@ -60578,25 +61974,6 @@
"sha256": "0rkxhm9lmvsalyzq96452cgpn5cqljw7b9d9xcxkkl2cwz1745f3"
}
},
- {
- "ename": "lsp-scala",
- "commit": "fd494da0c0c2e2e58afc26d8e79aeeea41c6ee09",
- "sha256": "1r8ha0q9gphcs6ihqswgvbhs9b6v6n1pvlqxwjnjwpdhsr5fsw1p",
- "fetcher": "github",
- "repo": "rossabaker/lsp-scala",
- "unstable": {
- "version": [
- 20190604,
- 1237
- ],
- "deps": [
- "lsp-mode",
- "sbt-mode"
- ],
- "commit": "06f189aa5cafe93cecbdaa234bccd900def7bc68",
- "sha256": "05l563j1wz01rqwd4r639i88ln3bkn0m4swvj3hs11d70brlw981"
- }
- },
{
"ename": "lsp-sonarlint",
"commit": "ee843ab9cc6188b4f1b8f31ab4a4e69688fb36df",
@@ -60605,30 +61982,30 @@
"repo": "emacs-lsp/lsp-sonarlint",
"unstable": {
"version": [
- 20200702,
- 2351
+ 20200821,
+ 1703
],
"deps": [
"dash",
"ht",
"lsp-mode"
],
- "commit": "e0a27c07e886a147e2b8750471660af02e142086",
- "sha256": "1kfgqdxynzpy98j1hc07zsygi0npw4xfm80jx3h30wyvxmgy7flp"
+ "commit": "ef32b6f734323698fc8ba28646a07515aaafea44",
+ "sha256": "0mgz6y4x6wy4afh15ara8iv0irk8hkbf8gq2aj9gdandh86iq048"
},
"stable": {
"version": [
0,
0,
- 1
+ 2
],
"deps": [
"dash",
"ht",
"lsp-mode"
],
- "commit": "5f519612c6a10b189292083b04dcd652b64bc7d1",
- "sha256": "04xs8n0lxx54hyj1y002ps52cxwb7s79k38q3dqzzbfax1nxwfw3"
+ "commit": "d2c0ffe736d6cda4cc524f62ac8b5c5c98490c04",
+ "sha256": "1x6m5j119qa45rqydq9svsrf16s0lw8zivfppzfiikyi405g75yz"
}
},
{
@@ -60645,8 +62022,8 @@
"deps": [
"lsp-mode"
],
- "commit": "130f7a8f7a37869515953aa7715b3b969c3d7a0b",
- "sha256": "0mz1wdxn31qngk98k924mwf4f5pb8v1y9jjl2sf4mrjw1wz2xsnb"
+ "commit": "948c3a35fd05496a77af2d8935e754db112cb4c3",
+ "sha256": "1n9jfaq1w2vxhv2gpvmj3qyc8bwacyj6kdyw62hlgbl7xnhhhc6d"
}
},
{
@@ -60657,8 +62034,8 @@
"repo": "emacs-lsp/lsp-treemacs",
"unstable": {
"version": [
- 20200815,
- 1841
+ 20201208,
+ 932
],
"deps": [
"dash",
@@ -60668,8 +62045,8 @@
"lsp-mode",
"treemacs"
],
- "commit": "3f8ca910c8e8724f93d8268a91771a51427684ff",
- "sha256": "0xnbw3j7n10wp6jbzrgrr0xfzilrlhrmmzs4d00y56g1fmqn3jja"
+ "commit": "642e922e16fd2b2c3cc075d7cba68448f1aaa006",
+ "sha256": "1c7w7p0xczaliq8snryi2rwhnvm6qg0yqrkjkpwsr6smami7g31b"
},
"stable": {
"version": [
@@ -60690,14 +62067,14 @@
},
{
"ename": "lsp-ui",
- "commit": "b7c78c9b07ede9949d14df74b188d4c1a3365196",
- "sha256": "0fylav8b54g020z039zm1mx26d257715bfn9nnpw9i0b97539lqi",
+ "commit": "883d739e46c32c95adcf41835078ba3604188eda",
+ "sha256": "0n4z7gmpkbz9azbk8pi4f368396y4s9bpqvkdykzq6ykqyswk4bm",
"fetcher": "github",
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20200816,
- 841
+ 20201209,
+ 332
],
"deps": [
"dash",
@@ -60705,8 +62082,8 @@
"lsp-mode",
"markdown-mode"
],
- "commit": "c39ae3713f95a2d86e11fd1f77e89a671d08d18a",
- "sha256": "033ah4mz3pa6da3xdn6yk3lmkv6lanpj07b0icf30c6bp7rmk3il"
+ "commit": "49bc5134c15d92b866c389c16e8e551a9285961a",
+ "sha256": "0if4rkpym0zp44m4hrw24yzg6wzrpz7nvvgqq2s1limjjsw1rzk1"
},
"stable": {
"version": [
@@ -60732,18 +62109,18 @@
"repo": "immerrr/lua-mode",
"unstable": {
"version": [
- 20200508,
- 1316
+ 20201110,
+ 1250
],
- "commit": "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c",
- "sha256": "1bwyyp9fbvy0p4f3mmbqc0plxrcm0ag2r3zb74gb5k2vcxi2vdw4"
+ "commit": "d2ff3045b9694293a302fa60d7bd5d97f2673156",
+ "sha256": "1g5wkprz33az2kp8w46343nhri82g4ib8jahqi4lpn507307gchz"
},
"stable": {
"version": [
- 20151025
+ 20201010
],
- "commit": "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45",
- "sha256": "1qawjd0nbj1c142van7r01pmq74vkzcvnn27jgn79wwhplp9gm99"
+ "commit": "345ebfc1e236d9676e7e9f7364493785e7756348",
+ "sha256": "0yx0h5kir8r3mi9vqpwsz8nsh1b1w7zk0hahn9003j3dxzi755lv"
}
},
{
@@ -60814,8 +62191,8 @@
20200507,
1518
],
- "commit": "112e689f75b59398d8eca79ac6562dca12b8a959",
- "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d"
+ "commit": "2d553787aca1aceb3e6927e426200e9bb9f056f1",
+ "sha256": "13zjw64x728pm1a44lzzv9s9r5kkss0ncwqzzczhk8bvmsi7m1l3"
},
"stable": {
"version": [
@@ -61150,8 +62527,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200816,
- 955
+ 20201207,
+ 1723
],
"deps": [
"async",
@@ -61160,8 +62537,8 @@
"transient",
"with-editor"
],
- "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
- "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
+ "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac",
+ "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1"
},
"stable": {
"version": [
@@ -61241,15 +62618,15 @@
"repo": "dandavison/magit-delta",
"unstable": {
"version": [
- 20200518,
- 2205
+ 20200929,
+ 1335
],
"deps": [
"magit",
"xterm-color"
],
- "commit": "d988abd99882c6b89f21f2746f721a4d7ece6ad4",
- "sha256": "1dj2kw2wzxnms4z54pk7qngylvy903jwd84x3k5ys3wsydmk4bbf"
+ "commit": "b8526f890415374822514e488341d2b706d6bc2f",
+ "sha256": "1r809j0pj7lfv70dkqzgzahppzp0g5zsa3q18h68d35vanaicm2d"
}
},
{
@@ -61507,8 +62884,8 @@
"libgit",
"magit"
],
- "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
- "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
+ "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac",
+ "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1"
}
},
{
@@ -61656,14 +63033,14 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200816,
- 955
+ 20201201,
+ 1702
],
"deps": [
"dash"
],
- "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
- "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
+ "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac",
+ "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1"
},
"stable": {
"version": [
@@ -61767,8 +63144,8 @@
"repo": "alphapapa/magit-todos",
"unstable": {
"version": [
- 20200310,
- 28
+ 20201101,
+ 2240
],
"deps": [
"async",
@@ -61779,14 +63156,14 @@
"pcre2el",
"s"
],
- "commit": "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6",
- "sha256": "0v11ngxwndaylmzqm5rrvch7hsfcm15xhih13ckm6kn2skqdzh40"
+ "commit": "78d24cf419138b543460f40509c8c1a168b52ca0",
+ "sha256": "0jwi7hz7gpz4sg7n38apwpnga6haqad8pshyvl0d8imlz2a0hkpi"
},
"stable": {
"version": [
1,
5,
- 2
+ 3
],
"deps": [
"async",
@@ -61797,8 +63174,8 @@
"pcre2el",
"s"
],
- "commit": "65db450bdb766f12e5aa31ae1cecbc0716e07218",
- "sha256": "0a4ghad93nmk4i0aq25c3g5lwxi7z327v0z10zi8yyja5daipsdp"
+ "commit": "d6712f3a254e4e067e6cdc3e949bb13af83a4de5",
+ "sha256": "12ay02vk6bk77k33mhlqi41m03a77y80b15rj1dbh1n6jfrjwkfy"
}
},
{
@@ -61940,6 +63317,28 @@
"sha256": "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y"
}
},
+ {
+ "ename": "magrant",
+ "commit": "0be4da82e342dd015fc0ba85e29829fad34a0a82",
+ "sha256": "1xzi86lg8ha8lwyf4qc6fqh8a581z9bakmvw5ridhslgnq1m03hf",
+ "fetcher": "github",
+ "repo": "p3r7/magrant",
+ "unstable": {
+ "version": [
+ 20200917,
+ 857
+ ],
+ "deps": [
+ "dash",
+ "friendly-shell-command",
+ "s",
+ "tablist",
+ "transient"
+ ],
+ "commit": "9e1ba1fb13af6e62a2f40ebbe049e81267292a0d",
+ "sha256": "1x354bmpdj1mhjk2rapczqv57x0vn12csc8x38yyb6w1rxqbdycz"
+ }
+ },
{
"ename": "majapahit-theme",
"commit": "c9b793878de4107bb646652d09d8799aef8b97e8",
@@ -62056,16 +63455,16 @@
"repo": "thiderman/makefile-executor.el",
"unstable": {
"version": [
- 20180720,
- 832
+ 20201119,
+ 1500
],
"deps": [
"dash",
"f",
"s"
],
- "commit": "9a7d78f814a4b372d8f8179819cb1b37b83b1973",
- "sha256": "1sw8zqxzrcxs4v211bmlxz5xfrpckrawnbhf1fiji0971cv3hx0r"
+ "commit": "d0a34c355fb80a8616ae7ed5eebbda8507aa14ac",
+ "sha256": "1nbv03vw4n5lslnzgxp8h1np639m7hdnz31nilywi4nc0v1ak347"
}
},
{
@@ -62424,6 +63823,21 @@
"sha256": "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh"
}
},
+ {
+ "ename": "marginalia",
+ "commit": "2e717311650aad778f13eff5f16ef59c80660cdb",
+ "sha256": "0wi9fv0xhpm7wz42x7gybqmbvfilmgwkh15rcns53x37zyk6kpxc",
+ "fetcher": "github",
+ "repo": "minad/marginalia",
+ "unstable": {
+ "version": [
+ 20201209,
+ 619
+ ],
+ "commit": "31ba78b6c65be172aae2dde9bc0e6e91e229b082",
+ "sha256": "0f5ifm31zis7jh6r7a0jj8p439l1j2lh4hmn9ll08kms5almlbr6"
+ }
+ },
{
"ename": "mark-multiple",
"commit": "7efe1814aa552d44c3db2cd7304569f2aae66287",
@@ -62530,11 +63944,11 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20200815,
- 203
+ 20201115,
+ 635
],
- "commit": "ef2cb4d94af68908a4963afa492afba876725128",
- "sha256": "0pi971jgil2wpfnrg7j7i9hh3a418nxf82jkammzry2ijv2q5kj5"
+ "commit": "dcad5572a30fce51b97963d3c869cce227c223a1",
+ "sha256": "1c8c6lwmpysg8l1lvsyg0f0h65kkcdmijk2500xh2s0fhbbjb2s0"
},
"stable": {
"version": [
@@ -62883,11 +64297,11 @@
"repo": "cpaulik/emacs-material-theme",
"unstable": {
"version": [
- 20200620,
- 943
+ 20201116,
+ 1613
],
- "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a",
- "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw"
+ "commit": "bd5b244715a2232fe016efb691425e12a2e3e108",
+ "sha256": "0rgvfaplcf1riqxv7kyjs4chhmqk9hppiqrv25fmvi6rmm6cw2a8"
},
"stable": {
"version": [
@@ -62929,14 +64343,11 @@
"repo": "kawabata/math-symbols",
"unstable": {
"version": [
- 20170818,
- 1459
+ 20201005,
+ 2313
],
- "deps": [
- "helm"
- ],
- "commit": "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d",
- "sha256": "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7"
+ "commit": "091b81cb40ceaff97614999ffe85b572ace182f0",
+ "sha256": "0zahy3k4bhjrhw2ndjhcxvx6yljv44zhjs5ik3az9n46dim7agx3"
}
},
{
@@ -62947,11 +64358,11 @@
"url": "https://git.code.sf.net/p/matlab-emacs/src",
"unstable": {
"version": [
- 20200213,
- 930
+ 20201204,
+ 736
],
- "commit": "e14d97df706049ea2e2d6e5b515fdbd08cd94dd3",
- "sha256": "0zi873fpskv18k0xs9rgb2yfj49sga3yyq1b6xxc4ik0r45wi9cz"
+ "commit": "935c67274b84503640a9f90cce87b533461385ca",
+ "sha256": "08xjcva2fryw81zw1hd0glvq9pzkpnkcrkwp2i19032zzk3hqcxm"
}
},
{
@@ -63022,6 +64433,38 @@
"sha256": "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y"
}
},
+ {
+ "ename": "maxima",
+ "commit": "8a7215f7c6ba7addfc0f0af87b24047c996009b2",
+ "sha256": "106rdznc1b5h2xpjfyn0b83lrrccnazm5fnrl6lrhldyzibdnnsi",
+ "fetcher": "gitlab",
+ "repo": "sasanidas/maxima",
+ "unstable": {
+ "version": [
+ 20201207,
+ 2204
+ ],
+ "deps": [
+ "s",
+ "test-simple"
+ ],
+ "commit": "878132db3c9e0b5675888eedece1c7aa4246df43",
+ "sha256": "1a24hdnxlic5c473szvj2ard3sl3lm9g5p2x5xqk7pymqj72nan4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 7,
+ 6
+ ],
+ "deps": [
+ "s",
+ "test-simple"
+ ],
+ "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d",
+ "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d"
+ }
+ },
{
"ename": "mb-url",
"commit": "dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d",
@@ -63182,8 +64625,8 @@
"repo": "ahungry/md4rd",
"unstable": {
"version": [
- 20191113,
- 2108
+ 20201203,
+ 545
],
"deps": [
"cl-lib",
@@ -63193,8 +64636,8 @@
"s",
"tree-mode"
],
- "commit": "ff7d95fc0fdf46a3cb6b3bbe52396dc4e474b8fd",
- "sha256": "1p8g5pbczg1n1pfibxwpbg1qsyrqi131awxkvl98w8ynb9zi1fqs"
+ "commit": "8ed075874425c4aa1081608dd66f46e5dfa333c0",
+ "sha256": "0p7qadaa856fskbn7j6w0wqbr2ay4sz0y7i7x8wqn4rpjqk0nzyg"
},
"stable": {
"version": [
@@ -63280,11 +64723,11 @@
"repo": "techquila/melancholy-theme",
"unstable": {
"version": [
- 20200305,
- 133
+ 20201129,
+ 2137
],
- "commit": "ffed56cb756f8acba93ce7edc664c950d75927d9",
- "sha256": "1wcvd68dm453rvhjm89vv2faljgyszwyc4g95q7ydvhk3h1gck2p"
+ "commit": "8756bb394bcaceb813fc1d315271338224e88295",
+ "sha256": "1pn50h2rzkvd7vqh2hzws3772nagj9hrynm6b4q35rzyiq4vb889"
}
},
{
@@ -63400,8 +64843,8 @@
"repo": "skangas/mentor",
"unstable": {
"version": [
- 20190511,
- 1638
+ 20201121,
+ 1649
],
"deps": [
"async",
@@ -63409,8 +64852,8 @@
"seq",
"xml-rpc"
],
- "commit": "b5e441b7dc077d5532a3818b5441e52baefad839",
- "sha256": "1xrhg1jwmzlcqdk2w92s7ghbma1pfzjc48akl3d2cixxz3ha2ca2"
+ "commit": "aa1eb8a8e7d8c5e5564b08f82130eed0943826bb",
+ "sha256": "122y2c2dwyz9az0a46dx2dgk70arz6sz1545iv61bs3ibk08szf2"
},
"stable": {
"version": [
@@ -63458,17 +64901,17 @@
20191025,
851
],
- "commit": "3751cbfff75022c396c4ff4dc1729048f80daa4f",
- "sha256": "0vbzbjajm0ww864cl7aaj70s3fkgg79cq8srdf5dmw1vwdrqq6ld"
+ "commit": "3dd8eec9cb1f66811e8b3db3e492a2f4b5ea51bc",
+ "sha256": "1w3ypkzg3vp76ab4l1gm4g333f5bniarbc80mslam0jmwswr83z1"
},
"stable": {
"version": [
3,
- 3,
- 6
+ 4,
+ 2
],
- "commit": "464df1a60775fd2bb70f4efff4f8603eaf834b74",
- "sha256": "0yw3a8mhjsjh9359cvk7kr5ch6dhwvhv9zilk12fgyii9iw08mlz"
+ "commit": "c9761a552380838e9f530b5c47c0ea3c47c33565",
+ "sha256": "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj"
}
},
{
@@ -63508,14 +64951,14 @@
"repo": "abrochard/mermaid-mode",
"unstable": {
"version": [
- 20200804,
- 2107
+ 20200819,
+ 1759
],
"deps": [
"f"
],
- "commit": "795bcf830d9345474fad864602180408891b292d",
- "sha256": "0qdpbayxar0vkan0m83k4jir8saqy47nq2240608l8h9bjv48hz2"
+ "commit": "6ec97ab934023a8aa094705bb1c9803fd85d24c1",
+ "sha256": "1hhpihmacbam3fgk7pjlzn7hnakz38ksds052nzirvw6a68ynzgk"
}
},
{
@@ -63526,19 +64969,19 @@
"repo": "wentasah/meson-mode",
"unstable": {
"version": [
- 20200806,
- 1325
+ 20200907,
+ 743
],
- "commit": "b471b9282724d6f324dbd6fa25d083635fc4293a",
- "sha256": "0y5a1sfk4h4szv4v6693i3ylrf3xiwf8khrahdaz0bx210h2qmpg"
+ "commit": "d995dafa388ec03c0113cd1ac46403c20ad18ab0",
+ "sha256": "1swipsr9j0r2rpngz0dwykqnbs84j3pspx70dxmqyjm7qqabypnq"
},
"stable": {
"version": [
0,
- 2
+ 3
],
- "commit": "d80ef159242402609a52c29949bd550c8442db53",
- "sha256": "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0"
+ "commit": "70c35d7a303a66cada554c89d02ebd97d45c2a06",
+ "sha256": "0hlqvq3j4f6g16nj3bm2wbkncn8hv8c8iqd0sch3w80wwqnr622y"
}
},
{
@@ -63618,11 +65061,14 @@
"repo": "AdamNiederer/metamorph",
"unstable": {
"version": [
- 20180930,
- 2028
+ 20201025,
+ 2357
],
- "commit": "d9dc7037b7eed7b3fe85ea50e91f332e3f831514",
- "sha256": "1zprgjh1wyqbpy1qvng57r6jm10k6vffpb6znm47fm8xx1h0s8k4"
+ "deps": [
+ "ov"
+ ],
+ "commit": "ec74c733d78c995af69ed24aa5b8a3d84e0c1b29",
+ "sha256": "0xkj9m9j2mgd61lxnag1n97zd01dkh9dgwpvinq142v145rd4xvn"
}
},
{
@@ -63651,8 +65097,8 @@
20191018,
242
],
- "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1",
- "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba"
+ "commit": "c7f72a87952ed16323fce968462af897235f1719",
+ "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4"
},
"stable": {
"version": [
@@ -63705,11 +65151,11 @@
"repo": "kazu-yamamoto/Mew",
"unstable": {
"version": [
- 20200316,
- 221
+ 20201202,
+ 203
],
- "commit": "5145145f87bfbe80fd91e82ded33033cf78ef54f",
- "sha256": "0wdbgh3bady6xad0gnlg3irds5vdffl8d39raqayzgn17yb98pcf"
+ "commit": "cf20ca579120dd3a4126641a5bcc1dfc6289183c",
+ "sha256": "0041q1vxy6222ic8807yhxdxb0vsmzvndb9f50ymfx6zrjisydf7"
},
"stable": {
"version": [
@@ -63753,8 +65199,8 @@
"projectile",
"s"
],
- "commit": "5eb0423d4b7083cb330a73ef1cfd3e0dd8538567",
- "sha256": "0vk2d59jvzhdm47w4kcn58njps444i0350lp5z7dnzhaag10dwc0"
+ "commit": "36166b9bffeb1b5f967be2ab6f3a504632c33a65",
+ "sha256": "1w16sx15fk2m04gl6ahkw2scw6bvpl6bf4g0gf7532rxg339xgjg"
},
"stable": {
"version": [
@@ -63776,8 +65222,8 @@
20200104,
108
],
- "commit": "e9af8a2595e336542c9dfc656fe808ddc6937a59",
- "sha256": "1s72qvg1jwqk27axiqb2wn7y1q3x0rf2mb20yc9kqva553fk5vzd"
+ "commit": "76ede10e0a0433d8aae6b3b4e132ca9dcce5ca75",
+ "sha256": "1n6avpk8ggpjqiin1qrwc3g1rjgq902cgks1kfd2r82bkri2sq1q"
},
"stable": {
"version": [
@@ -63797,26 +65243,26 @@
"repo": "yoshinari-nomura/mhc",
"unstable": {
"version": [
- 20190807,
- 513
- ],
- "deps": [
- "calfw"
- ],
- "commit": "f9f048de9fe85a90d376d828ce3dad2a96c62c40",
- "sha256": "1m6w12y9dcz85xm7lc7dhc7vjhw0bhdm0b4rcp1fr2sn9wv7c4wz"
- },
- "stable": {
- "version": [
- 1,
- 2,
+ 20201113,
3
],
"deps": [
"calfw"
],
- "commit": "37898db4902cd644a0d3e8d9d02426d54fb8984a",
- "sha256": "0c9kshs17b8fn8la8hlzf05vf5pajf3ksx7bsjri3m78s6bd3h4z"
+ "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed",
+ "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 4
+ ],
+ "deps": [
+ "calfw"
+ ],
+ "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed",
+ "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp"
}
},
{
@@ -63879,14 +65325,14 @@
"repo": "emacs-jp/migemo",
"unstable": {
"version": [
- 20190112,
- 516
+ 20200913,
+ 12
],
"deps": [
"cl-lib"
],
- "commit": "f42832c8ac462ecbec9a16eb781194f876fba64a",
- "sha256": "0yasamfvad4azyby8mqyr2laap3ppknwb7i9w84zw14qq7g7pq5w"
+ "commit": "f756cba3d5268968da361463c2e29b3a659a3de7",
+ "sha256": "0q2mljzkpci6p8svz17xz48kv4yhh86irg2dpypk0k2dlyr8gykx"
},
"stable": {
"version": [
@@ -63924,6 +65370,21 @@
"sha256": "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap"
}
},
+ {
+ "ename": "mimetypes",
+ "commit": "05ef400ffe0ae7cd667084fa93f6d216e1c1850c",
+ "sha256": "1nzkm4pclgdl6lznr78w935j4by8shgy4f7di9vsci5yzbdiqagh",
+ "fetcher": "github",
+ "repo": "cniles/emacs-mimetypes",
+ "unstable": {
+ "version": [
+ 20201115,
+ 1605
+ ],
+ "commit": "1663054ce266ed25e47ec707c19f619d33225903",
+ "sha256": "1lgh38pcjnq3va0vcs0rrl0nrf8j6x0fpdwyv3xghskazwsvrxbg"
+ }
+ },
{
"ename": "minesweeper",
"commit": "d3828ad7599d13728b5571b882344c3ada434b85",
@@ -63965,11 +65426,11 @@
"repo": "muffinmad/emacs-mini-frame",
"unstable": {
"version": [
- 20200430,
- 721
+ 20201113,
+ 838
],
- "commit": "78d9bbb272acc5f2927648cc706321f95e2955c9",
- "sha256": "1d4zgrpy21j35dzcspbv4szbprxxv9mygwqfx0x2bs53z4abk1kg"
+ "commit": "31380e7688c5e82965f72e5707cbff3ec2712ba9",
+ "sha256": "1a5vyff17lj3f6xkzkp8fy0dli1w5dnp0bvm6cppjp3x1gnj7aj2"
}
},
{
@@ -64001,8 +65462,8 @@
"deps": [
"dash"
],
- "commit": "754a28efdf043e193922a897fc724ad9b9f2e8de",
- "sha256": "1jx1baw6zskpnfdi02as59736jx4iy0q1n4x5n5ypvr7csrs1nz3"
+ "commit": "a4455fb70c6b4062c63ce61af09d2af99683b492",
+ "sha256": "0bwlx937hx11d4mj5cqp5rg7dh02499z85irgaylwvnsnx5sbni4"
},
"stable": {
"version": [
@@ -64149,14 +65610,14 @@
"repo": "tarsius/minions",
"unstable": {
"version": [
- 20200522,
- 1052
+ 20201204,
+ 1051
],
"deps": [
"dash"
],
- "commit": "36d39bd25ae58d1359d17f99142520339bea5974",
- "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5"
+ "commit": "4a81446e13f5bfb514e593d0e1c5253a60113301",
+ "sha256": "19gwv9dn6g3jv12qq1h4fal2adsawrszyfkd62x99rlfa81ixg6d"
},
"stable": {
"version": [
@@ -64293,11 +65754,11 @@
"repo": "ayrat555/mix.el",
"unstable": {
"version": [
- 20200419,
- 820
+ 20200920,
+ 1500
],
- "commit": "37916fa5f7dfe448585fb83ea6253eb0f84df15f",
- "sha256": "09pk4bakqz01ci06c79ywwb8ijdfgw3rxrz0wlaz4zmlbirkzma6"
+ "commit": "8a2f8c2df0e1817190c4dc0d2d7c7b5e5407744a",
+ "sha256": "0r8b3v4vp46afw8q5v03aifd1kpap79qc4af84placrhy80kya2v"
}
},
{
@@ -64308,11 +65769,11 @@
"repo": "jabranham/mixed-pitch",
"unstable": {
"version": [
- 20200511,
- 2052
+ 20200916,
+ 2311
],
- "commit": "1cad46fddf741ed7ec5fc477d70e079e908e9ce6",
- "sha256": "062np4d7blbwjc1kciqcp6hngmwr8i540zsv5f8p2qki4804b8ng"
+ "commit": "d305108f9520e196b533f05d1dcc284cf535faaf",
+ "sha256": "0yx89is3g2m8af8vfsz5rgjmfmx7mfrxlffb1x6y4b8lh9l0k6dj"
},
"stable": {
"version": [
@@ -64350,11 +65811,11 @@
"repo": "Mulling/mlso-theme",
"unstable": {
"version": [
- 20200513,
- 1751
+ 20200828,
+ 1221
],
- "commit": "059c5773403b73a14a1b04d62d1d5b077a3f6e06",
- "sha256": "1a00mybf269hlfzfhpcvlkkqgwck73hz5w1qsspg5w9w78qlymkn"
+ "commit": "b47243006470798caa4d3f8fe1af9bd5ef06bbee",
+ "sha256": "0gwa2izmi2ljh4avfpfq778ym1p91gsssbqz2q95m9py1vvb3xr7"
}
},
{
@@ -64394,26 +65855,26 @@
"repo": "purcell/mmm-mode",
"unstable": {
"version": [
- 20200714,
- 1714
+ 20200908,
+ 2236
],
"deps": [
"cl-lib"
],
- "commit": "9ffe364f3a31c7a771fe3401b8924642609953e8",
- "sha256": "1yr7nd6kmvy3mc5k6vvwaikzy9cvly4617l4s9zrfrbnldpsyjk7"
+ "commit": "0d00cdf4d02cc166304f6967a20fa22e2eaf208b",
+ "sha256": "1drm89pi67khc04816nynslcqdr9xaf6mb85y6aqrrl4sy0zzwxl"
},
"stable": {
"version": [
0,
5,
- 7
+ 8
],
"deps": [
"cl-lib"
],
- "commit": "ff0b214f27d5dddeb856acb4216e77a864dcc0b2",
- "sha256": "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h"
+ "commit": "8aed53f9aec4bcb9faf5f2b080e863f51d775905",
+ "sha256": "0ds48cfznxcakrfgyyw1valb7ia1sijwlmxs7mcq4787ck9l8hwr"
}
},
{
@@ -64538,8 +65999,8 @@
"deps": [
"yasnippet"
],
- "commit": "361a3809f755577406e109b9e44d473dfa7c08e0",
- "sha256": "0xcybq0cwd0c33bi1jf7h098a4anc4gkj3m1c97gc8mz9x4fjksy"
+ "commit": "44998ea42136a6912ce80061909db1c4c77c8ed8",
+ "sha256": "0w1d7j3ay0nkq4lp63lf7597rxfchikvw58w2h8g49cxx8vyl4l8"
},
"stable": {
"version": [
@@ -64618,14 +66079,14 @@
"repo": "ryuslash/mode-icons",
"unstable": {
"version": [
- 20190627,
- 2121
+ 20200920,
+ 2031
],
"deps": [
"cl-lib"
],
- "commit": "f16969f053f43bf706257673d0800de438d4e33b",
- "sha256": "0lvpvmc1fhhjg9rgh8gy6c0nqfn89v9cxy5pjpy0c8bdnwys2x7q"
+ "commit": "82cfba411c544c862a0854f682494a437642c957",
+ "sha256": "02rg73rnz9kp73f6c9vm7wihg3hp4x3x7bw6khx206qjwpy8pcfk"
},
"stable": {
"version": [
@@ -64671,20 +66132,20 @@
"repo": "tarsius/mode-line-debug",
"unstable": {
"version": [
- 20180318,
- 2225
+ 20201118,
+ 1530
],
- "commit": "a0fcc394b07d2414bd6f722da10f1c7567333f6b",
- "sha256": "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"
+ "commit": "1848f94fe7bb7a0a11e976d1d64922a5b69a5cfc",
+ "sha256": "1jlcrymj1ssfrnz017916bm32918wkypzz0m57xixmng06x375g2"
},
"stable": {
"version": [
1,
- 2,
- 3
+ 3,
+ 0
],
- "commit": "a0fcc394b07d2414bd6f722da10f1c7567333f6b",
- "sha256": "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa"
+ "commit": "6d2c9c14f6a3835f4d54091ea241fd436da18ef0",
+ "sha256": "0y5bkbl6achfdpk4pjyan2hy8y45mvhrzwkf1mz5j4lwr476g18l"
}
},
{
@@ -64734,6 +66195,25 @@
"sha256": "10h5557sppi41pgbbjsffc9n67h8ja28skhdlklc0n6zap71m87s"
}
},
+ {
+ "ename": "modern-sh",
+ "commit": "b0db199b134810cd2912aaaaa9793d9a59bdedef",
+ "sha256": "1lz14cwv61kn765ahs91dzgpp18kzyhj0a10p6y39pk481fp7wbl",
+ "fetcher": "github",
+ "repo": "damon-kwok/modern-sh",
+ "unstable": {
+ "version": [
+ 20200904,
+ 1838
+ ],
+ "deps": [
+ "eval-in-repl",
+ "hydra"
+ ],
+ "commit": "05430398a5070245c4358e6a1b7e49a154da174e",
+ "sha256": "05k5ak09rw8zrn5k7zjc54ckv4jrp9fs3s3r3ja5cil45irgcmhv"
+ }
+ },
{
"ename": "modtime-skip-mode",
"commit": "486a675ca4898f99133bc18202e123fb58af54c0",
@@ -64750,51 +66230,42 @@
}
},
{
- "ename": "modus-operandi-theme",
- "commit": "6f3291ebede304fe14240870372c0d396f43c0d9",
- "sha256": "15rq4l14a7y6p8vhgbs017crfwyp7fq61n03xbfycq92mlx89kgx",
- "fetcher": "gitlab",
- "repo": "protesilaos/modus-themes",
+ "ename": "modular-config",
+ "commit": "48d97bd2c3940a1950b37ded3fba90beebab7725",
+ "sha256": "0par1pj52n67my8f8r1hjgjx0waqq6hjzfgzhwphl7skfsa38r0f",
+ "fetcher": "github",
+ "repo": "SidharthArya/modular-config.el",
"unstable": {
"version": [
- 20200819,
- 628
+ 20200824,
+ 442
],
- "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8",
- "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx"
- },
- "stable": {
- "version": [
- 0,
- 11,
- 0
- ],
- "commit": "c376b08059028737390f41fb82f64d748c42970c",
- "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3"
+ "commit": "c0a6d3dac1aa176deb8417c77dfeac06e9f18e1f",
+ "sha256": "1pky409m3mip42k6qw4sf28ja50lsw17318kwgcrkl0nrvnbs31j"
}
},
{
- "ename": "modus-vivendi-theme",
- "commit": "74909ab53df89c5b720c89527b3b4c9aec8351b9",
- "sha256": "16bs48amvwikp4ikv8fs9zrsyz942jdzlz9ddf3qv8c9vpc5x58q",
+ "ename": "modus-themes",
+ "commit": "1d0f3490e4b5d9b04398bc0ecd1e9a997c269d78",
+ "sha256": "1f1c9dkmrxn4ih50w3xnkl0j5n03sp8zc201h2iga1ig22rgy7h4",
"fetcher": "gitlab",
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20200819,
- 628
+ 20201209,
+ 847
],
- "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8",
- "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx"
+ "commit": "50c926dd2f94a1ef95e2b7763ff25b1b51452f7a",
+ "sha256": "03ismi6m336fga3qp93nxipaf53bdzqzn7ad1v5ak5zhvyp2j0xi"
},
"stable": {
"version": [
+ 1,
0,
- 11,
- 0
+ 2
],
- "commit": "c376b08059028737390f41fb82f64d748c42970c",
- "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3"
+ "commit": "ab0f558397bb674342176c37c22190c0c1e54cc1",
+ "sha256": "1v82payjgx8z0qdklsrkim7xkb6hqrbs34d5qpq0sii43jwhiy5j"
}
},
{
@@ -64805,28 +66276,28 @@
"repo": "kuanyui/moe-theme.el",
"unstable": {
"version": [
- 20200216,
- 1927
+ 20200930,
+ 853
],
- "commit": "01d00a8d75b19f641b639ba23793cdd507c61f05",
- "sha256": "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664"
+ "commit": "76116f6eeb93c7902042f275a496629393730e08",
+ "sha256": "091wrp80y4k80w8wnv8pxipyf33dxb4qs0yn3m83bb1drn2x3g2p"
},
"stable": {
"version": [
1,
0,
- 0
+ 1
],
- "commit": "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e",
- "sha256": "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2"
+ "commit": "01d00a8d75b19f641b639ba23793cdd507c61f05",
+ "sha256": "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664"
}
},
{
"ename": "molecule",
- "commit": "7421b67dc51abf13bb028e467bb4c83f857a342e",
- "sha256": "0kdwmn4gb382igy979y7x2fdqcnfxlb4dvqvm6w7ghs564grzgj4",
- "fetcher": "git",
- "url": "https://git.daemons.it/drymer/molecule.el/",
+ "commit": "2e8e1a5169f0841db4980aebe97235845bbe7183",
+ "sha256": "04jdva5azd68nh7dr14r3z4imfqh3rwvd2m4qaq4zbjmsqwwjhdj",
+ "fetcher": "gitlab",
+ "repo": "drymerisnothere/molecule-el",
"unstable": {
"version": [
20180527,
@@ -64896,6 +66367,36 @@
"sha256": "1r2sns49f5fw4f122s165sa41nkrkq2qs20n98g2pfd1whflqfnb"
}
},
+ {
+ "ename": "monkeytype",
+ "commit": "e9a365e71936a6025104071ee3062ca19d6ef0b7",
+ "sha256": "08hmwlyk1g0znbgg0sdfh3mah39zfyipzs5n5z4xjmbvj6qdym5w",
+ "fetcher": "github",
+ "repo": "jpablobr/emacs-monkeytype",
+ "unstable": {
+ "version": [
+ 20201208,
+ 1918
+ ],
+ "deps": [
+ "async"
+ ],
+ "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc",
+ "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 4
+ ],
+ "deps": [
+ "async"
+ ],
+ "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc",
+ "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla"
+ }
+ },
{
"ename": "monky",
"commit": "9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc",
@@ -64972,11 +66473,11 @@
"repo": "oneKelvinSmith/monokai-emacs",
"unstable": {
"version": [
- 20200416,
- 2001
+ 20200918,
+ 1348
],
- "commit": "4281fc13dadef98942c8d43024de024f2392fec5",
- "sha256": "0049ny3m1mgn0b97m0clcmmh2xzn66flbsd8k45dn0qxm5wlaj3n"
+ "commit": "791baae69b02ee007cde779a80abc1a6b5962cf7",
+ "sha256": "00r5i98lplsra7fwrvir9pr7mbc1kia0xlmrlgs0vmn4bhxa2fpc"
},
"stable": {
"version": [
@@ -65011,11 +66512,11 @@
"repo": "sanel/monroe",
"unstable": {
"version": [
- 20200703,
- 1254
+ 20201013,
+ 1754
],
- "commit": "b540e13cf767055086c37b2878e551fd3eddf5c5",
- "sha256": "0sfj0b7j3385la01d8vq1s8ynpl5vzwdx7vdpyhbi3hrh02xkcqh"
+ "commit": "cae86f640df5faf44690bfac591ad464981293a0",
+ "sha256": "08r36wibg2rsiwjy7wd63w50sq9qfhzrapzrpcfzc9wz7wz26zka"
},
"stable": {
"version": [
@@ -65059,20 +66560,20 @@
"repo": "jessieh/mood-one-theme",
"unstable": {
"version": [
- 20200730,
- 18
+ 20200904,
+ 1639
],
- "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311",
- "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds"
+ "commit": "47f043c1a883e3b0fd550eafffe71b915eb892c1",
+ "sha256": "0zh0l2zpnms4s1c33ksj6rr8cc6bd9pxnc73cwvmaysak1650jfq"
},
"stable": {
"version": [
1,
- 0,
- 6
+ 1,
+ 0
],
- "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311",
- "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds"
+ "commit": "82b471852a23bc4de972cac32da322c2b168ad9c",
+ "sha256": "09ykh1c21kphfzli1qzrlx13bn6p22873y6rwkx9fnj2232gv9vi"
}
},
{
@@ -65107,11 +66608,11 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20200725,
- 126
+ 20201122,
+ 528
],
- "commit": "d6dc1f42ccf0d53c8f5d5a327442ae52b2de7aed",
- "sha256": "0s0liwc9sriv2ar6905n2vsdf9x8l85mwfyw05kr6vmxh9w08wbx"
+ "commit": "56a6a11b612aa295ef250e5a9879dc5df3b3234d",
+ "sha256": "0smddm5x5m5mv15wdfm04y8hxfzvxh4gkmjr1h8dlp686jg5mvl3"
},
"stable": {
"version": [
@@ -65162,8 +66663,8 @@
"s",
"seq"
],
- "commit": "83a9933cd4af234ae15fdc3a39e660d646b0c246",
- "sha256": "0rljyk4pkjwwh9mrpjdzywc4lyf163glzqhjs3nlvfy2yz9j0863"
+ "commit": "c9f363b1b5f2b92006e03116580540dadb7364ea",
+ "sha256": "0r6sn8f5la1sxw7af2h349p8p5ybmgpc7aisc96wjilp1zrmdh8v"
}
},
{
@@ -65341,8 +66842,8 @@
20170909,
330
],
- "commit": "7cbc941a9150468609010a93c429117da2523903",
- "sha256": "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9"
+ "commit": "bfc255110ad05732a43cf25d6a0e3b4a6710b58c",
+ "sha256": "0pjrl9az2c42bxz3ll7d8mng31ki5id8yfymkgmz73vajik2yc3h"
},
"stable": {
"version": [
@@ -65439,8 +66940,19 @@
"repo": "google/mozc",
"unstable": {
"version": [
- 20180101,
- 800
+ 20200822,
+ 1229
+ ],
+ "commit": "91cc1e19ef34aeb12888b697fefa52907f1a834d",
+ "sha256": "17dxx75z5fqvv0ams0mbj6p0wgjn4dnx61i9zljbg6l2fxbd7mwx"
+ },
+ "stable": {
+ "version": [
+ 2018,
+ -4,
+ 2,
+ -4,
+ 26
],
"commit": "afb03ddfe72dde4cf2409863a3bfea160f7a66d8",
"sha256": "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"
@@ -65558,15 +67070,15 @@
"repo": "mpdel/mpdel",
"unstable": {
"version": [
- 20200221,
- 1316
+ 20201026,
+ 1123
],
"deps": [
"libmpdel",
"navigel"
],
- "commit": "29e7c46f83bab7aedfa0136c58e776faba6ad4ed",
- "sha256": "1lz3i3ygdihr7r9rnb08fkcxrdg905wkb0s55pid57yhh4iva7fg"
+ "commit": "e937fbe0b98774e711134f3fac230a9fc66ac106",
+ "sha256": "1qiwk3ahjhdc6ac3k81qjl5vjjsxm1hd7wnl7whk2zwj7k12zb9j"
},
"stable": {
"version": [
@@ -65581,6 +67093,36 @@
"sha256": "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g"
}
},
+ {
+ "ename": "mpdmacs",
+ "commit": "757db1b45fdf460c533ac0e7bf31f93b236fe088",
+ "sha256": "13yxaga1b83chmwdg58xsgbpd7vyy7vl71xab43hqg0389j8y7q0",
+ "fetcher": "github",
+ "repo": "sp1ff/mpdmacs",
+ "unstable": {
+ "version": [
+ 20201118,
+ 350
+ ],
+ "deps": [
+ "elmpd"
+ ],
+ "commit": "174ffbc1e8ef31339867e3d9b29fe8468b636a7c",
+ "sha256": "0djpvhgvbijk40p3131nrf87nrsfd02lm1gc4i65l6sl66xxszv8"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
+ ],
+ "deps": [
+ "elmpd"
+ ],
+ "commit": "b81d9464c04bd42509b62d4a3c23f50aed728fc3",
+ "sha256": "0kjhkj77x25cvx27gqwpsfn64cf9bi5hv0a2sqp8xzzxaxz2l2hd"
+ }
+ },
{
"ename": "mpmc-queue",
"commit": "30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c",
@@ -65852,14 +67394,14 @@
"repo": "wavexx/mu4e-jump-to-list.el",
"unstable": {
"version": [
- 20190419,
- 1442
+ 20200913,
+ 1558
],
"deps": [
"cl-lib"
],
- "commit": "358bba003543b49ffa266e503e54aebd0ebe614b",
- "sha256": "00y9nap61q1z2cdql4k9g7fgi2gdgd9iy5s5lzrd9a4agbx6r7sv"
+ "commit": "a9a3a1d371451d12e0ec24e456c7d90ccacd9cdd",
+ "sha256": "0yq7ky2yk2j6i2p5bzh06ipbj2ab70bi6hvq7hf4jqvr2i94mlwb"
}
},
{
@@ -65870,14 +67412,14 @@
"repo": "agpchil/mu4e-maildirs-extension",
"unstable": {
"version": [
- 20200508,
- 712
+ 20201028,
+ 921
],
"deps": [
"dash"
],
- "commit": "4d2ece2226fa69a0e0bb23517a418145b92bd573",
- "sha256": "1gyyj1fzc34qrlfbk86lrrrib46r7lrw7pdxwzrx8jz42rd38jma"
+ "commit": "1167bc6e08996f866e73e9a02f563fd21ac317fd",
+ "sha256": "0bnznfz3bfk348hw5avri6n5w7x8376j0vzybwdxrqb6hfbvwzw0"
},
"stable": {
"version": [
@@ -65896,11 +67438,11 @@
"repo": "mkcms/mu4e-overview",
"unstable": {
"version": [
- 20200817,
- 2046
+ 20200824,
+ 1549
],
- "commit": "467a7dfda4e534783469a137545193ded8a66723",
- "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy"
+ "commit": "7daaa35a6d78feb83167e780a9c23da719c9051b",
+ "sha256": "1fv31h6f7vhnkdrjf2jij6nirnqfxmxq464cmqzp3lfyzxi8pxg0"
},
"stable": {
"version": [
@@ -65920,11 +67462,42 @@
"repo": "wavexx/mu4e-query-fragments.el",
"unstable": {
"version": [
- 20170923,
- 1322
+ 20200913,
+ 1558
],
- "commit": "34ddad4e6785f575333efcc66153d892daa1c884",
- "sha256": "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6"
+ "commit": "6a81d43fcbdc51c2fc47d88f4fd8f25d8f906b79",
+ "sha256": "0sdjkxb7f31bsi1vj6vn2aw1lwq026sz782ys92zprncjp2mkizp"
+ }
+ },
+ {
+ "ename": "mu4e-views",
+ "commit": "f4030dadc74622b7c004775905a1b5307943d72e",
+ "sha256": "0y0ya7scianpi8zmqzbxv5f6a3q7rhxlsg0dcrdrdjnpn8k88b9c",
+ "fetcher": "github",
+ "repo": "lordpretzel/mu4e-views",
+ "unstable": {
+ "version": [
+ 20200830,
+ 1608
+ ],
+ "deps": [
+ "ht",
+ "xwidgets-reuse"
+ ],
+ "commit": "af3916b2639a5a94676d4f11471e25b63ba76d0a",
+ "sha256": "1h0anxs5xammkjky1syy9ja8xgskbf3j7a8hf12ggmihk9qa1dvk"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4
+ ],
+ "deps": [
+ "ht",
+ "xwidgets-reuse"
+ ],
+ "commit": "4977f6517cf12ac994859c4ba992d5e2999ae016",
+ "sha256": "07y96ii3ysqlikq7cixcwf1mr7ysazmmnp42wzah02zdchj9irzh"
}
},
{
@@ -65938,8 +67511,8 @@
20180415,
1219
],
- "commit": "7078e439ee0433a8fbd1cb174464496f9a9d00fa",
- "sha256": "1wpcv4wdk735w701d9bm9qqji98mmzg7l7qkq1jmjw1hbpqhnwl2"
+ "commit": "fd052645bcaa3cca8cede1c587a0b05ab5bd66b2",
+ "sha256": "13jz41iwzczrx9psp5dzh3l1m08idl5walr5lk6yljvx4840r9ij"
}
},
{
@@ -65950,15 +67523,15 @@
"repo": "mihaiolteanu/mugur",
"unstable": {
"version": [
- 20200602,
- 642
+ 20200831,
+ 702
],
"deps": [
"anaphora",
"s"
],
- "commit": "5333d0ff56cb4d1448e4cdf48278abcbc32e96eb",
- "sha256": "07xglyc05d42inlh4j3nvdyi55pa0cy013c5yk8rv94xs31pjd8k"
+ "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6",
+ "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006"
}
},
{
@@ -65993,14 +67566,14 @@
"repo": "ReanGD/emacs-multi-compile",
"unstable": {
"version": [
- 20200517,
- 1747
+ 20200913,
+ 8
],
"deps": [
"dash"
],
- "commit": "e3772f7e68968f7fa2c97615115cd3fc0f701229",
- "sha256": "0r1ahchfhyqjyc0q0xp5x0p34d6hg4ga3cga1l6dlaw1xjflrsq2"
+ "commit": "508b524aa880e0ca6695f0d5543ee7659f2dea7c",
+ "sha256": "0g5ja8ra6kyfpvkavy9diiwjasc4v2z80yi98kahi5nckfp90kvc"
}
},
{
@@ -66113,15 +67686,15 @@
"repo": "suonlight/multi-vterm",
"unstable": {
"version": [
- 20200614,
- 548
+ 20201203,
+ 1500
],
"deps": [
- "projectile",
+ "project",
"vterm"
],
- "commit": "723658c162d483acc07fccf2dd8ae5b8582616f7",
- "sha256": "1wgsqrr6jxv8dwf89406m53w1xzsvq45hrcc72x12hxkc1hay2vk"
+ "commit": "8f385a0aa1ad7a279acc9276913955ef165e7ac7",
+ "sha256": "0anipknf7bfzygjkynq81ndspnfsqwx7l1i7chkfgfygqyq5486y"
}
},
{
@@ -66186,14 +67759,14 @@
"repo": "magnars/multiple-cursors.el",
"unstable": {
"version": [
- 20191210,
- 1759
+ 20201018,
+ 538
],
"deps": [
"cl-lib"
],
- "commit": "b880554d04b8f61165afba7d4de19ac9e39bb7ab",
- "sha256": "0dcw3rw9ahk8y51d9sbqj0f4jdxmykh4jlz4h71cvariqlxw9pq8"
+ "commit": "83abb0533a9d9635bc86d6d52a4e7641b0eaaf63",
+ "sha256": "1p9wz300x9hpkl2lhh6xdcbn46aka5wrqmf20cs5w8dm7205yznc"
},
"stable": {
"version": [
@@ -66265,16 +67838,16 @@
"repo": "Wilfred/mustache.el",
"unstable": {
"version": [
- 20200726,
- 553
+ 20201119,
+ 529
],
"deps": [
"dash",
"ht",
"s"
],
- "commit": "4649a47340b63214c7b8f1dcc178806d96288839",
- "sha256": "1vwngm8fvfmh6p7p54pf01gqsmcg7f86nbyg18qphny9zsss1zjl"
+ "commit": "7f4b1cf0483366a77539081fde94fa6079b514a0",
+ "sha256": "0yg726jdcvkfxss1sw261rz1df3zv9g95rx3b3g8g5xncxi0cqvh"
},
"stable": {
"version": [
@@ -66471,20 +68044,20 @@
"repo": "redguardtoo/mybigword",
"unstable": {
"version": [
- 20200818,
- 1059
+ 20201030,
+ 1253
],
- "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f",
- "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r"
+ "commit": "4c1386252444df2ade734e02078069a06f3f0f97",
+ "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8"
},
"stable": {
"version": [
0,
- 0,
- 9
+ 1,
+ 1
],
- "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f",
- "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r"
+ "commit": "4c1386252444df2ade734e02078069a06f3f0f97",
+ "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8"
}
},
{
@@ -67362,8 +68935,8 @@
"repo": "felko/neuron-mode",
"unstable": {
"version": [
- 20200806,
- 833
+ 20201204,
+ 1517
],
"deps": [
"company",
@@ -67371,8 +68944,8 @@
"markdown-mode",
"s"
],
- "commit": "18d230ce6b126fe7193db9c20ac93811ccfe779d",
- "sha256": "18s7phs285jc4whd54x3dvbajqil7yff18xirbvf9pjlzivqwfk5"
+ "commit": "dad8804d050ce4532053b739dcecb1f4d97ea3e4",
+ "sha256": "0xwfclszwjg12kp3bdp92yjc59d527w48awj9x4dz3ps438ia75z"
}
},
{
@@ -67428,14 +69001,14 @@
"repo": "AdamNiederer/ng2-mode",
"unstable": {
"version": [
- 20200703,
- 1610
+ 20201203,
+ 1925
],
"deps": [
"typescript-mode"
],
- "commit": "d9feee65d882723b955483d2b8af01e49df21652",
- "sha256": "0i0xad3h6rnkrbglmv10vv0zs3nf8kda19n176h6v4zy5bazgrqi"
+ "commit": "d341f177c6e4fb9d99b8639943ab5fc9184e2715",
+ "sha256": "0pz4aj2625m7khqnbpl3h3wh7iwrnzyk61f0qw8w3b4i44fc14h2"
},
"stable": {
"version": [
@@ -67543,10 +69116,10 @@
},
{
"ename": "nikola",
- "commit": "8ef4f7c2f1c48edd7b4a6fdcda51908d216c631c",
- "sha256": "1d0a80y910klayb9jf0ahn5lj9l6xdhwcp2in3ridmqislavrcnv",
- "fetcher": "git",
- "url": "https://git.daemons.it/drymer/nikola.el/",
+ "commit": "2e8e1a5169f0841db4980aebe97235845bbe7183",
+ "sha256": "1zdakql4p0h2l4i3gipzbx9kwmc41qq2zr0rx794722khcka4sz1",
+ "fetcher": "gitlab",
+ "repo": "drymerisnothere/nikola-el",
"unstable": {
"version": [
20170703,
@@ -67576,8 +69149,8 @@
"flycheck-nimsuggest",
"let-alist"
],
- "commit": "16a245e4974d21a6e9e7163e7fbfb50a0bd89f99",
- "sha256": "0fil6x2wshrini0q2zdi96hrvqgx5l4ljnirgqcr7q7lmjdijpci"
+ "commit": "d832d6b1fb5e69fedcdddf442d62251dd0f1f489",
+ "sha256": "0m0khxcnq6whhxvblqyxrz21xfnpfjg4c8dn4x4i080dhmnmbzka"
},
"stable": {
"version": [
@@ -67621,17 +69194,17 @@
20181024,
1439
],
- "commit": "9ddd3c917793bb97eb19d571429cdedf07501c03",
- "sha256": "0lrj3k5ng748faarz63rspnd4sh38qvkxxcgbmk81h4cqvv529fy"
+ "commit": "58f77f972bcece256c16ca1cc4a933270b1ea1c1",
+ "sha256": "128mfqqz0p2skxsgzsvq320nscpqqgzibq4idcsszk43ynksihzf"
},
"stable": {
"version": [
1,
10,
- 1
+ 2
],
- "commit": "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772",
- "sha256": "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"
+ "commit": "e72d1d581c945c158ed68d9bc48911063022a2c6",
+ "sha256": "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55"
}
},
{
@@ -67720,20 +69293,20 @@
"repo": "NixOS/nix-mode",
"unstable": {
"version": [
- 20200811,
- 1947
+ 20201202,
+ 1618
],
- "commit": "0cf1ea1e0ed330b59f47056d927797e625ba8f53",
- "sha256": "0wsiyvv23jcazh7jrbkg3d0qs1y5i88ahsdi3pp2s8q9h3lyhwnb"
+ "commit": "e32c6bf7ad6dfe1d7ef9ee07d4da6e50174037bf",
+ "sha256": "1qihka6vzlnd4ks4az2bj7zmbfxjcvhbadb3xwswzbyc87lgkr0g"
},
"stable": {
"version": [
1,
4,
- 4
+ 5
],
- "commit": "e4e604ae3ac91748c4e7d51a591cb9ee60961b7c",
- "sha256": "19f36kl00pxm2a18hn4cdsdvxlfsdx1pnnm6s6zxd8nw6y8ynvn0"
+ "commit": "471a90ac96f4c94a717e5138fb0b03a167cfbf26",
+ "sha256": "1bqlhkxg0faddhvxx909dq46dxdxk4mdyhdpww92dmzgxdpq38sx"
}
},
{
@@ -67860,10 +69433,10 @@
},
{
"ename": "nlinum-relative",
- "commit": "eb418a464b112f9bb1bbd050e9602b60c0fcce1c",
- "sha256": "15ifh5bfsarkifx6m7d5rhx6hqlnm231plkf623885kar7i85ia4",
+ "commit": "2ea6601e6eaa29c6f0a37101ad27b2e4833b3445",
+ "sha256": "00ybryqyv4518qxwkjxk0a1i74zbanh73v7c5jc3b7r3a3x47c1l",
"fetcher": "github",
- "repo": "CodeFalling/nlinum-relative",
+ "repo": "xcodebuild/nlinum-relative",
"unstable": {
"version": [
20160526,
@@ -67904,8 +69477,8 @@
"repo": "dickmao/nndiscourse",
"unstable": {
"version": [
- 20200524,
- 1649
+ 20200829,
+ 1751
],
"deps": [
"anaphora",
@@ -67914,8 +69487,8 @@
"json-rpc",
"rbenv"
],
- "commit": "e8d99d132d649e179f7cc81b80d873436b4e8ce1",
- "sha256": "03iqbb3svidczzci0l8b19zk8yx9xdslf9y0hpn2y8fzhf4gszrp"
+ "commit": "152f3176fff026572d2cfa22adaeb32f42410083",
+ "sha256": "1sljvp31jccffd6h21lf01lkr4qa093ia0bh7kakx9azvqdz55qf"
}
},
{
@@ -67935,8 +69508,8 @@
"dash-functional",
"request"
],
- "commit": "ad20d17f196a1b99c683ad2ffc39a9b4b2fada58",
- "sha256": "1b5jnprpvlsn7cnxj6pab8kr0kdzm8xqrzhsga6dlaww6max26xp"
+ "commit": "baeb84dd0be0e7631d1f49da30a53eb61863b04c",
+ "sha256": "15r5hph17pdy5c5jyxh5sia5yqd81ckki185m9jqg9yls749hy55"
}
},
{
@@ -67962,8 +69535,8 @@
"repo": "dickmao/nnreddit",
"unstable": {
"version": [
- 20200524,
- 1647
+ 20201130,
+ 39
],
"deps": [
"anaphora",
@@ -67972,8 +69545,28 @@
"request",
"virtualenvwrapper"
],
- "commit": "4f41473221ea3312085c9f562db59d8f22bf8910",
- "sha256": "0b42z866igmh8lvykcmac19zb6irdyvaag5dnaa54w2xc9ms52hj"
+ "commit": "cf6bc58bff8bb8e2e3c4d681d2657b561573b2dc",
+ "sha256": "1cgw4vmffp08csf48gghfsm73h8yaai4k2kpgf213d6zqbxz9w5z"
+ }
+ },
+ {
+ "ename": "nntwitter",
+ "commit": "39b3ec38c4a6762afdea13c17e0447caa976181f",
+ "sha256": "0788lajp113rqc38d0s1qypvgmfnxw1mjcj97syi27jda5jw3lbl",
+ "fetcher": "github",
+ "repo": "dickmao/nntwitter",
+ "unstable": {
+ "version": [
+ 20201129,
+ 2009
+ ],
+ "deps": [
+ "anaphora",
+ "dash",
+ "request"
+ ],
+ "commit": "94916ad8c3e3bf697855c58257f92cd697c9521a",
+ "sha256": "19dk7mkjpmmzbq26kdpz032g16jlj3b7mbmgi5px9rfa9qm0v8qw"
}
},
{
@@ -67999,26 +69592,26 @@
"repo": "emacscollective/no-littering",
"unstable": {
"version": [
- 20200817,
- 1831
+ 20201130,
+ 1511
],
"deps": [
"cl-lib"
],
- "commit": "85629e5979f2159ab8cc77814dd4cb219e6ba69c",
- "sha256": "0ii19sbmsl35y1glj2mz309aila8954rmpah7y7mr2b34ami6hdw"
+ "commit": "f14d5548211109b0e5e850706d8d2cc182dc60be",
+ "sha256": "0x43c749jbb9amkz4mpl0yn4b32v5wbzx8snig9700dvayjb4k89"
},
"stable": {
"version": [
1,
- 1,
- 2
+ 2,
+ 0
],
"deps": [
"cl-lib"
],
- "commit": "aaa3c36b25e07017595b54e91e190f69f0de0487",
- "sha256": "0v642qbd65w5jq44zsl4vy525vjmhr948p1jmpq4mpvhfgmxx88c"
+ "commit": "de7a73579659a97ebf67f82c500d0059a4b6a9df",
+ "sha256": "1hma9var0nmrmjlh16s49hbfc1s4jvfd2prqxf14lxfd51404niw"
}
},
{
@@ -68252,8 +69845,8 @@
"deps": [
"colorless-themes"
],
- "commit": "736f7a105535901b4783d19534e7855920e25115",
- "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
+ "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136",
+ "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72"
},
"stable": {
"version": [
@@ -68305,21 +69898,20 @@
"url": "https://git.notmuchmail.org/git/notmuch",
"unstable": {
"version": [
- 20200816,
- 1342
+ 20201206,
+ 2023
],
- "commit": "8776faf6d5118e8152ecfacf94accf35ccebf1d2",
- "sha256": "0r4f12m2xbwzl0fhqcz2vv7dcr0psnhy8ahhv6b5gsdfdfd2w4w3"
+ "commit": "adfded9ed0a5a4b06886f462314cd4511cb72d47",
+ "sha256": "1a3dmzxwl8b31m9rwjvqhgkk4cac2yg2blapp39szxmbb9vs768x"
},
"stable": {
"version": [
0,
31,
- -1,
- 1
+ 2
],
- "commit": "75ec89dfb4c254ba0b88ddb479e6ede6bfb7d0c7",
- "sha256": "1pc4nkbhxmx1qlamnjzd1arzr3sgp0m95vn1jmmfivgddy3xh8b0"
+ "commit": "02a7b026d938f53d9fd9b183ca2b3c44c92489f2",
+ "sha256": "0rbzpr03z8lsx660ciayy3fj872s2561yvam1wgjbb21phd8hacw"
}
},
{
@@ -68381,6 +69973,36 @@
"sha256": "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18"
}
},
+ {
+ "ename": "notmuch-maildir",
+ "commit": "4d3569dd0faa536bce74636f010c836606367a69",
+ "sha256": "1m45nq256s0k86p0rkfq0rvdifbcvx40x7sybdzg9pgn8q2kvbff",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tarsius/notmuch-maildir",
+ "unstable": {
+ "version": [
+ 20201028,
+ 1330
+ ],
+ "deps": [
+ "notmuch"
+ ],
+ "commit": "bac7b56e1a758670e7e6d57d233b45f45961d321",
+ "sha256": "0wx064c2njjq32dqbv68hysds5bm43921vsr34xb4lk748lk2qhv"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "notmuch"
+ ],
+ "commit": "8c641d9688f20262c9dac59901aaecd2a21525d7",
+ "sha256": "1nh7vkxhwb2cmm8g7gxh3rc6lcfqlhsbf82vi3lsbdq008p1b3kh"
+ }
+ },
{
"ename": "nov",
"commit": "20b2cc78b41a26e434b984943681fea774fd3c50",
@@ -68389,28 +70011,28 @@
"url": "https://depp.brause.cc/nov.el.git",
"unstable": {
"version": [
- 20200813,
- 821
+ 20201207,
+ 3
],
"deps": [
"dash",
"esxml"
],
- "commit": "6cfd80124038504038bcb5d4cf2e8b037c36841a",
- "sha256": "1zr8q9kl3i1900vp08c52ywx2lpwp4iyqs8vm3kb8a7dsc4hpggf"
+ "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4",
+ "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk"
},
"stable": {
"version": [
0,
3,
- 1
+ 3
],
"deps": [
"dash",
"esxml"
],
- "commit": "3d32aac0f895c8605e254c8b7f246537816744f5",
- "sha256": "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9"
+ "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4",
+ "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk"
}
},
{
@@ -68421,11 +70043,11 @@
"repo": "muirmanders/emacs-nova-theme",
"unstable": {
"version": [
- 20200213,
- 102
+ 20200826,
+ 1803
],
- "commit": "4553fabbcd340f3f2fa59dbfb6f3f32ecb016e6f",
- "sha256": "0y0f7f03hikd5j20fc40g0hrp7aiwzna9rfwpxzlj10n8ijmygq9"
+ "commit": "279e165171558930f56d8d5cfc83e1bb6560e452",
+ "sha256": "0rwqnqkbasgp80cgsz0pp1gbg2w7803lh7z02565p193mrvfwr3b"
}
},
{
@@ -68514,16 +70136,16 @@
"repo": "samaaron/nrepl-eval-sexp-fu",
"unstable": {
"version": [
- 20140311,
- 1041
+ 20201007,
+ 2311
],
"deps": [
"highlight",
"smartparens",
"thingatpt"
],
- "commit": "3a24b7d4bca13e87c987a4ddd212da914ff59191",
- "sha256": "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc"
+ "commit": "2d6ad728b1ba290974a2ae1f232a5a96810a135b",
+ "sha256": "0prm2iyahvrm1ngkq3vxz21g2pzvrz60dl7g4yrs683vbmys7b0d"
}
},
{
@@ -68610,19 +70232,20 @@
"repo": "joostkremers/nswbuff",
"unstable": {
"version": [
- 20200312,
- 2050
+ 20201207,
+ 805
],
- "commit": "a601855cc96e303e38051d0d1af3402721dbb969",
- "sha256": "0xbh5max7wbsw3iaa5ai9l5brky3mykyzn77a4w5r1m1f4a67y97"
+ "commit": "76e5d96f31368a74121076df679255e1ea97f5d9",
+ "sha256": "08yf7cdmq6nqn4bhm4asj3yavcifwjgkyzhdcr3dm9a9jv1b3w0m"
},
"stable": {
"version": [
+ 1,
1,
1
],
- "commit": "a601855cc96e303e38051d0d1af3402721dbb969",
- "sha256": "0xbh5max7wbsw3iaa5ai9l5brky3mykyzn77a4w5r1m1f4a67y97"
+ "commit": "76e5d96f31368a74121076df679255e1ea97f5d9",
+ "sha256": "08yf7cdmq6nqn4bhm4asj3yavcifwjgkyzhdcr3dm9a9jv1b3w0m"
}
},
{
@@ -68763,8 +70386,8 @@
"repo": "rejeep/nvm.el",
"unstable": {
"version": [
- 20200501,
- 1414
+ 20201005,
+ 2328
],
"deps": [
"dash",
@@ -68772,8 +70395,8 @@
"f",
"s"
],
- "commit": "fc925b9afe738264cb15d5135c7426f999aeda47",
- "sha256": "1mb3i7d470ggky6g9ib1jf04yfkfn9m8jd70mb18rac2ik3sy03q"
+ "commit": "f15334f78de7786617a15c9de54f4c79a92865fb",
+ "sha256": "10v4593yz3afrqj6zilq3dw2fngf0f20dy2mrgbcickvdbvkifby"
},
"stable": {
"version": [
@@ -68845,29 +70468,6 @@
"sha256": "1bk00pv7ylbrmf42papp6z2bhnp5fbnd4wy3gdzd18j7f2g0196v"
}
},
- {
- "ename": "o-blog",
- "commit": "d5f24e70260f46445b119817bc1326f29b367c4b",
- "sha256": "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja",
- "fetcher": "github",
- "repo": "renard/o-blog",
- "unstable": {
- "version": [
- 20151202,
- 2339
- ],
- "commit": "e466c59478feddc8126c43c1b98550474af484c0",
- "sha256": "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch"
- },
- "stable": {
- "version": [
- 2,
- 0
- ],
- "commit": "5db9594c6e3439c000b183551d7975c2e29131f4",
- "sha256": "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs"
- }
- },
{
"ename": "oauth",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -68926,16 +70526,16 @@
"repo": "astahlman/ob-async",
"unstable": {
"version": [
- 20190916,
- 1537
+ 20200921,
+ 205
],
"deps": [
"async",
"dash",
"org"
],
- "commit": "80a30b96a007d419ece12c976a81804ede340311",
- "sha256": "0jhgzmqds73yc49hc4yarp1a25pci9qmsvnpcxd7kv5saha40hnn"
+ "commit": "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e",
+ "sha256": "12n6fvjiwkf02aypvj5zrbjrxhz2p0rcq2k3mfz5ravyarpvrybp"
},
"stable": {
"version": [
@@ -68966,8 +70566,8 @@
"deps": [
"axiom-environment"
],
- "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
- "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
+ "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1",
+ "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585"
}
},
{
@@ -69155,6 +70755,30 @@
"sha256": "1r0r0dqsr44kcbj2w96rbx8alvkkfzc98ac35zb4ncy1bf71jhfb"
}
},
+ {
+ "ename": "ob-deno",
+ "commit": "d7f97f342c1490e6891fbc55661efb504434b813",
+ "sha256": "175i9xw6f31b69d941l4yjj7f4hw5sqh5wzk3gh2s1klx5znvi47",
+ "fetcher": "github",
+ "repo": "taiju/ob-deno",
+ "unstable": {
+ "version": [
+ 20201019,
+ 101
+ ],
+ "commit": "f1129d20fe9931f1c0b62c4af781f5489abd957f",
+ "sha256": "0wcrv423rzb5zwl36acpxjimxkxxy52z789rhhyq8vvfid1873ij"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "commit": "e3b06d7662687e402905b9de4ad1d5816e89b842",
+ "sha256": "048xry2bj3xkkjw8n8lmwrjv1rhyhgf7xf8k86vw64754z5394xm"
+ }
+ },
{
"ename": "ob-diagrams",
"commit": "fbb31def39fef108ecf7be105a901abfa6845f76",
@@ -69221,6 +70845,38 @@
"sha256": "170bw9qryhzjzmyi84qc1jkzy1y7i8sjz6vmvyfc264ia4j51m9w"
}
},
+ {
+ "ename": "ob-ess-julia",
+ "commit": "27da37cf0c629f839e13b90b20211b9308a630fa",
+ "sha256": "1pz4da3w6gjz28m5yn8b2608q77hgh4fxhqywy598nmzqizibnfk",
+ "fetcher": "github",
+ "repo": "frederic-santos/ob-ess-julia",
+ "unstable": {
+ "version": [
+ 20201109,
+ 911
+ ],
+ "deps": [
+ "ess",
+ "julia-mode"
+ ],
+ "commit": "862f34da39faae87fc0900bb7006fb20fbd2b61a",
+ "sha256": "09gg0jbilrzz5fpvgkvig43k860044c0525y5lcgqns6gm0fs24h"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "ess",
+ "julia-mode"
+ ],
+ "commit": "337df3eefd85c01020fe08eae3ddcf3ec3e4ac2d",
+ "sha256": "0pk4b6zg08nacds129frk3qwn0mlm4sg03gihyn42fd8iq16mjzf"
+ }
+ },
{
"ename": "ob-fsharp",
"commit": "89bc8c5fe6db0573109e82b3d1350d33d6d8aff5",
@@ -69401,8 +71057,8 @@
"deps": [
"org"
],
- "commit": "d21d436814e9605cf2a942b709f957695298dc70",
- "sha256": "0zmckisi9q9kv25jh0jn0ab9xbh2b7d4mzyyi1sdgnkg0ayzvvhb"
+ "commit": "a20e3fedbac4034de4ab01436673a0f8845de1df",
+ "sha256": "0dgygnh12izr92k28ygjhhpz0jx6vkrskbiplk87fkg1w8hyiy2a"
}
},
{
@@ -69869,14 +71525,14 @@
"repo": "clemera/objed",
"unstable": {
"version": [
- 20200815,
- 1504
+ 20200911,
+ 1435
],
"deps": [
"cl-lib"
],
- "commit": "dea5a64a4da32e8947fe5b45de569e293aaa8a96",
- "sha256": "1jmr14bfs489g0czpmn987gpmmdqx72blkzcnd8sn1sfyk5n18ng"
+ "commit": "70f9fb5e0aa1627b0afc7c6b3d0aea9bac70a210",
+ "sha256": "1j9z2zj9b9yrvzmvhwqr7zrvh4rbxd62fdhn1rqv59b0jfmbcsqz"
},
"stable": {
"version": [
@@ -69906,6 +71562,30 @@
"sha256": "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b"
}
},
+ {
+ "ename": "ocamlformat",
+ "commit": "5d541465081b52ce714a624e774c05d59c07e83f",
+ "sha256": "0k4grqv6yi05vz08k3xmv1w4wqcxa4w6z4mn7w9vbxqzlqyrxmv2",
+ "fetcher": "github",
+ "repo": "ocaml-ppx/ocamlformat",
+ "unstable": {
+ "version": [
+ 20201204,
+ 945
+ ],
+ "commit": "58f933600606f519b2c22eb2536a62298aadcbf7",
+ "sha256": "1i33m5cb21v5q4bdvih8hv8227awif87j4kl8w7yl9prn6mcs2w1"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 16,
+ 0
+ ],
+ "commit": "101d2306f5b0b23bbc25e1155c1ffd51a0bbf61e",
+ "sha256": "0yf1kf3yhiw39qpybz2aszwl7kjshiv45d81gq7q7xgn9nqnf0z4"
+ }
+ },
{
"ename": "occidental-theme",
"commit": "736fd0b7865cc800800fa6467019a365ddf1c412",
@@ -70087,26 +71767,26 @@
"repo": "oer/oer-reveal",
"unstable": {
"version": [
- 20200813,
- 1540
+ 20201207,
+ 1202
],
"deps": [
"org-re-reveal"
],
- "commit": "165eaf9d151c589226f7a4e0edc3a3100c0a9efb",
- "sha256": "06740c4qdpdrim5wj88gw973lbh59h6sx4kzrpl37cqjvdsawbzv"
+ "commit": "62c6d91bd5045f2ecb817fdea69d98b03126b715",
+ "sha256": "0pnsq52bggd1wk783mljza5sm8ymb1j5dqhv00n3l98061wbql9h"
},
"stable": {
"version": [
3,
- 2,
- 1
+ 11,
+ 0
],
"deps": [
"org-re-reveal"
],
- "commit": "7a99fa342eae234069344893b5bc851280ff2dc9",
- "sha256": "1fsp6li73dk2272lgj4kxapd1sqw2pqj42rlcbl5hhh35hva714h"
+ "commit": "4155e1b7d533cc107da74b4d6f463ed96b6dad39",
+ "sha256": "0pwpwxqd0mdp7dcir4yiigsybra1iv571ngn3yvprid8ji12h5sr"
}
},
{
@@ -70211,20 +71891,20 @@
"repo": "rnkn/olivetti",
"unstable": {
"version": [
- 20200702,
- 601
+ 20201029,
+ 922
],
- "commit": "0bc5e98b8456493084d1bd3df35e92a12c5da3b2",
- "sha256": "121dzm051jivskssfvxs5kxkviqivf1j0fr3q8rkfqii7rxdw84r"
+ "commit": "b76a020aedb57a6a7d0ae61cde13434f5c802a44",
+ "sha256": "1qq0lx0wrflx1r2m7gidnvcv7cipc6dzh1clf5mp50mm2cp88n50"
},
"stable": {
"version": [
1,
11,
- 1
+ 2
],
- "commit": "57ca8e70bc9ee975f0e2a60bfc4121064dadd2e0",
- "sha256": "0rghxjdzyfykd4qc2zkavvbyf9xc899k1b8hbk890f1y3vakqvqz"
+ "commit": "b76a020aedb57a6a7d0ae61cde13434f5c802a44",
+ "sha256": "1qq0lx0wrflx1r2m7gidnvcv7cipc6dzh1clf5mp50mm2cp88n50"
}
},
{
@@ -70421,8 +72101,8 @@
"repo": "OmniSharp/omnisharp-emacs",
"unstable": {
"version": [
- 20191015,
- 635
+ 20201002,
+ 1600
],
"deps": [
"auto-complete",
@@ -70434,8 +72114,8 @@
"popup",
"s"
],
- "commit": "e658a18a762438c3e1737612737b05d02a21ca2a",
- "sha256": "1m4xqcn586f0gn305kig502480zlnvmrv98nmdkn36fbwgg96hla"
+ "commit": "2aead2d276cb6bd6f01dac7845a593d25a469c41",
+ "sha256": "006wxbr0hb917zqp67hin6x8ag5aa90n5shwzwspq2sxhdy9819j"
},
"stable": {
"version": [
@@ -70616,11 +72296,11 @@
"repo": "salmanebah/opencl-mode",
"unstable": {
"version": [
- 20190615,
- 1957
+ 20201025,
+ 1656
],
- "commit": "55cb49c8243e6420961d719faced035bc547c1ef",
- "sha256": "0rsf49dj0q5i14b3nfhld9da7d9cx01l8gxf35ya7nw4fw07aan1"
+ "commit": "15091eff92c33ee0d1ece40eb99299ef79fee92d",
+ "sha256": "1zn6rr48w0ai0sn51zzyp546va6flfgf9lm12vfrdb6kkiiiq403"
},
"stable": {
"version": [
@@ -70776,11 +72456,11 @@
"repo": "oantolin/orderless",
"unstable": {
"version": [
- 20200614,
- 1920
+ 20200905,
+ 2113
],
- "commit": "1f1e0380e2a8cd4fc29b8cc2e00cb01b56d86fbc",
- "sha256": "15an4y0xdaih86p33zmb6r7qx5n0cs54flcnnq50jakkxlg9s8xh"
+ "commit": "e56eeef6e11909ccd62aa7250867dce803706d2c",
+ "sha256": "1g4963snkp1gxlf5h1h5kjn4pj55f844ajzx4n5nhkws44sr6isg"
},
"stable": {
"version": [
@@ -70945,11 +72625,11 @@
"repo": "dfeich/org-screenshot",
"unstable": {
"version": [
- 20180420,
- 525
+ 20201130,
+ 1607
],
- "commit": "6b1edbd2384191122a30788ac72f2233c2df0294",
- "sha256": "0vyxpc28b9b0cn02a9p48q6iy61qw7gj7gzk37ijdmzg8dzy6hxv"
+ "commit": "a467a1f04a416252f067b95c0f00a9f10d03c433",
+ "sha256": "1mi9h69zdm4yhvpsgiqvg214f5k818y3w1hz626cw0vr2jxmgdf2"
}
},
{
@@ -70983,29 +72663,29 @@
"repo": "diadochos/org-babel-eval-in-repl",
"unstable": {
"version": [
- 20200723,
- 838
+ 20201206,
+ 1540
],
"deps": [
"ess",
"eval-in-repl",
"matlab-mode"
],
- "commit": "85136ac7397fcdf0a4700a860de44d7912bb6b4c",
- "sha256": "0pkp1w8ivgbr7jy90fymws2k9bambayrfq9rcad9qfzl76i412z9"
+ "commit": "3591f062873de2d64cc6f83b3555d030506e6ee7",
+ "sha256": "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a"
},
"stable": {
"version": [
1,
- 5
+ 6
],
"deps": [
"ess",
"eval-in-repl",
"matlab-mode"
],
- "commit": "929d160685db57c4f0aedf26b52f9d7a918a40dd",
- "sha256": "0dk2kqwf7pg18iny02rz146jjjlfqn1vd9ay1sxq7vgsv6c1cs80"
+ "commit": "3591f062873de2d64cc6f83b3555d030506e6ee7",
+ "sha256": "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a"
}
},
{
@@ -71089,34 +72769,36 @@
"repo": "lepisma/org-books",
"unstable": {
"version": [
- 20200522,
- 1800
+ 20200905,
+ 740
],
"deps": [
"dash",
"enlive",
"helm",
"helm-org",
+ "org",
"s"
],
- "commit": "49617901d087f532d7cae1aa23637671fd153d20",
- "sha256": "09nq7na9r39pl6aljrf5vpkfih92ms7s081nxdrhxcscaysk08kb"
+ "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab",
+ "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r"
},
"stable": {
"version": [
0,
2,
- 19
+ 21
],
"deps": [
"dash",
"enlive",
"helm",
"helm-org",
+ "org",
"s"
],
- "commit": "4b93bb1e20e2e66b9e64819b21ca75f36c389370",
- "sha256": "1ksvdl8liqv74am1r7brn8slkwgbc83jv7l92qk9md7s1krcb6y0"
+ "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab",
+ "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r"
}
},
{
@@ -71127,14 +72809,14 @@
"repo": "Kungsgeten/org-brain",
"unstable": {
"version": [
- 20200625,
- 2050
+ 20201120,
+ 2132
],
"deps": [
"org"
],
- "commit": "671db0e08b91c7d2637d765a7afca8b2561275c8",
- "sha256": "17i0lnp9xyzbky0xh1qi6q7jpnpz950j2zxwv2hg007zziqd21ks"
+ "commit": "1ae4fd46165fc56f34f36ce38cb2ae816b07e207",
+ "sha256": "1y80j75w80rlz1100lhxjr0bd5bzs4kak116zfw8sydvlr2q0px0"
}
},
{
@@ -71250,11 +72932,11 @@
"repo": "rexim/org-cliplink",
"unstable": {
"version": [
- 20190608,
- 2134
+ 20201126,
+ 1020
],
- "commit": "82402cae7e118d67de7328417fd018a18f95fac2",
- "sha256": "0cx0bmpsniazpl420cck9pgvmyfznrvl5bgrjnfyvkmqgpz9nyzv"
+ "commit": "13e0940b65d22bec34e2de4bc8cba1412a7abfbc",
+ "sha256": "1avyiw8vlv4n1r7zqvc6wjlsz7jl2pqaprzpm782gzp0c999pssl"
}
},
{
@@ -71407,16 +73089,16 @@
"url": "https://git.spwhitton.name/org-d20",
"unstable": {
"version": [
- 20200416,
- 2010
+ 20201113,
+ 453
],
"deps": [
"dash",
"s",
"seq"
],
- "commit": "7ede5726d640c4f81146585f6eb907f51a0f6a19",
- "sha256": "1p4irzcsq2sxmvpyrkrqs9ylp153mzwr31hvsnfh1f2nlghpicfk"
+ "commit": "a3734368cd5a36541dab2fa8f7404cb850991b5b",
+ "sha256": "0vsi5z9n18w88q4k17p2iviqmg1bqy0ficw67ry4l9lalnq5x569"
},
"stable": {
"version": [
@@ -71458,11 +73140,11 @@
"repo": "emacsattic/org-doing",
"unstable": {
"version": [
- 20200510,
- 1732
+ 20161017,
+ 1620
],
- "commit": "df916bb13577f4de9d58332453cb8bf51eac37ba",
- "sha256": "014xz7yjw97i1dzyg487r2v9rf3jk9jwc5acgg1fj5kc2n1m299m"
+ "commit": "07ddbfc238cba31e4990c9b52e9a2757b39111da",
+ "sha256": "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa"
},
"stable": {
"version": [
@@ -71500,14 +73182,14 @@
"repo": "abo-abo/org-download",
"unstable": {
"version": [
- 20200818,
- 1117
+ 20200914,
+ 1558
],
"deps": [
"async"
],
- "commit": "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f",
- "sha256": "0f94drnfkyd1vpdhkr463zv952lk1v895dwrzk1251j8fb9vdf9m"
+ "commit": "42ac361ef5502017e6fc1bceb00333eba90402f4",
+ "sha256": "0cg4y7hy7xbq4vrbdicfzgvyaf3cjbx2zkqd4yl0y2garz71j99l"
},
"stable": {
"version": [
@@ -71823,8 +73505,8 @@
"repo": "kidd/org-gcal.el",
"unstable": {
"version": [
- 20200809,
- 2137
+ 20201113,
+ 2330
],
"deps": [
"alert",
@@ -71832,8 +73514,8 @@
"request",
"request-deferred"
],
- "commit": "2cad2d8c175975dea42903cd4e3fd8bec423c01a",
- "sha256": "013h09gdd7zlcrrvwf2i2ipyazvsjg2hwcfracb9bbv4r5bc0syf"
+ "commit": "0a6f9a7385410b70853eb65c14344ad76cc6815f",
+ "sha256": "0m6h2psshkr2kvckp2bmaj2y1cp3kbyw2nwwvwg2k3yymkqr8l7l"
},
"stable": {
"version": [
@@ -71935,14 +73617,14 @@
},
{
"ename": "org-gtd",
- "commit": "26f2af3e31a2ddbf8600cb9a625d138c924d8a53",
- "sha256": "1k264yb9n544zzf8ivzm16vqrklghrhiqs6jfwyx85675088vp6m",
+ "commit": "fe40ab5db55ea63b9d4910339b5ef764d54e2e59",
+ "sha256": "1a86mdfxmpjg813izx4y8ks44f41g3yqqvivj0iqxwjmiwn8mv7l",
"fetcher": "github",
- "repo": "trevoke/org-gtd.el",
+ "repo": "Trevoke/org-gtd.el",
"unstable": {
"version": [
- 20200809,
- 2319
+ 20201112,
+ 253
],
"deps": [
"f",
@@ -71950,14 +73632,14 @@
"org-agenda-property",
"org-edna"
],
- "commit": "6837b4b192c850ae45b042a78b79f4e7cca2d56e",
- "sha256": "1m3na0xswmndhjmgpqh1m5pj9cy5jp3vjmga74x2igrhk40ba8ly"
+ "commit": "4716603f3719acd89a268fb907b91fd3d6af311a",
+ "sha256": "1sjdgdg0j8j7qd5scls9rbyk445bcmkf84iz4kgiyca7bb7rap57"
},
"stable": {
"version": [
1,
0,
- 1
+ 3
],
"deps": [
"f",
@@ -71965,8 +73647,8 @@
"org-agenda-property",
"org-edna"
],
- "commit": "ee10b8cb70d27d01280de8f282d9602f3497b8ab",
- "sha256": "0j555cfi312j0kkpba91np3vwly26y7hyyyaxr2lcg84jd17frjg"
+ "commit": "4716603f3719acd89a268fb907b91fd3d6af311a",
+ "sha256": "1sjdgdg0j8j7qd5scls9rbyk445bcmkf84iz4kgiyca7bb7rap57"
}
},
{
@@ -71977,28 +73659,28 @@
"repo": "marcIhm/org-id-cleanup",
"unstable": {
"version": [
- 20200523,
- 735
+ 20201127,
+ 1712
],
"deps": [
"dash",
"org"
],
- "commit": "e79540b64e0ee5ef11adfeb932a9b04beb905680",
- "sha256": "0qn85515lzhqhn49byf0vpyhbgfwyibf21f7xl2j7cj306x1f79c"
+ "commit": "1654be88f5a5e1c57e5d204f060f9a07ff4242cc",
+ "sha256": "0gzrdrr0b8rs2lb96j0zczmfvsy37fwri3dxzdpyvddb4x5a1rl2"
},
"stable": {
"version": [
1,
- 3,
- 8
+ 5,
+ 2
],
"deps": [
"dash",
"org"
],
- "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8",
- "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d"
+ "commit": "a5c5ff8f2d3ae1fd3ef81511bd4b0226f6764935",
+ "sha256": "17r36k2gdk8n1433a84c490js1x22yjwr21ihcjj13mnfcglmzhp"
}
},
{
@@ -72033,28 +73715,30 @@
"repo": "marcIhm/org-index",
"unstable": {
"version": [
- 20200516,
- 1343
+ 20201117,
+ 1211
],
"deps": [
"dash",
- "org"
+ "org",
+ "s"
],
- "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e",
- "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n"
+ "commit": "0863397ba2782e229fa6216beb074dd44eb0c031",
+ "sha256": "062dm9famamziqjczyk6w6ynk0qw6dp4k6a5k81iscz0gdlv6cfm"
},
"stable": {
"version": [
- 6,
- 2,
- 1
+ 7,
+ 0,
+ 0
],
"deps": [
"dash",
- "org"
+ "org",
+ "s"
],
- "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e",
- "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n"
+ "commit": "3ada80bca278bb0fb791f7498cced6e8c9752064",
+ "sha256": "1y1nrw39bc1ng6p4asy4lv3y20vdvx1cqa03s5jf9nccddn5j924"
}
},
{
@@ -72085,31 +73769,30 @@
"repo": "ahungry/org-jira",
"unstable": {
"version": [
- 20200714,
- 41
+ 20201119,
+ 154
],
"deps": [
"cl-lib",
"dash",
"request"
],
- "commit": "5c90dce918fcb873754bff375e988b17dcc69701",
- "sha256": "1d38szx1vq4k1pfdisr3czwaasfw7jkwa2vswfcrnk3d65akkgzk"
+ "commit": "df45be17fb66490f625b60c99d9954e614885101",
+ "sha256": "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y"
},
"stable": {
"version": [
4,
3,
- 1
+ 2
],
"deps": [
"cl-lib",
"dash",
- "request",
- "s"
+ "request"
],
- "commit": "3a6c9fd6886f9dbd11b055fb3bf54513fa278940",
- "sha256": "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"
+ "commit": "df45be17fb66490f625b60c99d9954e614885101",
+ "sha256": "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y"
}
},
{
@@ -72120,26 +73803,26 @@
"repo": "bastibe/org-journal",
"unstable": {
"version": [
- 20200815,
- 1335
+ 20201101,
+ 1438
],
"deps": [
"org"
],
- "commit": "a2728e25b854af21cea8e8d313714c993eb1c848",
- "sha256": "1rvlrn0jlw6a3p48zg50vw4nll2cffk9nkng0qvh8ws0a161w2j1"
+ "commit": "14ce0119fe2d89f2f2207788be2edce0b9372822",
+ "sha256": "0ba1rzgk1mw27jzb0bjvwgxjxim4mgs710jfazms2f7gdi328gbg"
},
"stable": {
"version": [
2,
1,
- 0
+ 1
],
"deps": [
"org"
],
- "commit": "f7bfc592ec11e9e5d0b0bfa377961167b68bba72",
- "sha256": "1imrfvzc52l976598df2243s4jdwicznnxs3q91m5vrjsk23zfp2"
+ "commit": "25ebb8f1c8cd8993fb75a15e2bb8144fb6f9e006",
+ "sha256": "1p9i6v3bwi1ab576vc9qg1ki91197d6nkkg857s52zsan1zlkzzw"
}
},
{
@@ -72199,15 +73882,54 @@
"repo": "stardiviner/org-kindle",
"unstable": {
"version": [
- 20190315,
- 439
+ 20200906,
+ 944
],
"deps": [
"cl-lib",
"seq"
],
- "commit": "612a2894bbbff8a6cf54709d591fee86005755de",
- "sha256": "1h3pbjiy5v8lp3p6dry4jk3pvdp7hpkc517d3w9ldhz6nmaiccgg"
+ "commit": "5fde4a53f062612b2a118c53ff0196a128b80d6d",
+ "sha256": "0rkj936cdlk9n9k8pi957p3y43xs85zfc9pnn4qhn943sk111b6c"
+ }
+ },
+ {
+ "ename": "org-latex-impatient",
+ "commit": "5c49e1970a12617b00c79ec2d7112da8c9d8f4f7",
+ "sha256": "0c16h2n6wx21cp1a5rhmvqhf8pryik3blkq5j0aiyxnxxqiikbly",
+ "fetcher": "github",
+ "repo": "yangsheng6810/org-latex-impatient",
+ "unstable": {
+ "version": [
+ 20201123,
+ 845
+ ],
+ "deps": [
+ "dash",
+ "org",
+ "posframe",
+ "s"
+ ],
+ "commit": "e9d30ec4b1cbf4532051d0790948a95e1bd681c1",
+ "sha256": "182djf213raagpc8rhj1vxbn6imsp6lpabcsfajq9vxlvyx360xk"
+ }
+ },
+ {
+ "ename": "org-link-beautify",
+ "commit": "ee5e68e4aeea824af0abef8b6552852a8436b178",
+ "sha256": "0s0hrq3pr3c7mdmnl69spn7k8905y3j75wkzncnq8dsia9s5q7xi",
+ "fetcher": "github",
+ "repo": "stardiviner/org-link-beautify",
+ "unstable": {
+ "version": [
+ 20201129,
+ 736
+ ],
+ "deps": [
+ "all-the-icons"
+ ],
+ "commit": "2c5f504cd3674db9f7ddd9aff0dd8b9ebdd8f0b3",
+ "sha256": "0yzidf1liw4nnd03sw8qsflplg1lc1w8y4kaklpbbk99rv5jf76s"
}
},
{
@@ -72289,24 +74011,6 @@
"sha256": "11chlfvil0wbvzaplzdymn4ajz85956hcs8bh3zds6ij806mqa4y"
}
},
- {
- "ename": "org-lookup-dnd",
- "commit": "77a8cd0ff954ab87fa57cc6544146b5937779a3b",
- "sha256": "06g2w75nyk354fpg8b8w1v4xzsiwx3sglwxk3azrn2g4sdlammmz",
- "fetcher": "gitlab",
- "repo": "maltelau/org-lookup-dnd",
- "unstable": {
- "version": [
- 20190622,
- 2224
- ],
- "deps": [
- "org-pdfview"
- ],
- "commit": "bba86a9b9979bd79e9bfaf4a7b472682b9435490",
- "sha256": "1ndd1iw207jnv0mib2r6mxldba4c4nna69wdvj8mzynn6ldxg5bk"
- }
- },
{
"ename": "org-make-toc",
"commit": "df87749128bcfd27ca93a65084a2e88cd9ed5c3f",
@@ -72348,34 +74052,34 @@
"repo": "org-mime/org-mime",
"unstable": {
"version": [
- 20200520,
- 1100
+ 20201105,
+ 2322
],
"deps": [
"cl-lib"
],
- "commit": "9bb6351b25c62835c7881fc64096028eb8ef83ef",
- "sha256": "1h9dv1rw42c4yhdxp2cnxpyv49aklxgljhbw1adl4p7sp4zgrqbd"
+ "commit": "3974bd41902a810d18a787e49f07cddd7849c693",
+ "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj"
},
"stable": {
"version": [
0,
2,
- 0
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3",
- "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q"
+ "commit": "3974bd41902a810d18a787e49f07cddd7849c693",
+ "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj"
}
},
{
"ename": "org-mind-map",
- "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
- "sha256": "0qgh74dzvpkij8xzdgwyd70wnfmjhjbmvqyw0zgkabw7s059yysk",
+ "commit": "402a925e293efc61ab31c888134803cc5c6b1f70",
+ "sha256": "120ybg2pwwpfv71yvk4q1canbr7d73jil0q9crs14qv8ahv0br88",
"fetcher": "github",
- "repo": "the-humanities/org-mind-map",
+ "repo": "the-ted/org-mind-map",
"unstable": {
"version": [
20180826,
@@ -72397,28 +74101,30 @@
"repo": "ndwarshuis/org-ml",
"unstable": {
"version": [
- 20200806,
- 2244
+ 20201207,
+ 638
],
"deps": [
"dash",
+ "org",
"s"
],
- "commit": "e3df332fac6dea0810db0286ef154e917c971c49",
- "sha256": "1pdl13hmvyznvk1k1096pid628rmhfif09bhryla7xjqkczpv25g"
+ "commit": "b644fdcc85090fd83827fb480482681409a3033e",
+ "sha256": "0b5shcqydxdp6hwfpxjcwzlmyhqb3jcmvysgk1kdvzjm5jcqz0y6"
},
"stable": {
"version": [
- 2,
- 0,
+ 5,
+ 4,
1
],
"deps": [
"dash",
+ "org",
"s"
],
- "commit": "c36f8a7f6b15dddcfa9e270a86d48a5e5f2beea3",
- "sha256": "0vv8rk1mn7vhwz5riadg1fdjx5nmvm8h578yb9b85a100nq7av2w"
+ "commit": "66354a0d4a50def2bc88e91a0301fd929a66e00a",
+ "sha256": "1risdrrqnj5fcnpybaqczavwd30dcfk89xd4sb578p8h8fz3hy0f"
}
},
{
@@ -72447,20 +74153,20 @@
"repo": "unhammer/org-mru-clock",
"unstable": {
"version": [
- 20200128,
- 1208
+ 20201019,
+ 824
],
- "commit": "4fb77d9bb876e368e596d18324115cef6c1c71f3",
- "sha256": "02js518d8h2qp8dxmw479gw61bdj3019j183hz6x1nn49ljx000k"
+ "commit": "1c407b6a577f4a995030574d58f76e78da854742",
+ "sha256": "166ac0gnn8zamgzn166skdv4i6hs392wrdi8pmdx5s9wa3b60xy3"
},
"stable": {
"version": [
0,
4,
- 2
+ 4
],
- "commit": "50bf0ec93b3c60eaed7272149bd317bba69a5b6f",
- "sha256": "1ydq2y1zibh9mzfpw598nsci6aw4nsnsjc7wv8xjma7pwkzz8wfd"
+ "commit": "1b19fb0f77dbd519a29997642954dc33fe12b810",
+ "sha256": "1g4hszrmvx41iz6i2m4nr2qhl098gklqg384ir3r1nfw7y5ll29l"
}
},
{
@@ -72471,14 +74177,14 @@
"repo": "jeremy-compostella/org-msg",
"unstable": {
"version": [
- 20200722,
- 2238
+ 20201010,
+ 1531
],
"deps": [
"htmlize"
],
- "commit": "2db6725c4a4f4342a9c61895b7c3c82795b01fee",
- "sha256": "0ijll4fbm0231zig9ia3bpm2padjyj9w0c89nv5aqpilx2fk84v8"
+ "commit": "5f0f1a7a79245646bc1c85757f3277c35d6df007",
+ "sha256": "1c8qa01w3953d858s8r0z60xlvgqxhm0l1svfydl4anghq22wc48"
}
},
{
@@ -72489,8 +74195,8 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20200810,
- 1055
+ 20201203,
+ 847
],
"deps": [
"dash",
@@ -72498,8 +74204,8 @@
"org-ql",
"s"
],
- "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14",
- "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39"
+ "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb",
+ "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls"
},
"stable": {
"version": [
@@ -72607,8 +74313,8 @@
"repo": "fuxialexander/org-pdftools",
"unstable": {
"version": [
- 20200418,
- 929
+ 20200929,
+ 2241
],
"deps": [
"org",
@@ -72616,8 +74322,8 @@
"org-pdftools",
"pdf-tools"
],
- "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505",
- "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08"
+ "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f",
+ "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm"
}
},
{
@@ -72802,16 +74508,16 @@
"repo": "fuxialexander/org-pdftools",
"unstable": {
"version": [
- 20200422,
- 1350
+ 20200929,
+ 2241
],
"deps": [
"org",
"org-noter",
"pdf-tools"
],
- "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505",
- "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08"
+ "commit": "3c2b9a413eb841c781cfb49d8c343bf07aa0ad1f",
+ "sha256": "0hk6dldi7ccymypp6rrf370ccgps27yh6z53nhjbzc9phk1pkslm"
}
},
{
@@ -72927,11 +74633,11 @@
"repo": "marcowahl/org-pretty-tags",
"unstable": {
"version": [
- 20200303,
- 2201
+ 20201110,
+ 1020
],
- "commit": "40fd72f3e701e31813f383fb429d30bb88cee769",
- "sha256": "0d80cbkdq1d8cqc5nv732gzw4k6m2dpjjix3ycfyf27m4wkbwhmc"
+ "commit": "5c7521651b35ae9a7d3add4a66ae8cc176ae1c76",
+ "sha256": "0ksj6hssyr44qnvb32qj9lrq825ivvndhck9gzx4h7gbxmvq12a4"
},
"stable": {
"version": [
@@ -73057,14 +74763,14 @@
},
{
"ename": "org-ql",
- "commit": "4de0a516e002ad0f7475d35258dc4e2d4350696a",
- "sha256": "19mb7yjffi6m4xa70w3dz4kcg8j3vvwkxmvhiid75sslb8jsss3w",
+ "commit": "e95bb45018c2c257e18af7428395dd1020074689",
+ "sha256": "1pd6327jqsaypicaf8zd9hxy8f422n9ww9xg8284281x7cnw61xq",
"fetcher": "github",
"repo": "alphapapa/org-ql",
"unstable": {
"version": [
- 20200713,
- 309
+ 20201204,
+ 414
],
"deps": [
"dash",
@@ -73079,28 +74785,29 @@
"transient",
"ts"
],
- "commit": "6633dbb276d51767c3f401d0f68ef99e7b9364b6",
- "sha256": "0rqhdf9g6n14v1ixwnb3d6jl85zxlarg28fz0jpzzikj4spiy772"
+ "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a",
+ "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l"
},
"stable": {
"version": [
0,
- 4,
- 6
+ 5
],
"deps": [
"dash",
"dash-functional",
"f",
+ "map",
"org",
"org-super-agenda",
"ov",
"peg",
"s",
+ "transient",
"ts"
],
- "commit": "00800556907408ee11a23de3a4982061d08d3b85",
- "sha256": "08xax4fp9rzi8iimkyw2gvp2rd0lgb2f83qrhhnhnc1kgpkdl6y1"
+ "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679",
+ "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn"
}
},
{
@@ -73173,34 +74880,34 @@
},
{
"ename": "org-re-reveal",
- "commit": "c3e6c90a6b9004fbf0fbc08556f8effbcde8b468",
- "sha256": "05p8iml0fapi4yf7ky45kf7m0ksz917lxg7c4pdd9hjkjmz29xn9",
+ "commit": "26e79e7efb378a0c7f816cbd2a517ff9cb7e3fa8",
+ "sha256": "1svgmga905fw8sayxnly5wvk110m6dbg0cv9ggi1ngb0xpm7acgj",
"fetcher": "gitlab",
"repo": "oer/org-re-reveal",
"unstable": {
"version": [
- 20200813,
- 1104
+ 20201114,
+ 622
],
"deps": [
"htmlize",
"org"
],
- "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76",
- "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq"
+ "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1",
+ "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx"
},
"stable": {
"version": [
3,
- 1,
- 0
+ 4,
+ 3
],
"deps": [
"htmlize",
"org"
],
- "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76",
- "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq"
+ "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1",
+ "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx"
}
},
{
@@ -73237,14 +74944,14 @@
},
{
"ename": "org-recent-headings",
- "commit": "668b79c179cbdb77c4049e7c620433255f63d808",
- "sha256": "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa",
+ "commit": "9ac277ed37b6dd8b7c9d31a283442d5365d9e7f9",
+ "sha256": "1r3xs291ahahz4a6zwqqhckayxi9js53mjx5gghjl1zlv9l5ch6g",
"fetcher": "github",
"repo": "alphapapa/org-recent-headings",
"unstable": {
"version": [
- 20200228,
- 215
+ 20201118,
+ 737
],
"deps": [
"dash",
@@ -73253,8 +74960,8 @@
"org",
"s"
],
- "commit": "bb9c96bea63a0ce8c0d18e8b8b4b24085d4c9d89",
- "sha256": "15fa794drfz9vh9jms4ivayys3kf50nry8x06i8v76kn716klv49"
+ "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187",
+ "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y"
},
"stable": {
"version": [
@@ -73311,8 +75018,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20200814,
- 1307
+ 20201126,
+ 1924
],
"deps": [
"dash",
@@ -73326,8 +75033,8 @@
"pdf-tools",
"s"
],
- "commit": "831fe96c242bf178f0c55b93fd076dfb549f7791",
- "sha256": "18r9n6vln65czjvk46r5lbr7d2rd2dpcqrzhs37jffz9qj93cpcc"
+ "commit": "120509c38929cc25d814e9a42092c44cb34ec34e",
+ "sha256": "0l1il3dh4rcw5ylia2ywszmj6fpdfbvmr496scsdw4w0skrjpljw"
},
"stable": {
"version": [
@@ -73382,26 +75089,28 @@
"repo": "akirak/org-reverse-datetree",
"unstable": {
"version": [
- 20200812,
- 1340
+ 20201128,
+ 706
],
"deps": [
- "dash"
+ "dash",
+ "org"
],
- "commit": "e0b04fe953de43bec51dd867d5fe12498099f2b4",
- "sha256": "0r5vkx5la5dvw8vbrmmbxfffxjmhjmzdfbwy6c31lr60p55m5m7d"
+ "commit": "be24274dd62cd3c586cbea99c8f73db251bf319d",
+ "sha256": "1kjydjj2bwrvvckxh1c31gk1h09j876jg7rbyv0jb0kzfim79d2j"
},
"stable": {
"version": [
0,
3,
- 2
+ 5
],
"deps": [
- "dash"
+ "dash",
+ "org"
],
- "commit": "cfb14dc77768ea901fe5a49662ae10ae3ccc7bde",
- "sha256": "05qjj4zfm84s7lmlnq2nndmh76cpnhh62rybdiz2fjsj1ns0zjln"
+ "commit": "b6eda3187ce6cc6ba95b32161c02fe5b64ee355d",
+ "sha256": "11skd1f4399ndcgmnqmzfn9j9z4cakvwkb7inf0w2dpx7dagx53v"
}
},
{
@@ -73427,11 +75136,11 @@
"repo": "unhammer/org-rich-yank",
"unstable": {
"version": [
- 20181120,
- 1354
+ 20201115,
+ 823
],
- "commit": "d2f350c5296cf05d6c84b02762ba44f09a02b4e3",
- "sha256": "0gxb0fnh5gxjmld0hnk5hli0cvdd8gjd27m30bk2b80kwldxlq1z"
+ "commit": "56d698c2614025538f456479c79073ef40399bc3",
+ "sha256": "0l20a8ljpg8bk6hw4py5g9wv6kyv6y4nrc06l1w0lr0l808w5gqd"
},
"stable": {
"version": [
@@ -73451,8 +75160,8 @@
"repo": "org-roam/org-roam",
"unstable": {
"version": [
- 20200818,
- 816
+ 20201128,
+ 1144
],
"deps": [
"dash",
@@ -73462,14 +75171,14 @@
"org",
"s"
],
- "commit": "c33867e6bc282ff0a69d4ef4a020db82604039bb",
- "sha256": "0nklci9ixnkawa0ryffcnxvj7hm4vhklsv7whdynhr9w6aw6f7kq"
+ "commit": "be95b42d32d9707309ab373f1d8182c84db41c5c",
+ "sha256": "17djynwjl11jmgx986f9zr0zd4sanadv6m9q4hg3ll46933mj8jx"
},
"stable": {
"version": [
1,
2,
- 1
+ 3
],
"deps": [
"dash",
@@ -73479,8 +75188,8 @@
"org",
"s"
],
- "commit": "89e9121f26cf03bb7820d257cd9d9106916cd1e9",
- "sha256": "10s7mcyshgj6yva4k1j086xm61k9zck3r586f1maar5b2z6hwvsa"
+ "commit": "cc01cf346e2d832f78694320947e0788c92f49b9",
+ "sha256": "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba"
}
},
{
@@ -73491,28 +75200,28 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20200803,
- 1209
+ 20201207,
+ 741
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "a92d9e6f523f449314e72911ba300192a42fc4dc",
- "sha256": "1np029bspw14lcv8qzzgfyqimjz697wx2isasad06qbnhqbyc84m"
+ "commit": "c002d63fdb5cdb388dc376b14e8c1e599ffcb3b6",
+ "sha256": "0cll1pbpk6jldkv6apxmpzdy6dd9nyh72kbg7w1r4jrjmjzr9wx0"
},
"stable": {
"version": [
0,
- 3,
+ 4,
0
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "ed148cee7d09538664fd22fc6bdf72adbe225617",
- "sha256": "0a7jhpmjkb4d66zakgajs5anr4nrhs94l60x62s5qdxh5dn0m7gh"
+ "commit": "71da772469bcb49d4a93ee9d9704fbee9488aa28",
+ "sha256": "13pll793khyfncpwm2dg24w747sqp7kgf7m3fqw2xzhv9cx2g7nq"
}
},
{
@@ -73523,18 +75232,19 @@
"repo": "org-roam/org-roam-server",
"unstable": {
"version": [
- 20200816,
- 819
+ 20201203,
+ 2002
],
"deps": [
"dash",
+ "f",
"org",
"org-roam",
"s",
"simple-httpd"
],
- "commit": "5ea3d1403bd68af49ac0593a8cdff7514595d025",
- "sha256": "0ajsid9p5znxqz7bq39jbf779s46ymmxwpfki4yxpa9308pwjwgc"
+ "commit": "6cfb8d60abfecd985975f683e48e87d03a0f0212",
+ "sha256": "1rvlmldhvd2vr72j6sh9dn718c99rmzk7wdpra4lvs1x95rbvcp6"
},
"stable": {
"version": [
@@ -73627,8 +75337,8 @@
"org",
"seq"
],
- "commit": "8b5cd196bb37cebd1aa5b02ed189ad7dadd92078",
- "sha256": "1bb9njb8wqw5vm1kl63jqql2q5fmms2v6rhvfywr75iiirakxqzz"
+ "commit": "f7a46bc4bc85305f0c2b72565170ea0e007c42fd",
+ "sha256": "1x37jcfbdmyba3301fbrvmps93ibwcgn6dcqzv39qfsbpr5j0iik"
}
},
{
@@ -73657,11 +75367,11 @@
"repo": "lordnik22/org-shoplist",
"unstable": {
"version": [
- 20200603,
- 1515
+ 20201003,
+ 1235
],
- "commit": "e1e465ef815500140940c3a247d508b8f7dd09c5",
- "sha256": "03a39q495ivxn0bc9wsdl61d2qlxs2w618d5f3lkny9567wcrxgx"
+ "commit": "de2d0ba7a2177921b15468417f1de1b00e076895",
+ "sha256": "14l0212xy0mkp5w6xpl7h59idr7kjrimn67fzrdvxxbqwn7i9nyx"
}
},
{
@@ -73672,8 +75382,8 @@
"repo": "alphapapa/org-sidebar",
"unstable": {
"version": [
- 20200501,
- 1215
+ 20201114,
+ 507
],
"deps": [
"dash",
@@ -73683,14 +75393,14 @@
"org-super-agenda",
"s"
],
- "commit": "6dfa3a2312e8dacc942980e4ab10f1faea922a49",
- "sha256": "0byr4h9dcgv667sn110011lkcnrr327qg7wv7f87hm1gyl613cgp"
+ "commit": "67fe1b5c6c879e14d34c34eec2190e9719046b6c",
+ "sha256": "00danbc1w5wd3gj0sdas26ip3lyxcsapq9ly4kbaprrxbf187b56"
},
"stable": {
"version": [
0,
3,
- 1
+ 2
],
"deps": [
"dash",
@@ -73700,8 +75410,8 @@
"org-super-agenda",
"s"
],
- "commit": "4d8f6fce5ffce8c9b495742998d0ae64bdc5959d",
- "sha256": "0i7dib49yfx48df371rqq16y0yxnc6n331wka532w10ava11g5s3"
+ "commit": "cb14edce5c99f199f28fc611d805ae9fa0d0307e",
+ "sha256": "1r8kp954ciin4j7j7j8ihdkryf5x09s3ryl7bi9h2j6xqc1ij4wq"
}
},
{
@@ -73736,8 +75446,8 @@
"repo": "alhassy/org-special-block-extras",
"unstable": {
"version": [
- 20200502,
- 2057
+ 20201130,
+ 1159
],
"deps": [
"dash",
@@ -73745,8 +75455,8 @@
"org",
"s"
],
- "commit": "38c3a0a2c2f9b99e0426334c7c6a9320cc6e39a5",
- "sha256": "1rp9hyn9bshp4wjqgr8rpgjabyp86f3905ghpf5nnc4w4dfgq9vk"
+ "commit": "90bcb2dbc09854d9599eeba5d503a079e7129bd0",
+ "sha256": "1czkasfmgsf5s2xq1a9xddvn5gbbhk1jgg56wg459n5zqpnz5s8f"
},
"stable": {
"version": [
@@ -73770,14 +75480,30 @@
"repo": "ndwarshuis/org-sql",
"unstable": {
"version": [
- 20200217,
- 2130
+ 20201121,
+ 2021
],
"deps": [
- "dash"
+ "dash",
+ "org-ml",
+ "s"
],
- "commit": "9543ad58bc471abf09705d2615c50c1ead90c660",
- "sha256": "18i4zhk955q13qvascvr8ag6pv2i9s14xfwl2061zjqarx89sxa1"
+ "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8",
+ "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 3
+ ],
+ "deps": [
+ "dash",
+ "org-ml",
+ "s"
+ ],
+ "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8",
+ "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj"
}
},
{
@@ -73788,28 +75514,28 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20200812,
- 1341
+ 20201202,
+ 234
],
"deps": [
"dash",
"dash-functional"
],
- "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511",
- "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x"
+ "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098",
+ "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63"
},
"stable": {
"version": [
0,
2,
- 8
+ 9
],
"deps": [
"dash",
"dash-functional"
],
- "commit": "64ed31f7c012f37219f306a4b232de2767c1911e",
- "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj"
+ "commit": "49237ef8d174a15a594d984438cebe23ffcf54df",
+ "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm"
}
},
{
@@ -73820,28 +75546,28 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20190929,
- 646
+ 20201202,
+ 144
],
"deps": [
"org-starter",
"swiper"
],
- "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511",
- "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x"
+ "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098",
+ "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63"
},
"stable": {
"version": [
0,
2,
- 8
+ 9
],
"deps": [
"org-starter",
"swiper"
],
- "commit": "64ed31f7c012f37219f306a4b232de2767c1911e",
- "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj"
+ "commit": "49237ef8d174a15a594d984438cebe23ffcf54df",
+ "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm"
}
},
{
@@ -73852,11 +75578,11 @@
"repo": "bastibe/org-static-blog",
"unstable": {
"version": [
- 20200720,
- 715
+ 20201123,
+ 1409
],
- "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6",
- "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9"
+ "commit": "b104911cdded2547d5186d1765190857cca2587d",
+ "sha256": "09s519mjgmy5k0n4psf3x4gs5w6k77kpvpqb2s8fjplgf5ymhzm6"
},
"stable": {
"version": [
@@ -73906,8 +75632,8 @@
"repo": "alphapapa/org-super-agenda",
"unstable": {
"version": [
- 20200310,
- 1337
+ 20201121,
+ 941
],
"deps": [
"dash",
@@ -73916,23 +75642,23 @@
"s",
"ts"
],
- "commit": "dd0d104c269fab9ebe5af7009bc1dd2a3a8f3c12",
- "sha256": "0kx9sikk7c3j0zp3a31kj8zv2kjxqjhhl25n7c7nslf2fp5w2d8b"
+ "commit": "ac7f2ef05c161b10390141b6863b431dc9360edc",
+ "sha256": "0n4dg0hhb4nsfh65jm5q1jypxk9dnnm8gzw7gj6bxf4dm9677n99"
},
"stable": {
"version": [
1,
- 1,
- 1
+ 2
],
"deps": [
"dash",
"ht",
"org",
- "s"
+ "s",
+ "ts"
],
- "commit": "9bb6326e269b97673e023ba71fe05cc36bfbb235",
- "sha256": "1ghwap34y4gvwssqv3sfqa8wn9jh6pawc7xnkhm1qxmvs53gxbg6"
+ "commit": "857783ecd3dbe35c72b4eca046e0a5dc64041fdf",
+ "sha256": "10l9h2n09cql4ih7nc0ma3ghdsq9l5v9xlj1lg7kq67icdwjlsvy"
}
},
{
@@ -73949,8 +75675,8 @@
"deps": [
"org"
],
- "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d",
- "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb"
+ "commit": "7f83636db215bf5a10edbfdf11d12a132864a914",
+ "sha256": "086h7fj7k0199m3i01whmqzi4kb4h6ncikdmv6skxs41hzpnjvk4"
},
"stable": {
"version": [
@@ -74072,9 +75798,9 @@
},
{
"ename": "org-tanglesync",
- "commit": "9282e48b725e835fe8dfb226dacbea40257584c1",
- "sha256": "1vyvy5l7bb8v7c190rzi7r1nz7vlq4yj2bskhcw35h6df3zy3j2y",
- "fetcher": "github",
+ "commit": "2db07414d2d39b2d40a2ae91491032844b82d801",
+ "sha256": "11h97qihb3n82jan08fhg5zjh8jqcwjrhf6b933gy6b4h1nwlmdj",
+ "fetcher": "gitlab",
"repo": "mtekman/org-tanglesync.el",
"unstable": {
"version": [
@@ -74085,43 +75811,6 @@
"sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5"
}
},
- {
- "ename": "org-taskforecast",
- "commit": "757def05a6104d8aab2dde9977762bdaef63241a",
- "sha256": "1xbck5kdbfzjw55amjfxsjscmdj7yl3fyrfzgqpdicdih0fas7kz",
- "fetcher": "github",
- "repo": "HKey/org-taskforecast",
- "unstable": {
- "version": [
- 20200817,
- 748
- ],
- "deps": [
- "dash",
- "dash-functional",
- "org-ql",
- "s",
- "transient"
- ],
- "commit": "fc160ce255a98da36c59da4d49a628dd7f742087",
- "sha256": "063myyg4p2qwbvhb8kcgnz15xp48rv8zhcb86kxh51bm92ifwgb0"
- },
- "stable": {
- "version": [
- 0,
- 3,
- 0
- ],
- "deps": [
- "dash",
- "dash-functional",
- "org-ql",
- "s"
- ],
- "commit": "036da7c14e0defb85917293f00a5fa9ac0977da4",
- "sha256": "0lz6c1hq35qw44fllzsrzv9p4r4sjikciyzvi6nyf0fw189b0c4h"
- }
- },
{
"ename": "org-tfl",
"commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf",
@@ -74347,8 +76036,8 @@
20200611,
1143
],
- "commit": "7126a4365072a32898f169ead8fb59265dabc605",
- "sha256": "0lbqq3kzh8pd991c3s76parsl49ci5sclfq3sx0aqbcla0qzvh3y"
+ "commit": "18034c476038adcc1c4697168b8068f4d0ce62fe",
+ "sha256": "0mibyph6db08llgjcpzbrsj75zwrlg8rn2ckyq69c10gkxsq8dkk"
},
"stable": {
"version": [
@@ -74362,9 +76051,9 @@
},
{
"ename": "org-treescope",
- "commit": "f824498a74dcf0b8130baf474841b240adfa07a7",
- "sha256": "13j7xz9i11kga1s0yvdv3k54076llna8vnnp0v8ri5pgbdrmc20w",
- "fetcher": "github",
+ "commit": "2db07414d2d39b2d40a2ae91491032844b82d801",
+ "sha256": "08b17gx9119gfz7mkkjigai0zjj3mj5y054skvvl57vlgd7lygqd",
+ "fetcher": "gitlab",
"repo": "mtekman/org-treescope.el",
"unstable": {
"version": [
@@ -74382,9 +76071,9 @@
},
{
"ename": "org-treeusage",
- "commit": "8868893e4109db9b348a62bc012c89648384994e",
- "sha256": "1vxal0a4k348sqpivvahjlchk7w5a02dkqvxpqgjs1rlbs7vfv90",
- "fetcher": "github",
+ "commit": "1bc0d2314ef383ce6e67688a218debc772cb7725",
+ "sha256": "0v0qma78dgs84y6zq3616wxgjymv1nqqq8kbhhlid5lvj9sl227f",
+ "fetcher": "gitlab",
"repo": "mtekman/org-treeusage.el",
"unstable": {
"version": [
@@ -74445,11 +76134,11 @@
"repo": "cadadr/elisp",
"unstable": {
"version": [
- 20191207,
- 2022
+ 20200919,
+ 1348
],
- "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3",
- "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z"
+ "commit": "e086c59a14701cd041641b51c952fa704ee963df",
+ "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
}
},
{
@@ -74537,8 +76226,8 @@
"repo": "akhramov/org-wild-notifier.el",
"unstable": {
"version": [
- 20200328,
- 1153
+ 20200926,
+ 1502
],
"deps": [
"alert",
@@ -74546,14 +76235,14 @@
"dash",
"dash-functional"
],
- "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1",
- "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns"
+ "commit": "b83d31422abcf9527d5ec0344f2fa2df5b76a357",
+ "sha256": "0cdd93sqx0ijajqa2z91bg6h6m1njsaqzwygr8q28dd2pazxq5xc"
},
"stable": {
"version": [
0,
4,
- 0
+ 1
],
"deps": [
"alert",
@@ -74561,8 +76250,8 @@
"dash",
"dash-functional"
],
- "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1",
- "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns"
+ "commit": "b83d31422abcf9527d5ec0344f2fa2df5b76a357",
+ "sha256": "0cdd93sqx0ijajqa2z91bg6h6m1njsaqzwygr8q28dd2pazxq5xc"
}
},
{
@@ -74573,30 +76262,30 @@
"repo": "marcIhm/org-working-set",
"unstable": {
"version": [
- 20200819,
- 708
+ 20201118,
+ 810
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115",
- "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh"
+ "commit": "cf4bd2bfb11d0e0ed8c9228c07df8eb8150504f4",
+ "sha256": "10ailnbq2hhn8cnw1lcibhm8vgvy1437h48gbwxkk2kf25wpm73p"
},
"stable": {
"version": [
2,
- 3,
- 4
+ 4,
+ 0
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115",
- "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh"
+ "commit": "cf4bd2bfb11d0e0ed8c9228c07df8eb8150504f4",
+ "sha256": "10ailnbq2hhn8cnw1lcibhm8vgvy1437h48gbwxkk2kf25wpm73p"
}
},
{
@@ -74629,8 +76318,8 @@
"repo": "org2blog/org2blog",
"unstable": {
"version": [
- 20200814,
- 543
+ 20200817,
+ 1842
],
"deps": [
"htmlize",
@@ -74638,8 +76327,8 @@
"metaweblog",
"xml-rpc"
],
- "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1",
- "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba"
+ "commit": "c7f72a87952ed16323fce968462af897235f1719",
+ "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4"
},
"stable": {
"version": [
@@ -74795,43 +76484,45 @@
"repo": "kostafey/organic-green-theme",
"unstable": {
"version": [
- 20200717,
- 1937
+ 20201010,
+ 1720
],
- "commit": "01fe614086e31e166d2a2f1d6b34e301f060458e",
- "sha256": "1hsidgcyqsbm96gh0nfrdpnm4vq1sw8777d0zslsczr1fp51il6d"
+ "commit": "debd4305ee29592eb5c2a87e1c78abdd30139043",
+ "sha256": "1si084giyf2r6069nsvyg1gcyx9lk85yzlf0ifjhkw6cv2gkfwgy"
}
},
{
"ename": "organize-imports-java",
- "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
- "sha256": "0j4fpbzmi0mq2f493hwl94b3xmkhdcjscvbgv4dz31rw10bl4q7h",
+ "commit": "e38a261ab64a1ce897d997fcfba6f01e9ad969f0",
+ "sha256": "1m7nqw0mgyjzh0wyqkk6542ibg7d6fx6mgj21gv32js8rcnmkrmv",
"fetcher": "github",
"repo": "jcs-elpa/organize-imports-java",
"unstable": {
"version": [
- 20200717,
- 757
+ 20201105,
+ 540
],
"deps": [
+ "dash",
"f",
"s"
],
- "commit": "c431b338d34c94345217b2b904d9c6f331d4015c",
- "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6"
+ "commit": "95cc282063338daf602200ddc140e3bb01a13c44",
+ "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227"
},
"stable": {
"version": [
0,
- 1,
+ 2,
4
],
"deps": [
+ "dash",
"f",
"s"
],
- "commit": "c431b338d34c94345217b2b904d9c6f331d4015c",
- "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6"
+ "commit": "95cc282063338daf602200ddc140e3bb01a13c44",
+ "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227"
}
},
{
@@ -75005,6 +76696,30 @@
"sha256": "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv"
}
},
+ {
+ "ename": "orgstrap",
+ "commit": "35f53a7b64b1a5c14a6d8b951c809a8696cfcd99",
+ "sha256": "1cjgmibybw24acz5r4zb9jddmng7c0f819h0wl5ih2af2skvpi7k",
+ "fetcher": "github",
+ "repo": "tgbugs/orgstrap",
+ "unstable": {
+ "version": [
+ 20201129,
+ 604
+ ],
+ "commit": "c63c1682de9a10c6d6946978c154f09bb6fa7284",
+ "sha256": "0vp4s8m1rg0q3pd8vdk8ys03dzsibglpkx30hfw10z847fbif85w"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 7
+ ],
+ "commit": "c63c1682de9a10c6d6946978c154f09bb6fa7284",
+ "sha256": "0vp4s8m1rg0q3pd8vdk8ys03dzsibglpkx30hfw10z847fbif85w"
+ }
+ },
{
"ename": "orgtbl-aggregate",
"commit": "bf64b53c9d49718a8ffc39b14c90539b36840280",
@@ -75013,11 +76728,11 @@
"repo": "tbanel/orgaggregate",
"unstable": {
"version": [
- 20200708,
- 2131
+ 20200829,
+ 708
],
- "commit": "99c6bc8c9b72dc9ce886a09540ed24ec83bcc056",
- "sha256": "03q02cxz76wnx20rhwqiysxnskzs7caw428ij3jj4nsmjkhxdfv0"
+ "commit": "bab95388b182c07bc9f0679426514fe7e8c997d9",
+ "sha256": "18qasx17hgfrmzkljjpni4m2lgic3imyksjg6wa7xrjf0y3kwmgw"
}
},
{
@@ -75043,14 +76758,14 @@
"repo": "tbanel/orgtbljoin",
"unstable": {
"version": [
- 20200708,
- 2127
+ 20200825,
+ 640
],
"deps": [
"cl-lib"
],
- "commit": "1aa352a09a2c543352fceb32a505c44e080efcb3",
- "sha256": "0aczwlssnhn1xpgk3s7l2smrxmhb8af6gg9xjdsfysss4ybbcgy6"
+ "commit": "e93e8eaeab2137bc391cf6d0643619ce6b066d19",
+ "sha256": "0rbcdgsb7vzsjiwk5zskv15sf8npxdsbvpzd9r6s7aib83mb5kqa"
}
},
{
@@ -75111,8 +76826,8 @@
"deps": [
"origami"
],
- "commit": "edcba971ba52a14f69a436ad47888827d7927982",
- "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0"
+ "commit": "cc363f4b2fd20021ab330fc989369e2658457f93",
+ "sha256": "0lsr356yq0414fn6wy54fryx9k3zl43x9blnvlif5vbghf0r1axg"
},
"stable": {
"version": [
@@ -75134,14 +76849,14 @@
"repo": "vyorkin/ormolu.el",
"unstable": {
"version": [
- 20200313,
- 1631
+ 20200930,
+ 1406
],
"deps": [
"reformatter"
],
- "commit": "3141f9b65f8a68b4cbd6df4e08c64d98ce3aa3c9",
- "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn"
+ "commit": "c40264fb34affeedd260f5da2f7737baee90a780",
+ "sha256": "1w5xia4f539agf62mlhj8c6hh2zadmncr1dby6m6j2qm3ndqfyvk"
}
},
{
@@ -75167,14 +76882,14 @@
"repo": "atomontage/osa-chrome",
"unstable": {
"version": [
- 20200627,
- 1344
+ 20201122,
+ 1639
],
"deps": [
"osa"
],
- "commit": "07894b9cb40171702b4c89b75542af1f1ac1403c",
- "sha256": "0brhn6qlminzamwl90ynaik03xvaw3rlkdccdyxfpckjd5npa9wr"
+ "commit": "9148e21cf2e91b357f5ea3a349975e8b89c8d5e4",
+ "sha256": "03y0c3yfaqlw4m1k5aya32s8bxmqs3h8lii04pkg7mcw09iyqzn8"
}
},
{
@@ -75325,8 +77040,8 @@
20200212,
1724
],
- "commit": "7e717532c78a97eb77b79e2985cea0b201117ff8",
- "sha256": "129874d3g5c1dim6gmx1fllx22rfjg4zdvgdmfpm37l1n8hyzccn"
+ "commit": "46d52aa186ea50a35c1780977bf0aa261bd53922",
+ "sha256": "14786js8zl2yy0f3gbhh980wzsc3lmiga2w6fls36gmgdxsgrqym"
},
"stable": {
"version": [
@@ -75440,20 +77155,20 @@
"repo": "tarsius/outline-minor-faces",
"unstable": {
"version": [
- 20200720,
- 1954
+ 20201031,
+ 1318
],
- "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e",
- "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas"
+ "commit": "a34602b59063dd22ca6877466b85b2728f03c242",
+ "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb"
},
"stable": {
"version": [
0,
2,
- 1
+ 3
],
- "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e",
- "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas"
+ "commit": "a34602b59063dd22ca6877466b85b2728f03c242",
+ "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb"
}
},
{
@@ -75886,14 +77601,14 @@
"repo": "kaushalmodi/ox-hugo",
"unstable": {
"version": [
- 20200722,
- 1939
+ 20201111,
+ 1638
],
"deps": [
"org"
],
- "commit": "75b849e9561c4a6022babf6eaf0e037310ded7c1",
- "sha256": "1xsxljf99h2pyvpp9gvma6g42q1n2xmhnwvpmciwj5rajw5xqc5v"
+ "commit": "f24c9bd522ae22bee2327c2b53858d0a5066707d",
+ "sha256": "1f48j4zpcamdcxjrz7mcrlavmn4qmnnwf871h0qw3v2ad8nk4jpk"
},
"stable": {
"version": [
@@ -75982,14 +77697,14 @@
"repo": "stig/ox-jira.el",
"unstable": {
"version": [
- 20200616,
- 2310
+ 20201202,
+ 1658
],
"deps": [
"org"
],
- "commit": "e9a47ef51862f11a5c006cf9e8c5f4ec5517aced",
- "sha256": "1ws3myl2z6vv3idq28m8q97zlrmsfg5z3i8y3adsbm56ga9jqvdj"
+ "commit": "0bd966ba241a2458d5097e256543eceee50d462c",
+ "sha256": "1a1cwq8gaq3q6g7lfm2finz4srla5iyg8s81k2991fz2fh1iir9k"
}
},
{
@@ -76007,8 +77722,8 @@
"org",
"s"
],
- "commit": "8ce0fae6e8b596b93e05dd512be13973cb3cfa54",
- "sha256": "1fwwvp4jvdx8namdy0nb68c2jj3nfw7adwp7vk2c2b5cp6fc6cl7"
+ "commit": "11609b0a4125d1cc6a1149748eeddeeff4e5df63",
+ "sha256": "0kkv0g1dg0wyygi098667rip0778pd00xd6mafm4rgc6bdjhxz9i"
},
"stable": {
"version": [
@@ -76059,15 +77774,16 @@
"repo": "zzamboni/ox-leanpub",
"unstable": {
"version": [
- 20200818,
- 1116
+ 20201129,
+ 2027
],
"deps": [
"org",
- "ox-gfm"
+ "ox-gfm",
+ "s"
],
- "commit": "8c8d026aa3a31cb6dcd2530ac5902e551b161343",
- "sha256": "0i88bzcczvhsylcbk7nwx19gn6ydiw8vrgwl2p5njm10vngrjlny"
+ "commit": "8a00843a2a58e0c43cb53080d1005c619e4a9c88",
+ "sha256": "1kk13mj8bn6kvck95j7wx41maip4b9kpwdln00m5rj6z3d51nrly"
}
},
{
@@ -76201,14 +77917,37 @@
"repo": "0x60df/ox-qmd",
"unstable": {
"version": [
- 20200813,
- 408
+ 20201205,
+ 721
],
"deps": [
"org"
],
- "commit": "8c3d8ce2a21044fc85e5e4e06be0220900d7ba4f",
- "sha256": "1j6zmjy3s2l2wj500q9i75xd3hf8wlh04ycmmad45swrkgp70f2s"
+ "commit": "de78970b85dfd342b49f9956f350c6f7d0a13050",
+ "sha256": "1fggy2b6yklgm66zmyqcmib0aklilh99f51vxyifrhjlsrvinz1v"
+ }
+ },
+ {
+ "ename": "ox-report",
+ "commit": "17e401f8ebb478e0a77fa64f65a700185e0f3648",
+ "sha256": "049dbyf07xy3vzmrs9ihwxsyxj21763xlilh72zr457z0c57rbid",
+ "fetcher": "github",
+ "repo": "DarkBuffalo/ox-report",
+ "unstable": {
+ "version": [
+ 20201208,
+ 1749
+ ],
+ "commit": "e153f4ff541fead4bce9d59820e7929debd0ce11",
+ "sha256": "1dmqaid08vhw4x1yapisqzga97nmvnbp9wnb6wd5kpmvyxwcamwn"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "commit": "ebd57eda69466735d7fc8f52831490176e1f144b",
+ "sha256": "1xhyvc1v5hdgki2sbdpajhhq8ydgym5q1cywcaxwbbmpjxi5sd64"
}
},
{
@@ -76219,14 +77958,14 @@
"repo": "yjwen/org-reveal",
"unstable": {
"version": [
- 20200802,
- 710
+ 20201025,
+ 952
],
"deps": [
"org"
],
- "commit": "553e1a9d678e74c2646e4c19bd9f6c08d8a00486",
- "sha256": "18khlffdmg88pd50vwg00vz143ysqhkdkvva9h4bkw618inz70wq"
+ "commit": "6542658d67965a24c0641845ca7cc0759c4a1fd2",
+ "sha256": "01c4q0hlr67kmxr0x53ic3dzfh5fmydri6hp14qr396jfbfw39z1"
}
},
{
@@ -76332,6 +78071,21 @@
"sha256": "1gm8wwpsq10cfppzl104g3x2g9bha1209p2n8mj9azv71b9mszqx"
}
},
+ {
+ "ename": "ox-ssh",
+ "commit": "6ec996a2c28b8fa2fd818befd18ff431ec1f79c1",
+ "sha256": "1vhf24v0ilgarwgsy82wvhzch2gklcfynmmwjv0qg8jd4hwakblj",
+ "fetcher": "github",
+ "repo": "dantecatalfamo/ox-ssh",
+ "unstable": {
+ "version": [
+ 20201017,
+ 2209
+ ],
+ "commit": "27f311382c6bc9192c6771f219d176836bd23286",
+ "sha256": "0vsk50d969yipywpc0imjsaj5d4d3x070klxpqccawziy60qdppf"
+ }
+ },
{
"ename": "ox-textile",
"commit": "02a68a7a99ecce8f1afa03e72ff1f636edaf5868",
@@ -76358,15 +78112,14 @@
"repo": "dfeich/org8-wikiexporters",
"unstable": {
"version": [
- 20180626,
- 2052
+ 20200927,
+ 857
],
"deps": [
- "cl-lib",
"org"
],
- "commit": "99d0c25d56dbf75ce894a84e776ba4459208dbc2",
- "sha256": "1812sp7z4241da1mfg4wxm1wcax59cqyy2n0xfd67a1mphihsniz"
+ "commit": "3377d8732aa916e736ce5822c7a9a4fbdc894e37",
+ "sha256": "05133n998sp3qymhrz6sarjc7ypzjiwpvpcgilq6z8i4sl2ip98q"
}
},
{
@@ -76437,15 +78190,14 @@
"repo": "dfeich/org8-wikiexporters",
"unstable": {
"version": [
- 20170803,
- 2039
+ 20200927,
+ 857
],
"deps": [
- "cl-lib",
"org"
],
- "commit": "99d0c25d56dbf75ce894a84e776ba4459208dbc2",
- "sha256": "1812sp7z4241da1mfg4wxm1wcax59cqyy2n0xfd67a1mphihsniz"
+ "commit": "3377d8732aa916e736ce5822c7a9a4fbdc894e37",
+ "sha256": "05133n998sp3qymhrz6sarjc7ypzjiwpvpcgilq6z8i4sl2ip98q"
}
},
{
@@ -76478,6 +78230,24 @@
"sha256": "05813w4adafm596x1rikvc7xqk10xwfihdpdq1zr2zyqcpdabqza"
}
},
+ {
+ "ename": "ox-zenn",
+ "commit": "30a54915cf91b47230ddf66ad2e5e17c36fb5e7d",
+ "sha256": "1lsvq5av234dbm88bw4jlj1vxmm3jd8hnzf8vv7q675qcxgpnz5j",
+ "fetcher": "github",
+ "repo": "conao3/ox-zenn.el",
+ "unstable": {
+ "version": [
+ 20200924,
+ 1607
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "b53bd82116c9f7dbb5b476d2cfcc8ed0f3bc9c78",
+ "sha256": "1n57bzsp73g5iqdnhc4jhsylif93h4kkl7zgqi1i9b8bi90sqrl1"
+ }
+ },
{
"ename": "p4",
"commit": "a7e2fa7af647e0dbf5ade5c32d1984b133156b6f",
@@ -76524,14 +78294,14 @@
"repo": "UndeadKernel/pacfiles-mode",
"unstable": {
"version": [
- 20200418,
- 1806
+ 20200915,
+ 1815
],
"deps": [
"cl-lib"
],
- "commit": "222ae3f540cddee306067c83451cfece1112c09e",
- "sha256": "1ps6blv2jhm4i2gr1fbsr1lii9cpr99prhwnxvhxxxy08c9b6mrx"
+ "commit": "8d06f64abc98c3f3338560c8d6eb47719e034069",
+ "sha256": "177v9mb2clwymnq9v6b9qza9d7rsd78mvx13hyc9cpbjnlalpjzc"
},
"stable": {
"version": [
@@ -76583,20 +78353,20 @@
"repo": "zenspider/package",
"unstable": {
"version": [
- 20190702,
- 253
+ 20201206,
+ 446
],
- "commit": "3d108ff6af00d2fe978787217a13660af057cafc",
- "sha256": "1ssrm6qafy0a49lpnqfs9va56m0mympavwr8rv5fyzrj97vqiabp"
+ "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d",
+ "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng"
},
"stable": {
"version": [
1,
- 1,
- 0
+ 2,
+ 1
],
- "commit": "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b",
- "sha256": "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97"
+ "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d",
+ "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng"
}
},
{
@@ -76607,14 +78377,14 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20200601,
- 1939
+ 20201206,
+ 2137
],
"deps": [
"cl-lib"
],
- "commit": "4cb0f98a21729f9ef0189f095384555c9d2b6fe4",
- "sha256": "0ij6p7i5x0fs0yn8zxcx7gf9ldanflh7mj7mblr8snpgbzx3jwnz"
+ "commit": "2807a0a434616c4c7a7039316f7b1e3a352c0c58",
+ "sha256": "0msl4vkxv7hl3k1ffy4j8g93zm8ba7wn81gbm8s6b1ggzyy4pk1s"
},
"stable": {
"version": [
@@ -76651,15 +78421,15 @@
"repo": "purcell/package-lint",
"unstable": {
"version": [
- 20200816,
- 24
+ 20200906,
+ 512
],
"deps": [
"cl-lib",
"let-alist"
],
- "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6",
- "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6"
+ "commit": "05596996286089acc7693b700c7c31780439e39f",
+ "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x"
},
"stable": {
"version": [
@@ -76688,8 +78458,8 @@
"deps": [
"package-lint"
],
- "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6",
- "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6"
+ "commit": "05596996286089acc7693b700c7c31780439e39f",
+ "sha256": "09ngfyh3l6shqmxzaaidr73r2j7am9il6wimvc4w1lbfvfxdjq7x"
},
"stable": {
"version": [
@@ -76771,20 +78541,20 @@
"repo": "emacscollective/packed",
"unstable": {
"version": [
- 20180318,
- 1729
+ 20201120,
+ 2047
],
- "commit": "c41c3dfda86ae33832ffc146923e2a4675cbacfa",
- "sha256": "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"
+ "commit": "3b96dedb404f614479c1b321fac3e4bf11ba0782",
+ "sha256": "0fbv8ryxjz1ndfv4ximmr5m1rd9xkmi8dp0x14r8g5wiy9959asb"
},
"stable": {
"version": [
3,
0,
- 0
+ 2
],
- "commit": "c41c3dfda86ae33832ffc146923e2a4675cbacfa",
- "sha256": "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v"
+ "commit": "3b96dedb404f614479c1b321fac3e4bf11ba0782",
+ "sha256": "0fbv8ryxjz1ndfv4ximmr5m1rd9xkmi8dp0x14r8g5wiy9959asb"
}
},
{
@@ -76858,8 +78628,8 @@
20200305,
244
],
- "commit": "f8c4cd7fc67638ae4113551dcffdf87fcd252d9b",
- "sha256": "1jh7mdry3ysgl9dvrrbx7b9f5dh4bm6gccibpcdnm9pgpfj2bm29"
+ "commit": "34cd91d841e5334c6966e25fbfd971a2dfbcee69",
+ "sha256": "0lakwlr9azqkxbh38vak2299m88073ylmza7vjfhdzr9dy1cnxq0"
},
"stable": {
"version": [
@@ -76962,16 +78732,16 @@
"repo": "abo-abo/pamparam",
"unstable": {
"version": [
- 20200410,
- 1155
+ 20201201,
+ 1621
],
"deps": [
"hydra",
"lispy",
"worf"
],
- "commit": "f9d83bbf5eb883bce6873dd6fd97484b6805215c",
- "sha256": "0av69k6psrpmyadm2r0frwdbqyvpa4flzkrmi88w0vx3g0cxiv2k"
+ "commit": "aab22e32fcdc8e83fecbe248bb35f4583739f955",
+ "sha256": "1kdv5gj2ddiwzy79k4hszc5i3110171bs23vlajq9y31cszjn8jz"
}
},
{
@@ -76985,8 +78755,8 @@
20200715,
338
],
- "commit": "6508ac3228975c39d10a1caa70b9ce34ff3ed21d",
- "sha256": "019nigy5yh1qrzw0agp2kgjfpfm503fgkj07c9m2xqs9hww781x1"
+ "commit": "44beb80ac991e58231c05dc4afa1646fa768d573",
+ "sha256": "17x0ayf894gnm7kkm5bp64h9bfigr6shjm8y7pi91vk0xij3l7jx"
}
},
{
@@ -77044,28 +78814,28 @@
"repo": "joostkremers/pandoc-mode",
"unstable": {
"version": [
- 20200303,
- 2322
+ 20201120,
+ 2241
],
"deps": [
"dash",
"hydra"
],
- "commit": "befd7be704d6dbe3dba69da761fc62e0609c9366",
- "sha256": "0c621viqjss1ynzgcb81afck9rl1lwadzq68vas4gb2zjb5dd06h"
+ "commit": "0630a112ae7d3eab1a4c47c7ef380915560a6bb2",
+ "sha256": "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y"
},
"stable": {
"version": [
2,
- 27,
- 2
+ 30,
+ 1
],
"deps": [
"dash",
"hydra"
],
- "commit": "7b9a19d8777a21431a819281a14201bfdf1dfdc1",
- "sha256": "04bqc7mhgkfks3nsvimd3rrriv4nqbksmv5ahlbbd03aqa2b0vrv"
+ "commit": "0630a112ae7d3eab1a4c47c7ef380915560a6bb2",
+ "sha256": "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y"
}
},
{
@@ -77102,8 +78872,8 @@
20200510,
5
],
- "commit": "61a14d1a8c17930caca5c5daf893cedc9c23c5f3",
- "sha256": "0acq8d8vlx3hd405wmi5w36gg88bz1c1crmlxbd2whgi8kyf506z"
+ "commit": "e086c59a14701cd041641b51c952fa704ee963df",
+ "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
}
},
{
@@ -77114,16 +78884,16 @@
"repo": "atgreen/paperless",
"unstable": {
"version": [
- 20180224,
- 1245
+ 20201130,
+ 1241
],
"deps": [
"cl-lib",
"f",
"s"
],
- "commit": "b3b6c05da393f6b1292a3d5937bc4499baabd0b6",
- "sha256": "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70"
+ "commit": "2db39586a2914f78f345379511d0e8cea4c96b86",
+ "sha256": "03ckcbhpiys3p0jambrlcapba6sv7jn101kikvj2jp66vygdnsn0"
}
},
{
@@ -77170,23 +78940,26 @@
"repo": "ajgrf/parchment",
"unstable": {
"version": [
- 20200812,
- 1259
+ 20200910,
+ 2310
],
"deps": [
"autothemer"
],
- "commit": "271ab4b7d023d730e3d684a1505cc77e2d0cc14a",
- "sha256": "138n4fs33cv2ly89cvs7lkh372kghldhw8pw18zsi39qfvggw6wm"
+ "commit": "95e8248edbdb01fedc7db4472bcce90d2d872106",
+ "sha256": "13rcajw03sbddks5wgzznvrz7ibd7m0jx8mcw1amfk97ghs57h7s"
},
"stable": {
"version": [
0,
- 3,
+ 4,
0
],
- "commit": "b4dabed7939f8cf052c858ba29e295eee3f0ca13",
- "sha256": "0361621f0xg786dvcw6xrfm9qkjr19cs8dkxgj8b5nq9isxyknh5"
+ "deps": [
+ "autothemer"
+ ],
+ "commit": "c90665145573f5e314ede1b7df3bb732e30f4bcd",
+ "sha256": "0n6biizy3hs5xcj678ajdndjvm2kpfcg0pd73g21src6f2i45636"
}
},
{
@@ -77328,15 +79101,15 @@
"repo": "DogLooksGood/parinfer-mode",
"unstable": {
"version": [
- 20180904,
- 844
+ 20201021,
+ 254
],
"deps": [
"cl-lib",
"dash"
],
- "commit": "eaad857ae4351f72a561ee3dec8943713510003f",
- "sha256": "1yjq2ddqmsl9jfy4qggwk5f8602ybvsx5qd544whm2b5xm0c5z9y"
+ "commit": "91856b9c5817ead97aa034fe108c4a6e884802b2",
+ "sha256": "0l16x34af9y60n6502iihl9nz1w4kq8hx1dipi6xa16kr5gs8ba6"
},
"stable": {
"version": [
@@ -77360,20 +79133,20 @@
"repo": "justinbarclay/parinfer-rust-mode",
"unstable": {
"version": [
- 20200802,
- 2026
+ 20201124,
+ 616
],
- "commit": "9e2e91cf1697582a396a5365f24d74634acfc744",
- "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn"
+ "commit": "ca9e7b6f8c3c70daf6a933952955b6931a24af83",
+ "sha256": "17gf7ahvplgr7x3afpdm5zh8w8y45vzjcyb4jg8vn67grq3kij74"
},
"stable": {
"version": [
0,
8,
- 1
+ 2
],
- "commit": "9e2e91cf1697582a396a5365f24d74634acfc744",
- "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn"
+ "commit": "0953765ec361c1c0d6f36eb3c5dd706752af2482",
+ "sha256": "1d9885l1aifrdrg6c4m2kakhs3bbmfmsm02q96j0k0mzzwr7rs41"
}
},
{
@@ -77423,26 +79196,26 @@
"repo": "jcs-elpa/parse-it",
"unstable": {
"version": [
- 20200720,
- 1047
+ 20201103,
+ 1107
],
"deps": [
"s"
],
- "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3",
- "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a"
+ "commit": "580713c0c578f6c91f6851ae2120e8a9b7871bb0",
+ "sha256": "0c61gyks581xx47a4lrdjx64d1x1py7qmzsxklvwlcx0gq6pzalm"
},
"stable": {
"version": [
0,
- 1,
- 8
+ 2,
+ 0
],
"deps": [
"s"
],
- "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3",
- "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a"
+ "commit": "580713c0c578f6c91f6851ae2120e8a9b7871bb0",
+ "sha256": "0c61gyks581xx47a4lrdjx64d1x1py7qmzsxklvwlcx0gq6pzalm"
}
},
{
@@ -77507,26 +79280,26 @@
"repo": "clojure-emacs/parseclj",
"unstable": {
"version": [
- 20190531,
- 711
+ 20201012,
+ 712
],
"deps": [
"a"
],
- "commit": "b34d3e13a249d4b92f1a008cdc1df20a92f866c5",
- "sha256": "1bnlqkmpqpnmmsyhx49mryhkrkaq6v68x7a4kg2pn19ycf9xz6ds"
+ "commit": "eff941126859bc9e949eae5cd6c2592e731629f2",
+ "sha256": "0fr8giy750nr2mzl61sk0z2c7544q2pyglj4xwz1gk3gxm1b4jay"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
"deps": [
"a"
],
- "commit": "93a0f43529598984835f88e64b62fa68bebda89b",
- "sha256": "03bm5dm4hmkqimv4wqxjjh5814pxysmm7z54bv2rf7zwv1x7dggr"
+ "commit": "1bb3800f8f2417b0b881f57448ccb4acd1fe5b8d",
+ "sha256": "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb"
}
},
{
@@ -77544,21 +79317,21 @@
"a",
"parseclj"
],
- "commit": "92bf875962e62f8c6370b56991d546f122536c6b",
- "sha256": "0xli6cf0fzydnd683v3hk5kfsbxwh83s916fd64j8ak0wzjnlsfr"
+ "commit": "90cfe3df51b96f85e346f336c0a0ee6bf7fee508",
+ "sha256": "0fhmxj8qjhpqzmj07phf1njkjryc6d2qqqcl4f515b6hly1l41kz"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
"deps": [
"a",
"parseclj"
],
- "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569",
- "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc"
+ "commit": "d25ebc5554c467b1501f1655204ed419e00ca720",
+ "sha256": "0271amhw63650rrzikcyqxa8sb42npnk7q3yrsay2v79wbqkdaw9"
}
},
{
@@ -77647,11 +79420,11 @@
"repo": "zargener/emacs-password-genarator",
"unstable": {
"version": [
- 20150222,
- 2040
+ 20201123,
+ 1610
],
- "commit": "904cdb591a04305ba882ce19e1d117f5fa60f7d3",
- "sha256": "1qgvn79qz1h8ykm5i1qv2fja4v2y0g2i0n5sf7byhnqhqlwn63nv"
+ "commit": "d754391d11d1d384833eb82fd34e02d2baec36cb",
+ "sha256": "1658mzzdk012rwn049dxzrqp1k4vfbvrsksnh06zdn8m6n7xqi28"
}
},
{
@@ -77685,8 +79458,8 @@
"s",
"with-editor"
],
- "commit": "06f499994071bb6131244218b25d637103afe1d5",
- "sha256": "05w0jkl7m55h30szvgknbwg7xayilk4bh3nf70hrsy3czisxmccx"
+ "commit": "f152064da9832d6d3d2b4e75f43f63bf2d50716f",
+ "sha256": "0qxzqiljiqxzi1jlgm0c5f1pjz1jnnhq74lm0x9q68cim1vch48n"
},
"stable": {
"version": [
@@ -77979,11 +79752,11 @@
"repo": "ibukanov/pc-bufsw",
"unstable": {
"version": [
- 20191014,
- 848
+ 20201011,
+ 1918
],
- "commit": "a7c7bba4b7d511eceaaa8fee34d598296402555b",
- "sha256": "0n6ijz86j88jq7w38yfamrqkjx8s1zbw1c0sa3dhpkv1jg87avb1"
+ "commit": "a7295e4813d636d5a20605d134acd42e4e4fe8fa",
+ "sha256": "0xsjvsmp1qybpcxv1r4pk90g02sc6y23a0c4768xhfx7f50dx8r5"
}
},
{
@@ -78069,11 +79842,11 @@
"repo": "zwild/pcmpl-homebrew",
"unstable": {
"version": [
- 20190213,
- 318
+ 20200911,
+ 742
],
- "commit": "39f2e8faf4d866410a625bbcf88f2504940c8982",
- "sha256": "0p5iynpg9c7zw7717m2mj1lmzcawc8sz4r2di3f8jc8qkng3avns"
+ "commit": "a2044042dd498abad1dc06162a8ee0d70314ca40",
+ "sha256": "1x0hc6n710199aygqch9nh55dsic2sdl7nnncs4h2s0dd91bnz6g"
}
},
{
@@ -78356,8 +80129,8 @@
"deps": [
"csv"
],
- "commit": "263d6d940d7e4203bbecda46dbaa89b7af1db54f",
- "sha256": "1jw27asnfd48mx3mi9qiihvj2hgzpmk53xdq87ajq9nsx8m6x110"
+ "commit": "c72c4a6f1e47ed5fe5103e0eaadad5a76deeec30",
+ "sha256": "0jahf914qmvlk0xjka9dy7n19smndjnybjl26pbgf7lvd8lxzyb0"
}
},
{
@@ -78431,20 +80204,20 @@
"repo": "Fanael/persistent-scratch",
"unstable": {
"version": [
- 20190922,
- 1046
+ 20200921,
+ 2309
],
- "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7",
- "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq"
+ "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932",
+ "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh"
},
"stable": {
"version": [
0,
3,
- 4
+ 5
],
- "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7",
- "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq"
+ "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932",
+ "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh"
}
},
{
@@ -78519,11 +80292,11 @@
"repo": "Bad-ptr/persp-mode.el",
"unstable": {
"version": [
- 20200617,
- 2154
+ 20201128,
+ 2015
],
- "commit": "14325c11f7a347717d7c3780f29b24a38c68fbfc",
- "sha256": "1kb5v7pl2vhx6zdwf9kip38qjk8nkd9xpgdy74q8p3c56ap9lg6g"
+ "commit": "298df111f081b5925f0aa0126a1b8d334117e0a2",
+ "sha256": "0r2j8zs6hwpfvwd6av35izlyd3kplnvc4c941vjjq7sm6j95q6k8"
},
"stable": {
"version": [
@@ -78597,25 +80370,25 @@
"repo": "nex3/perspective-el",
"unstable": {
"version": [
- 20200814,
- 554
+ 20201203,
+ 633
],
"deps": [
"cl-lib"
],
- "commit": "74e811ccbada09dd9a3d90b983e78d146542121b",
- "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x"
+ "commit": "7d747f50464e5c518bc6963e66d6d378ac3e9add",
+ "sha256": "1y4mjbhig9x0xy7xvd16spgzzrj7jm6izfj04q4d5gv41xpqxfy3"
},
"stable": {
"version": [
2,
- 10
+ 13
],
"deps": [
"cl-lib"
],
- "commit": "74e811ccbada09dd9a3d90b983e78d146542121b",
- "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x"
+ "commit": "1eb46847ea563e213e21e65ec65892e37aeda577",
+ "sha256": "17ldps10ap0yz3z9smdf4cr35xw3wscmqphad8d9ddd2jbqin6xg"
}
},
{
@@ -78806,14 +80579,14 @@
"repo": "zk-phi/phi-autopair",
"unstable": {
"version": [
- 20200816,
- 535
+ 20200914,
+ 355
],
"deps": [
"paredit"
],
- "commit": "3e78793f9c480adf79b12d441fae5571e97b9e5f",
- "sha256": "003dnixrnn7qcm25dbibc4rc8yrqsj9jci9rxp9l7ci6ya1bi0i2"
+ "commit": "8bebd5d3018746812847b6c47ab7c79a36382e7c",
+ "sha256": "1mf5blmws9kc3h4d9iy7r38w6kvi5w2gvmlbrxlwmh95a3y1n3nz"
}
},
{
@@ -78842,11 +80615,11 @@
"repo": "zk-phi/phi-rectangle",
"unstable": {
"version": [
- 20200816,
- 650
+ 20200911,
+ 204
],
- "commit": "4ea8b40a614c1cc9087b9c0bd924a2d9d6cc0a83",
- "sha256": "1ajjdpx4xbgig11380lyy10gqfmp23k5zwb77pwdl1rhapsdpjp8"
+ "commit": "43ee8aea9998b34a9fdb28d7da2e4f75e4154030",
+ "sha256": "1kjvhpbwakcxhkmninasr0waziyclr13iwfyl2cg8yihk5xnakji"
}
},
{
@@ -78858,10 +80631,10 @@
"unstable": {
"version": [
20200510,
- 905
+ 906
],
- "commit": "f567f048b3892062c5528b42d4f6af4b313721a3",
- "sha256": "15yc5nlfx2z48n8p7pb6qzgbzfpnapb83w5xx6z8lq0mywf3k5jj"
+ "commit": "c34f5800968922d1f9e7b10092b8705d6640ad18",
+ "sha256": "1ss2ywx93wm372fvgc9vp4h8xkjbpl5i4268r7556n4zwk5nngf5"
},
"stable": {
"version": [
@@ -79044,14 +80817,14 @@
"repo": "OVYA/php-cs-fixer",
"unstable": {
"version": [
- 20200312,
- 1309
+ 20201126,
+ 1538
],
"deps": [
"cl-lib"
],
- "commit": "95eace9bc0ace128d5166e303c76df2b778c4ddb",
- "sha256": "1pl6zw1m8n3ir48h58gaq2f474w9j20a6gk4r0cq5vgvzxx25f0h"
+ "commit": "c5b5d8a4986b31bade5e2a57131469bf90630db8",
+ "sha256": "0v6nhyrkcb4nw1b0d30wlns0f82h5a8i7wf5jsb0wjlbqgxabx4b"
},
"stable": {
"version": [
@@ -79088,11 +80861,11 @@
"repo": "emacs-php/php-mode",
"unstable": {
"version": [
- 20200812,
- 1129
+ 20201120,
+ 1807
],
- "commit": "f4c7c6995dadcdc6da5fefadfd362f8418b2eec1",
- "sha256": "0vg8xzpm4lbahlldgfsc63wfans3wx0nfkm2x2k3qkgp9r7wbh38"
+ "commit": "7e5722c8854d7465c93765653e6ec0897fb7cc7b",
+ "sha256": "0f4i76rbrhgmq4ba7r560yj0xnlmhv46inlp83bwl7cbcy1r679n"
},
"stable": {
"version": [
@@ -79112,20 +80885,20 @@
"repo": "vpxyz/php-quickhelp",
"unstable": {
"version": [
- 20200818,
- 1944
+ 20201108,
+ 1132
],
- "commit": "f1d79fbed01b667495f64438687f1fbd6bf486c6",
- "sha256": "0lnjd0ris288ia6i2wvw30yg57fmh5xgq1dln243s57yvm1wccfd"
+ "commit": "e36fc61a7061044ab7984421997566b97776f722",
+ "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2"
},
"stable": {
"version": [
0,
- 3,
- 4
+ 5,
+ 1
],
- "commit": "325668a47127bee77f094ed2b09171b8656c7429",
- "sha256": "16cm754r1cg1rb6blfqcja41klr4hy90gkhg6p9p79qgxjrnbbbd"
+ "commit": "e36fc61a7061044ab7984421997566b97776f722",
+ "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2"
}
},
{
@@ -79185,15 +80958,15 @@
"repo": "mallt/php-scratch",
"unstable": {
"version": [
- 20161103,
- 2217
+ 20201108,
+ 750
],
"deps": [
"php-mode",
"s"
],
- "commit": "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d",
- "sha256": "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"
+ "commit": "a9db3986144fff424c93228a613f54734ef993a8",
+ "sha256": "01fkpcxmv98wklzf8vbs6l3kljdmwzclv5m73czzbgk5s3rwc8vb"
}
},
{
@@ -79268,14 +81041,14 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20200807,
- 1101
+ 20201122,
+ 950
],
"deps": [
"php-mode"
],
- "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
- "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
+ "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a",
+ "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh"
},
"stable": {
"version": [
@@ -79366,11 +81139,11 @@
"repo": "agrif/pianobar.el",
"unstable": {
"version": [
- 20180417,
- 104
+ 20201002,
+ 1756
],
- "commit": "3154c4cb7401017fd441fcd6a7a0b669a4406882",
- "sha256": "0dy51pi85i8ag47zmnhppllsbmxd0bp704azffddkg36pjh4inxk"
+ "commit": "d708417608df4f09ee565fddaad03dfe181829a8",
+ "sha256": "008qmhg88n3kxhyvzsmf265c7ac6d48fjlxpp6v3p3mbxg6l6xx6"
}
},
{
@@ -79608,8 +81381,8 @@
"deps": [
"cl-lib"
],
- "commit": "a325e790e9dd7c5028c4c8d110b08e9d78227382",
- "sha256": "0f715zsg6j9y22w55gjv7wk90660zzpv4bilc2mi69dv534d9qv9"
+ "commit": "e5508e5aa1ad4cfa05a7f4d299e5a155b288ec4c",
+ "sha256": "1bzs6i88b5d7bk9pg2q654kvbychz27rl1srhkq9lvqx91g8zbz2"
}
},
{
@@ -79647,11 +81420,11 @@
"repo": "cute-jumper/pinyinlib.el",
"unstable": {
"version": [
- 20170827,
- 2142
+ 20200911,
+ 1723
],
- "commit": "45f05d3dbb4fe957f7ab332ca6f94675848b6aa3",
- "sha256": "0pmgb4y06dbffs4442aa92vn8ydwl45zqwzxzwhk6md1318fppvd"
+ "commit": "1772c79b6f319b26b6a394a8dda065be3ea4498d",
+ "sha256": "1lmw0hf6cjbvpsyjx686za74kwgz5bap7z1b49jgsimgrn5c20s4"
},
"stable": {
"version": [
@@ -79700,16 +81473,16 @@
"repo": "pwalsh/pipenv.el",
"unstable": {
"version": [
- 20190919,
- 2147
+ 20201206,
+ 1408
],
"deps": [
"f",
"pyvenv",
"s"
],
- "commit": "b730bb509e8b60af9f5ab1f1e6c3458d1d95d789",
- "sha256": "0f2lihzzw9v91adx9v89crbsph4zjj0qrlb3a8fikbhd6jy8xpb8"
+ "commit": "f516a1a8677a6a1ce9683056e9f77b1e785e8431",
+ "sha256": "0ksjshvv8vnx2v91bfykajjnlcc5i0by0lrg0a34f8f3zjyaqcab"
}
},
{
@@ -79937,8 +81710,8 @@
20180127,
2050
],
- "commit": "f82f845ede3b48ca11934171b30effb523ba9fcf",
- "sha256": "0y9n4z388vbpyarpqgfyybfiin1hbw25b4m72ahxmpc4zq7ilqwl"
+ "commit": "4d18c8bc3322668ac1695e25c556bda6771af1d5",
+ "sha256": "1cblfh3hjkfn5acq2hsha981v6bf3ns8x2dmdz75kngfnzavc6ns"
}
},
{
@@ -80259,11 +82032,11 @@
"repo": "emacsmirror/po-mode",
"unstable": {
"version": [
- 20200610,
- 1743
+ 20200606,
+ 1404
],
- "commit": "3114e245c2ee6208e9b506f3e65e631e1b236019",
- "sha256": "1f84fziibcc1bjhcmmzvbsvsw2lwabsb70vl4x2jpqsraygzhw0b"
+ "commit": "25eb1bdca30ed25d2e5d51b9feeb28a3faff51ec",
+ "sha256": "00ff5njs4aghkhipw5pmha4mj1a5s35g1cxihhbqpn9gr7kmbg02"
},
"stable": {
"version": [
@@ -80353,8 +82126,8 @@
"repo": "alphapapa/pocket-reader.el",
"unstable": {
"version": [
- 20181219,
- 930
+ 20200828,
+ 9
],
"deps": [
"dash",
@@ -80366,13 +82139,14 @@
"rainbow-identifiers",
"s"
],
- "commit": "86c51c65d97819e11b3df403beea424f30125d30",
- "sha256": "16dj1853qgd4farqb7wdpyyp1a4mxkasyb0j489h7saz9xn9q8xc"
+ "commit": "dbb7b043edb42341b7f48ce0d81ba08c3c676076",
+ "sha256": "1xkhk8zb84c8jdgc5yjizzfyf265gk110fv8adww270sqg71la9v"
},
"stable": {
"version": [
0,
- 2
+ 2,
+ 1
],
"deps": [
"dash",
@@ -80384,8 +82158,8 @@
"rainbow-identifiers",
"s"
],
- "commit": "a7f080ec3e9522f942166de61b24a375b8f1c2bb",
- "sha256": "0l7dln7qcrgzm73vk7jp8wr2kibg18973xmdzyyc162hdnlbrpb0"
+ "commit": "dbb7b043edb42341b7f48ce0d81ba08c3c676076",
+ "sha256": "1xkhk8zb84c8jdgc5yjizzfyf265gk110fv8adww270sqg71la9v"
}
},
{
@@ -80471,15 +82245,15 @@
"repo": "galaunay/poetry.el",
"unstable": {
"version": [
- 20200805,
- 1259
+ 20201114,
+ 1723
],
"deps": [
"pyvenv",
"transient"
],
- "commit": "22a76cdcba180b4689a6b45c97669e3c76cd36ed",
- "sha256": "099sxca06zxfvlvmsgjicira4r4csqv2m4l0d7icji57qahbp5h2"
+ "commit": "d5163fe065239bb7b46ed8b3ff3b85b1f3229af3",
+ "sha256": "0d84d2ysbb635d9riggvfnpck5qmijaybix3ian8r8ayymn7ajl4"
},
"stable": {
"version": [
@@ -80557,11 +82331,11 @@
"repo": "RyanMillerC/poke-line",
"unstable": {
"version": [
- 20200818,
- 1403
+ 20201023,
+ 247
],
- "commit": "fe876cd6e8fdf3a68037285eda4ac2eaf977eae4",
- "sha256": "04dpfg22nqmqrw3rzpyh62kb17iqdadmimrnrvy9cnyd8mla0k5z"
+ "commit": "8d484dbaa1215d902fbd1e3c9163b39a43ec532a",
+ "sha256": "18wjmnjlrq0vvc08rc0z5bacjsfa6im98khhfdm3qh13a2bf1gjk"
}
},
{
@@ -80624,8 +82398,8 @@
"repo": "mavit/poly-ansible",
"unstable": {
"version": [
- 20181222,
- 1517
+ 20200826,
+ 1542
],
"deps": [
"ansible",
@@ -80634,23 +82408,24 @@
"polymode",
"yaml-mode"
],
- "commit": "2cb970a0e27b41ae85bc51d24ef36fa2c7b34bbc",
- "sha256": "04vf6zgcra47j3phxbb43q5sa5ldavnbiwwdlw1xipg44991j6md"
+ "commit": "d76f6ec2374ec46ad78f2d0c3e1d1d91ee44c2bf",
+ "sha256": "0f0yq6gmkp194nxk90ipprglf1xkmxrgz1rkgrhfslvxq4q2l81h"
},
"stable": {
"version": [
0,
- 2,
- 1
+ 3,
+ 0
],
"deps": [
+ "ansible",
"ansible-doc",
"jinja2-mode",
"polymode",
"yaml-mode"
],
- "commit": "01c9ec1d8a933fa0b2711940d29331d58c27d2a7",
- "sha256": "02ff0df8bn5cwvnpc2862wsii2xvjh0waymgiybm8j829x1awjp9"
+ "commit": "d76f6ec2374ec46ad78f2d0c3e1d1d91ee44c2bf",
+ "sha256": "0f0yq6gmkp194nxk90ipprglf1xkmxrgz1rkgrhfslvxq4q2l81h"
}
},
{
@@ -81002,8 +82777,8 @@
"repo": "ponylang/ponylang-mode",
"unstable": {
"version": [
- 20200724,
- 137
+ 20201113,
+ 1633
],
"deps": [
"company-ctags",
@@ -81015,14 +82790,14 @@
"yafolding",
"yasnippet"
],
- "commit": "136cc4f7ab4f2ab549633392a72d55051c8b31ac",
- "sha256": "0pjjccd145bla2gshs648kwhlw9r4n449g318nw81v2nn10z6qwl"
+ "commit": "ef3ce7122e2fd112bde0e49a529934be1fea0ad5",
+ "sha256": "0kh9p66lhv4fs778cy4dysnvlvwj7zaa1f9ivw2hnqjycqf2bz53"
},
"stable": {
"version": [
0,
- 5,
- 3
+ 6,
+ 0
],
"deps": [
"company-ctags",
@@ -81034,8 +82809,8 @@
"yafolding",
"yasnippet"
],
- "commit": "0b876e6a2d602f94cc118e6b76f5f79d18244325",
- "sha256": "00xn2mhnf5qvn4v6yncmfa9ijrb33zl49mlc7pqn8pzr8nhbxzvc"
+ "commit": "ebf9c096b26ec1708acc7c84e96998d2b83cb548",
+ "sha256": "066hargy2nfgkkrr0yhlsf2bdjmkmybx513lf91bn1mgwhrmq84v"
}
},
{
@@ -81099,8 +82874,8 @@
"deps": [
"cl-lib"
],
- "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86",
- "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl"
+ "commit": "13364d7674535db225789b03da766746734a4f28",
+ "sha256": "0glwyrks761kpan3ff6a60mqd1hk11yd7rim1fanycmp711k610q"
},
"stable": {
"version": [
@@ -81238,20 +83013,20 @@
"repo": "emacsorphanage/popwin",
"unstable": {
"version": [
- 20200122,
- 1440
+ 20200908,
+ 816
],
- "commit": "d69dca5c9ec4b08f5268ff2d6b5097618d4082d7",
- "sha256": "1w2dmzmy8k4drdhjzkryk6nbkl56aizvyawwn3dyc2gr0vg8lbb4"
+ "commit": "215d6cb509b11c63394a20666565cd9e9b2c2eab",
+ "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1"
},
"stable": {
"version": [
1,
0,
- 1
+ 2
],
- "commit": "4052b6e51bc6cc80cfc86007d2cadbbc4bbd55b5",
- "sha256": "0kdlpjrf1xqyqyzfdymbin34jgs06l465p2ggpj4bb4zaypw2hr5"
+ "commit": "215d6cb509b11c63394a20666565cd9e9b2c2eab",
+ "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1"
}
},
{
@@ -81339,20 +83114,20 @@
"repo": "tumashu/posframe",
"unstable": {
"version": [
- 20200818,
- 606
+ 20201201,
+ 659
],
- "commit": "7b92a54e588889a74d36d51167e067676db7be8a",
- "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj"
+ "commit": "e1552c82dffaadc5e7de09a44880a498197ffbee",
+ "sha256": "0qzi4ivmv65x0gn6wbfz8w2m6pg476vk0041l599mnrh0g87dfw7"
},
"stable": {
"version": [
0,
8,
- 0
+ 3
],
- "commit": "7b92a54e588889a74d36d51167e067676db7be8a",
- "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj"
+ "commit": "f8cb9d6329f96af62ee2e5f401c5430960cf81e1",
+ "sha256": "022m8abjg0ay531jdkmdrc7y9gl539dprzyrzj7yk6hgmzjx088z"
}
},
{
@@ -81434,14 +83209,14 @@
"repo": "milkypostman/powerline",
"unstable": {
"version": [
- 20200817,
- 1321
+ 20201129,
+ 2306
],
"deps": [
"cl-lib"
],
- "commit": "e15e77ab2e589bd73f9e90498747d77d042789ea",
- "sha256": "1sw9aicv9xbcg0fz6584hfycwibzxx2jxlav0kf83d3wg3lprgps"
+ "commit": "b293abf83c0a2b2988af19dd0ef0426c3b1d1501",
+ "sha256": "01nqff1pg9nxv49g2mmapnrjl8978wwyr6afkr3rm7zlnjz1cjas"
},
"stable": {
"version": [
@@ -81482,11 +83257,11 @@
"repo": "jschaf/powershell.el",
"unstable": {
"version": [
- 20190421,
- 2038
+ 20201005,
+ 1642
],
- "commit": "87826777bd3ebd53740be99b4546bfc11ccc625d",
- "sha256": "038pcb7hv05yja9fvrmps6vh096a5rrdmyx9l8nisxqnsqf97ghv"
+ "commit": "d1b3f95669343399f199f291ef76c09a0ede5e60",
+ "sha256": "1cxhzaaig88zhylyycvb3849r85j1ijqklnh9zbqsfl2zhpb0g5c"
},
"stable": {
"version": [
@@ -81622,11 +83397,11 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200818,
- 1400
+ 20201125,
+ 1428
],
- "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
- "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
+ "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95",
+ "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0"
},
"stable": {
"version": [
@@ -81690,15 +83465,15 @@
"repo": "jscheid/prettier.el",
"unstable": {
"version": [
- 20200714,
- 859
+ 20201209,
+ 837
],
"deps": [
"iter2",
"nvm"
],
- "commit": "000244b82ca9e2118376f6a44506bac8ab225677",
- "sha256": "1mrxjvx16ixcyqvqvc8lmvh3jdkcriq9djhiak0pg8y6nbrj4dqa"
+ "commit": "673698ed70f2205230a052dd98f2cd2f1dd0c21f",
+ "sha256": "1r6prwaf3w6s2byzb10zzs2n105dayz998gh0ifmlla0mw58rnhy"
},
"stable": {
"version": [
@@ -82238,14 +84013,14 @@
"repo": "hying-caritas/project-shells",
"unstable": {
"version": [
- 20191123,
- 914
+ 20201026,
+ 748
],
"deps": [
"seq"
],
- "commit": "5aea9ee0de93f2568afb3f18bb7b43a9715a9a2d",
- "sha256": "0zh0hwvh5hdn9gpyhqv14l46pbsids83ps86asikd9in7sl2abgn"
+ "commit": "382b3d48a797ea56383732ebf9cd219aeec676df",
+ "sha256": "04zsk6mwxkp71fbjq64k78nwx3gvgbp2fmm5f8ah2ap2g65j5kq3"
}
},
{
@@ -82256,26 +84031,26 @@
"repo": "bbatsov/projectile",
"unstable": {
"version": [
- 20200819,
- 531
+ 20201208,
+ 2044
],
"deps": [
"pkg-info"
],
- "commit": "46d2010c6a6cccfc4be72317f10ea99fd041ab54",
- "sha256": "1xd4ag6sypqhfn85vnr8609cl9nip0l5j77226p6apv6yhdippqx"
+ "commit": "0ff73ecf7f25f47382e2d28c8ab232c18609d515",
+ "sha256": "1fbsvl74271hrlii73lc9g0hk67mrp0dm1zbhbrc9b2cnc2nh88j"
},
"stable": {
"version": [
2,
- 2,
+ 3,
0
],
"deps": [
"pkg-info"
],
- "commit": "dc0e7a5ba46f92bd224a5e89f0af2ace0ed05ade",
- "sha256": "1kf34p2jwcjcqniia8bx3kn14ybwcq81x7gcm1vkd9cj7x0mx96n"
+ "commit": "18f694931f0afe8b33e34731914e8bae81107b55",
+ "sha256": "0jgnj5il4ynbqgpvy41y6xwwdwnd8m7vsx2f8y8dlwnczr0a022r"
}
},
{
@@ -82325,15 +84100,14 @@
"repo": "andrmuel/projectile-git-autofetch",
"unstable": {
"version": [
- 20191013,
- 1806
+ 20200820,
+ 2028
],
"deps": [
- "alert",
"projectile"
],
- "commit": "4a3eba7658a52c6e955d5f7085cd3fd62b53b9c6",
- "sha256": "01jsj0pv9qqbkdmbykvk4ic40hc1nhaiaqvx17hi7p89hq3nzffr"
+ "commit": "423ed5fa6508c4edc0a837bb585c7e77e99876be",
+ "sha256": "18z8ik1wgrs57j52pjc7pq1z09c5xz0mxwjz0w37fk0iyhirchd4"
},
"stable": {
"version": [
@@ -82357,8 +84131,8 @@
"repo": "asok/projectile-rails",
"unstable": {
"version": [
- 20200417,
- 1711
+ 20201004,
+ 1011
],
"deps": [
"f",
@@ -82367,8 +84141,8 @@
"projectile",
"rake"
],
- "commit": "11980b2bcb99208888856a9b8666ff329b6f0142",
- "sha256": "0crb08byq1i9wcjmcl645wc03p1jadm4f9nd138rii69nzancwfl"
+ "commit": "7a256b1b1444fe0001f97095d99252e946dd9777",
+ "sha256": "1d8wcjrhw0k4ws0bdl1q37pm0cz1smqink1d8hi8fs505brbpfdp"
},
"stable": {
"version": [
@@ -82688,11 +84462,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20200623,
- 1748
+ 20201207,
+ 2131
],
- "commit": "03e427a8f19485e12b2f95387ed3e0bff7cc944c",
- "sha256": "0ykxb4xdsxv2mja620kf61k2l18scs0jdsfsg1kzs2qf4ddjscyn"
+ "commit": "ad5105b58374f9ed5f83d5272688f5475bc0293b",
+ "sha256": "1iwhaa16nxd943lhzq85d4i8d1cjp2phb5qmn6jdk19yc5c40dvc"
},
"stable": {
"version": [
@@ -82795,8 +84569,8 @@
20200619,
1742
],
- "commit": "214c77e1b76e63e512bd675d1c300c80438642b6",
- "sha256": "1fxf5gydjcfc9gdwv6yfcwv85ww5glqbzlfv9hcnkddwlz6schxa"
+ "commit": "26c0fbc15bd2ed8371df3f737951804f0a92db4b",
+ "sha256": "0p65cxzw8rlg36fva5is6kxgiwzshjaf0jk3l6vaylipq4gv86br"
},
"stable": {
"version": [
@@ -82847,11 +84621,11 @@
"repo": "stardiviner/proxy-mode",
"unstable": {
"version": [
- 20200131,
- 816
+ 20200913,
+ 38
],
- "commit": "e9b2a4bb032aaf13b006b74eec309a9bf2249cf0",
- "sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry"
+ "commit": "efe2ad19a20898c145fd63b5f85f25b662f6ea43",
+ "sha256": "11l8v3igwwx0n0l3a069zzwzzj9q0p99l9x91sxzgw8v0g438vjx"
}
},
{
@@ -82951,15 +84725,15 @@
"repo": "thierryvolpiatto/psession",
"unstable": {
"version": [
- 20200714,
- 555
+ 20201111,
+ 1424
],
"deps": [
"async",
"cl-lib"
],
- "commit": "d2b8f8d8c6acd2f86f3a7774a7079f40b1b75f8e",
- "sha256": "1pks2xvnampp74d1m7rrq6801bdhcmdsx9gbrcvr8ljxxlzbka1w"
+ "commit": "4856442966f94fd2da486993a8d3e07f190d971f",
+ "sha256": "12vip32c6pszrvvnfd9k1mngmd4qzh5wvpc3ykjcil1f4mdfnlar"
},
"stable": {
"version": [
@@ -83031,6 +84805,42 @@
"sha256": "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw"
}
},
+ {
+ "ename": "ptemplate",
+ "commit": "59f4fde6fa549e45a520e42a331266c687b40e31",
+ "sha256": "08pyr3kbsilfgcsss8hk1w01xrbgavipgl8ih1rhfnz76q1ay2dp",
+ "fetcher": "github",
+ "repo": "nbfalcon/ptemplate",
+ "unstable": {
+ "version": [
+ 20201126,
+ 1936
+ ],
+ "deps": [
+ "yasnippet"
+ ],
+ "commit": "af370c74f5c2a780c0dfd2bb3e4a2388c11202cc",
+ "sha256": "0na5lrx3kn2j76vbc84qns3kym2pn67zv2s4b5whm1bpwqsr5ayl"
+ }
+ },
+ {
+ "ename": "ptemplate-templates",
+ "commit": "3207d42ba3c5d9c2f2e7621934e95ad2755ca1e0",
+ "sha256": "0i1zipjdcwclrkcs0n7g8n64ggd2lfbndbas6aqpnww4b3kdzdxv",
+ "fetcher": "github",
+ "repo": "nbfalcon/ptemplate-templates",
+ "unstable": {
+ "version": [
+ 20201129,
+ 1306
+ ],
+ "deps": [
+ "ptemplate"
+ ],
+ "commit": "17c3f270a97ea3f018536a7b8fb81101e46b1090",
+ "sha256": "1qmcvy5dwln2c7r6xw5z00d0h80ln799jv2qhbhcga24mz2f21zd"
+ }
+ },
{
"ename": "pubmed",
"commit": "ee84560c15e7389e902fb4a4c548c08be231de82",
@@ -83176,8 +84986,8 @@
20200506,
1241
],
- "commit": "c1fa9f403b100aceac4c2dcb053111b2de701f16",
- "sha256": "0y52kgqrnzrsybm2cwdrarjm1y92hambcr4a8nky28bkp5v73a86"
+ "commit": "57c2c87b72336e5dee2165c6b0010022f6e7e51d",
+ "sha256": "03agwvk14rzxglmw5y43v3sy5hhpr5w6iimpf623hxwzfgl3f6xl"
}
},
{
@@ -83526,11 +85336,11 @@
"repo": "statmobile/pydoc",
"unstable": {
"version": [
- 20200107,
- 54
+ 20201030,
+ 1530
],
- "commit": "1dfbab7800827adadb649d6e02c31dd9cd65f0d3",
- "sha256": "1lpc9picbrnqyyh2sy365dvfkxf2phh8s8j4bhizvkd2gallr6vr"
+ "commit": "4459aa1c2cc7648cb1b9c9fcf470d8809a9bc7b3",
+ "sha256": "01b0gmnvsssh1vmjq79qh8fy2nv6iryw72zd9lp8qnwd9sr42rqp"
},
"stable": {
"version": [
@@ -83555,8 +85365,8 @@
"deps": [
"pythonic"
],
- "commit": "d191037fe62ed8d4fee5888845da3e2c386d8e89",
- "sha256": "0dipwjdkx4887g61gn22wga4pvvkwv6rx7izq73l8b6x1mc17c0h"
+ "commit": "b818901b8eac0e260ced66a6a5acabdbf6f5ba99",
+ "sha256": "16hclgvqbz98py70aic7cz070snyikyb4wflml4qr40pqf91iw48"
},
"stable": {
"version": [
@@ -83619,8 +85429,8 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20200510,
- 704
+ 20201130,
+ 309
],
"deps": [
"async",
@@ -83628,13 +85438,13 @@
"pyim-basedict",
"xr"
],
- "commit": "e54153f462dd8cd8e9bb379e0483a2849ec94f42",
- "sha256": "0zsw25q1nqkqc3vgi95064v9wph1ynhiqi8gvc3fqq3k8i2jgy4v"
+ "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7",
+ "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0"
},
"stable": {
"version": [
- 1,
- 9
+ 2,
+ 0
],
"deps": [
"async",
@@ -83642,8 +85452,8 @@
"pyim-basedict",
"xr"
],
- "commit": "8fe9897f57e410a7637692d98c40876cb3bd6c2d",
- "sha256": "1n9syy39rnma0giz2g1dhdfjj4nn5bls2qzswy48snfl5z5mfm5j"
+ "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7",
+ "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0"
}
},
{
@@ -83672,10 +85482,10 @@
},
{
"ename": "pyim-cangjie5dict",
- "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7",
- "sha256": "1l2k8kfnfciacp1zps8j1g6ijzv1k3g9198079l8c8xlw789irlv",
+ "commit": "abad9b91bcf2dd29255a98ddcfd4b17d8847ecd5",
+ "sha256": "13sbbiqqpdplm36pa3zyqakbvlkvh7wvm7pmn0li6hnm56dwydg8",
"fetcher": "github",
- "repo": "HesperusArcher/pyim-cangjie5dict",
+ "repo": "p1uxtar/pyim-cangjie5dict",
"unstable": {
"version": [
20170730,
@@ -83696,14 +85506,14 @@
"repo": "tumashu/pyim-wbdict",
"unstable": {
"version": [
- 20200331,
- 542
+ 20200910,
+ 1445
],
"deps": [
"pyim"
],
- "commit": "daa223e2603a5ef3e6c8e33575d8f4e4604a8d3c",
- "sha256": "0inl29fa2l5grn6z2wszj43bv17yf7n9x8l77zk2xp8q3gkswd86"
+ "commit": "8b1f0dfa1c5f5f8e5fb110a0963603ee08d60932",
+ "sha256": "11y4xa27w8n16181bddxs8w5p7r2mk38l19id69w2xvvaqa36prf"
},
"stable": {
"version": [
@@ -83775,8 +85585,8 @@
20200503,
1624
],
- "commit": "52fd8e17c6aedbc68f58f1169363d6cc216f405b",
- "sha256": "0nvgv67gq80hriaasck4zrr3v7qqrw6apxhnyixyavabdvvrawqz"
+ "commit": "6e1cca143f2e0c6f20643573bfddb53ec02e66b4",
+ "sha256": "160aiz82wf6j6dv90rnzmlx79ijf0cl6xzixa7pa1nh77nqd1pq6"
}
},
{
@@ -83874,8 +85684,8 @@
20200804,
848
],
- "commit": "05d227493b7b96f3556cba22f215cb85f9282020",
- "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl"
+ "commit": "fe4a43299a926223634c3b104b751397bb818019",
+ "sha256": "1cvkraqyxbmwfz5pcryscyhbnm6f91gknwkbh12s1lpn998c2q3a"
},
"stable": {
"version": [
@@ -84017,11 +85827,11 @@
"repo": "python-mode-devs/python-mode",
"unstable": {
"version": [
- 20200608,
- 737
+ 20201203,
+ 2019
],
- "commit": "6658e5d768db0c0d8dbc6fdedff3a85b65327061",
- "sha256": "1mf6bbx4brwzafxwrv37x14b286vlza9knswhcccvcb3aplvll6h"
+ "commit": "429c52ae6564c3e6d9cebd69e9726784eaf41b81",
+ "sha256": "1fkc7994hgw4iprklixyy962yw3p2mby202kcs9bnjq696j25kh7"
},
"stable": {
"version": [
@@ -84041,8 +85851,8 @@
"repo": "wbolster/emacs-python-pytest",
"unstable": {
"version": [
- 20200812,
- 737
+ 20201120,
+ 2106
],
"deps": [
"dash",
@@ -84051,8 +85861,8 @@
"s",
"transient"
],
- "commit": "fc056faf2757c42641ed94d36a090e56eb13572f",
- "sha256": "00dwbh549ygnrp98s883v45f5pbb34f2j5qwvw92camhp6daw38y"
+ "commit": "4a1c4c8915c12e540d41aae1d4e326a2362da541",
+ "sha256": "11hzh86mmi4hwiwnq1nfn6lizjk3pghi8j4m4cgam2zikapxq0wi"
},
"stable": {
"version": [
@@ -84073,10 +85883,10 @@
},
{
"ename": "python-switch-quotes",
- "commit": "d99fbd3d0c486bf89c9c0937e2ebf378be39293f",
- "sha256": "1wc27q9ac8p7c5mfk3kznbmdd5ds4ray0csgba79n19g152y5jjc",
+ "commit": "3b6c72b40557e9b8e0585c9578176a1794f0eabc",
+ "sha256": "09k96mbv52fm782m1rm459659mv950n6svdpigb4rf3kmd5i7jw9",
"fetcher": "github",
- "repo": "werehuman/python-switch-quotes",
+ "repo": "vladimirlagunov/python-switch-quotes",
"unstable": {
"version": [
20161228,
@@ -84175,11 +85985,11 @@
"repo": "jorgenschaefer/pyvenv",
"unstable": {
"version": [
- 20191202,
- 1039
+ 20201202,
+ 1040
],
- "commit": "861998b6d157ae73b829f02a5a6c8a9118310831",
- "sha256": "0w7w95cjhpvy28mcvmv21ajspngkyrx3yjx3293bmclv699lfbwc"
+ "commit": "0bf4b87068e9040fc99afa85af1992247dd7aacd",
+ "sha256": "10dcigv25bs115d3m5nibvh1sxg99ni32cy5pyz616f2wz1zbph4"
},
"stable": {
"version": [
@@ -84198,11 +86008,11 @@
"repo": "psaris/q-mode",
"unstable": {
"version": [
- 20181216,
- 1747
+ 20201011,
+ 103
],
- "commit": "7a13fb68a0ad3d843c8cdc188cf0adb9723f42f7",
- "sha256": "0di229ma7jr9jcck36qjrzilkbp428kkx53qs6c9xw9jhv6yklbz"
+ "commit": "df2123d4fe5c05a995721af8e8da98ff4a1f0717",
+ "sha256": "074lhq3qkran6kxk9lm6a095gspyxrq79xvsqzm50q87xk6ala3a"
}
},
{
@@ -84283,11 +86093,11 @@
"repo": "LesleyLai/emacs-qtcreator-theme",
"unstable": {
"version": [
- 20200203,
- 1436
+ 20201129,
+ 1620
],
- "commit": "c56d792d5ab01743e1350e0a7a8a89bb3d2e0c4f",
- "sha256": "1h7l094h5ccn24c8qp7aqcc4yn1gx8hlkgvsamh1zn8qpsx9bipy"
+ "commit": "ca5fd9a4552a7fc004579ed59c69fbc8f0083ac4",
+ "sha256": "1askzfnysv9nccf1mrkzk834ak5lja416b5mi5z5p7mrnn9vfn2d"
}
},
{
@@ -84336,8 +86146,16 @@
"repo": "quelpa/quelpa",
"unstable": {
"version": [
- 20200617,
- 2205
+ 20201022,
+ 638
+ ],
+ "commit": "8e59bf825629388384324b3eea5d51958d7fd34e",
+ "sha256": "1hrhhiz0dd6403yv8jnjq6zjl1zjjaqxq97yvpwd4l0sx1sx0h6m"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
],
"commit": "f1fc228f217be692eaae2d53f51966ce922d6a32",
"sha256": "03h30qcixq54q212381cf7mahi2k9q4590vm44pqy9widpigmxz7"
@@ -84351,8 +86169,21 @@
"repo": "quelpa/quelpa-use-package",
"unstable": {
"version": [
- 20200307,
- 805
+ 20201022,
+ 746
+ ],
+ "deps": [
+ "quelpa",
+ "use-package"
+ ],
+ "commit": "d985c0326b66aa19581918deccdc5edcacccf953",
+ "sha256": "0r9f8ary20rxs7rdl6lf6wl1gwa70c2c1zy93z3kcwjrlhbkp4rd"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
],
"deps": [
"quelpa",
@@ -84370,11 +86201,11 @@
"repo": "renard/quick-buffer-switch",
"unstable": {
"version": [
- 20200727,
- 720
+ 20201027,
+ 2307
],
- "commit": "ceb5222599b861f9d1133b1509516fcf07a3cd67",
- "sha256": "09dfw42d5834z8x1c1mri7g61r91i1crr3h6r118nmszhbx9b7iy"
+ "commit": "da82555f286588f171eed1de151325bbdd8cbd91",
+ "sha256": "1d84zk9a42lcxv95z6izvx30vrniccc88fbd5nmjcp58mq5xh2fn"
}
},
{
@@ -84449,20 +86280,20 @@
"repo": "emacsorphanage/quickrun",
"unstable": {
"version": [
- 20200603,
- 1902
+ 20201130,
+ 952
],
- "commit": "ce7383c53215077f7e1d258d389cf8731309fbe9",
- "sha256": "0dscg35hrywn8qr02q46y0cdclyscz6qxa0dqphkx3bv9xvzmqjl"
+ "commit": "80087806741a4d7fd5ce0f74c8e27f4779a737d9",
+ "sha256": "19i07v4m3rss9ici3j5iayn717kbr8pmxss5iinzgdf4bi1yx293"
},
"stable": {
"version": [
2,
3,
- 0
+ 1
],
- "commit": "072ec7be93f31e9dd265fb834cd709d0c0d4a8bb",
- "sha256": "1zx8hpm5wa9ad675py8676071pip6831d4jy2dqyrlxpfvi6q47l"
+ "commit": "0133cac651918071a824e85b55e10d44f32a1979",
+ "sha256": "0a1n2v09h0n7d9p2izflqqang4ny0b46dlqvmxvkkik4bb6f4wcz"
}
},
{
@@ -84611,15 +86442,15 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20200810,
- 1513
+ 20201123,
+ 1623
],
"deps": [
"faceup",
"pos-tip"
],
- "commit": "c55fd70c5e9a371f262486f7d5d8837481388b95",
- "sha256": "13ngnm22h5rzmm9pvgbw9nidv8jkkcsckbypi2mn1k8j8wfjypx0"
+ "commit": "3563081f7de57198d5adba856a79f67b3b5ad675",
+ "sha256": "061q7sb1a9q0gipfw4na4418cpd5wdfgn4iwpdaf61g0w20y0qm2"
}
},
{
@@ -84648,17 +86479,17 @@
20190308,
759
],
- "commit": "c6a1cf13a164f22b026b0959527c3b98c2b1aa49",
- "sha256": "00clkjrp2nfchhznilxjb56bcdv1an50cawnz6747ck22x0ycbfn"
+ "commit": "1c3850568e60a555d59cbb57bf2b6aa06e99d454",
+ "sha256": "1z6nyn2galkp9c06n6k431rqm12wla24pa0bmwqjbbhz4jz5dxf2"
},
"stable": {
"version": [
2,
- 0,
+ 1,
0
],
- "commit": "ae77bc04fe5a948f418ec8693f6ff2c9ea757c50",
- "sha256": "1vn9cw343w9vvxhzqi85vyqnj6kxcv99qvva4xjvy1sf65i24wy4"
+ "commit": "1c3850568e60a555d59cbb57bf2b6aa06e99d454",
+ "sha256": "1z6nyn2galkp9c06n6k431rqm12wla24pa0bmwqjbbhz4jz5dxf2"
}
},
{
@@ -84708,11 +86539,11 @@
"repo": "Fanael/rainbow-delimiters",
"unstable": {
"version": [
- 20191018,
- 1233
+ 20200827,
+ 321
],
- "commit": "5125f4e47604ad36c3eb4706310fcafac729ca8c",
- "sha256": "1jh1gv69cjlrjkmjrkhgc7jffyxlkq9nci5ag4z1alskfp6favir"
+ "commit": "f43d48a24602be3ec899345a3326ed0247b960c6",
+ "sha256": "1lm1nwm3hg7nss9i8ar1265ziiyn4ckmc4fvn5zwnqq96hxmdk7x"
},
"stable": {
"version": [
@@ -84732,14 +86563,14 @@
"repo": "stardiviner/emacs-rainbow-fart",
"unstable": {
"version": [
- 20200718,
- 437
+ 20201130,
+ 639
],
"deps": [
"flycheck"
],
- "commit": "16759a0aa1b39c43cdedcf6a6c9a5dc3c3895fd2",
- "sha256": "14dh7bd40jc6vl6933575jivgmm3h6frphmwxspijb7c8pj1wfmv"
+ "commit": "fe5b01ec36bc5db7f578ba94593ac92fd653ea5e",
+ "sha256": "067zfgsbq7whg1mvwbp2j5f8i1x128nmv1b75vhgqvfykbxr0b47"
}
},
{
@@ -84808,14 +86639,14 @@
"repo": "Raku/raku-mode",
"unstable": {
"version": [
- 20200524,
- 1625
+ 20200902,
+ 2139
],
"deps": [
"pkg-info"
],
- "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8",
- "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i"
+ "commit": "8a6e17f1749c084251d19c3d58b9c1495891db6d",
+ "sha256": "1nxv5x9ywm9zzzl69ssvvxf0lphjqjfazf5qcd3qpv4w5rqa1s3b"
},
"stable": {
"version": [
@@ -84892,7 +86723,7 @@
20200607,
2002
],
- "commit": "d7c18370981c9e585bc0fb78f7e55033457ca643",
+ "commit": "caf75f0060e503af078c7e5bb50d9aaa508e6f3e",
"sha256": "0xfg38ginrd0sdn194gpapi67q6i81csddgsf0rqmwihazpgs060"
},
"stable": {
@@ -85014,20 +86845,20 @@
"repo": "thiagoa/rbtagger",
"unstable": {
"version": [
- 20200714,
- 1658
+ 20200911,
+ 2209
],
- "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f",
- "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09"
+ "commit": "32d1df138a9b70530ec7a71dc85aa6e133a6cd95",
+ "sha256": "0bcd54pfy6sw95nc344ahpd2m7a7w6x2qf7badda2sil3bk6fcd1"
},
"stable": {
"version": [
0,
3,
- 2
+ 4
],
- "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f",
- "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09"
+ "commit": "32d1df138a9b70530ec7a71dc85aa6e133a6cd95",
+ "sha256": "0bcd54pfy6sw95nc344ahpd2m7a7w6x2qf7badda2sil3bk6fcd1"
}
},
{
@@ -85290,16 +87121,16 @@
"repo": "realgud/realgud",
"unstable": {
"version": [
- 20200809,
- 2221
+ 20200923,
+ 610
],
"deps": [
"load-relative",
"loc-changes",
"test-simple"
],
- "commit": "332d13673074bee252ae7819b0898ee7c7895d2e",
- "sha256": "0cnnhxgyrjvr75pin7kis5qzd54hh0qscbnvvm8jflmljzca77lz"
+ "commit": "ff660011c82c6af504915833e2d981a547b7ad58",
+ "sha256": "1cqzrp1fk4hk28fh0q9d448cjv47qgvxy2z786x2hpmb42izrc76"
},
"stable": {
"version": [
@@ -85474,16 +87305,30 @@
"repo": "realgud/realgud-pry",
"unstable": {
"version": [
- 20200620,
- 1006
+ 20201011,
+ 1815
],
"deps": [
"cl-lib",
"load-relative",
"realgud"
],
- "commit": "7b502b9e802b8594c90da329b9716bcfd2c981b1",
- "sha256": "1rwqzpcdapfdlf6hvypi16w6z13r1fhv91arbr34jzfzbsnk7sb1"
+ "commit": "264ca6811b0bef5de4decc54acfeacf0bce2f51f",
+ "sha256": "0v3g23x5q04g45av74snf6a3hyghd40lnagr231g5xs1wc6c3plc"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "cl-lib",
+ "load-relative",
+ "realgud"
+ ],
+ "commit": "500bef62369ef1ad876afd99db383c23196e1355",
+ "sha256": "0f46z783hsvzz8w8zf1mpapcm307mk9l9fpcsjf71g08rks984f5"
}
},
{
@@ -85547,20 +87392,20 @@
"repo": "xendk/reaper",
"unstable": {
"version": [
- 20200420,
- 1703
+ 20201121,
+ 2302
],
- "commit": "c594d2fb9a027f360e98539a1debf5db639846b7",
- "sha256": "0md3aqzy8rgvpafh6f8f2dwwrc43q317bk7p1whghfvji52aindv"
+ "commit": "93d21a26ca022d3929749a82498891054092094b",
+ "sha256": "0pg56rgwwsik8509mz7kdwjn6iw2hw9xlajv7p2s0f55v111i6h3"
},
"stable": {
"version": [
1,
- 1,
- 0
+ 2,
+ 1
],
- "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b",
- "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g"
+ "commit": "d30397ffccc91b633bc0bdca9d3d1a340981009b",
+ "sha256": "0i46fkhrd14x21grqrmf9avkqxm81dsmrisndwmvkxk6jy5i6dd6"
}
},
{
@@ -85571,11 +87416,11 @@
"repo": "reasonml-editor/reason-mode",
"unstable": {
"version": [
- 20190710,
- 1037
+ 20200929,
+ 1606
],
- "commit": "7cf6fbf4e8e86ebb76d118b2703e20b968e030d4",
- "sha256": "0b8p7lh0ifrw9rqvv15q3ib206d1wfv3xafpqwc70zzwaxswvk06"
+ "commit": "5690544a7091630e0ea0023bbbd57a733cea8bde",
+ "sha256": "1iha4jgdyhmia591aqkzdnv3333pj2x14g814qkil71na4z23y8j"
},
"stable": {
"version": [
@@ -85803,6 +87648,21 @@
"sha256": "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"
}
},
+ {
+ "ename": "recursion-indicator",
+ "commit": "2c8ad93fcf71be990ab1b97c4fbe7526ce66ca69",
+ "sha256": "1nnbzl3a32hk721j37x3s865036j2m48xy13sdh8cxfhd6q4jwbv",
+ "fetcher": "github",
+ "repo": "minad/recursion-indicator",
+ "unstable": {
+ "version": [
+ 20201206,
+ 139
+ ],
+ "commit": "7f737f667441f538c283cc1933e95cea844f1b04",
+ "sha256": "1lbfb8gl5jzfl4j5p5ab8ybgsa2zhg0ix3ld726ch0p8pcrjl3f9"
+ }
+ },
{
"ename": "recursive-narrow",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -86000,10 +87860,10 @@
"stable": {
"version": [
0,
- 5
+ 6
],
- "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696",
- "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq"
+ "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474",
+ "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x"
}
},
{
@@ -86160,14 +88020,14 @@
"repo": "psibi/rego-mode",
"unstable": {
"version": [
- 20200413,
- 450
+ 20201102,
+ 1420
],
"deps": [
"reformatter"
],
- "commit": "439a4d5e130e67e9e8c34e813fa1dc6631e7a8d5",
- "sha256": "0lzlhmz0c4jv65phksh6aya93rlh8rqcffbvz1llcyj8i2gr7hqj"
+ "commit": "be110e6cef5d34eef0529a8739c68e619cf15310",
+ "sha256": "1lm53zg30n96bq8z5g836dhk0y02njdyp8c6vjgsrcii4ff42jp5"
}
},
{
@@ -86223,22 +88083,22 @@
},
{
"ename": "remind-bindings",
- "commit": "b55af46fa0ca3b32bcafcb8601ce1a3e660502ba",
- "sha256": "0s6pqg9pgi1qjss90ip2ryn4604lij3z4acpg6pqhf99y4yjrchv",
- "fetcher": "github",
+ "commit": "2db07414d2d39b2d40a2ae91491032844b82d801",
+ "sha256": "1i4ipai53jmfcq025hjpz03dpbjzbcp7nlssfscda6s8hjxavdnm",
+ "fetcher": "gitlab",
"repo": "mtekman/remind-bindings.el",
"unstable": {
"version": [
- 20200301,
- 2213
+ 20200820,
+ 1723
],
"deps": [
"map",
"omni-quotes",
"popwin"
],
- "commit": "730b6d7b30e397f8f11a6d3d5c269df21a33c450",
- "sha256": "16fk0xnp5awsq45i0wpdkzy6hwccayvwwiag9kar8kmb6nqs2y17"
+ "commit": "c9a327bfd3c68a0c41b5b64df491bdee4c73ca39",
+ "sha256": "1rwlzf9mg66hgdqjgh2garp8qckajs4a1kiqg3xygaf7009kr4nk"
}
},
{
@@ -86302,14 +88162,14 @@
"repo": "tomterl/repl-toggle",
"unstable": {
"version": [
- 20190430,
- 713
+ 20201022,
+ 938
],
"deps": [
"fullframe"
],
- "commit": "f066782c10226d31ea8c1cc386cfa7fa3a4e3aa7",
- "sha256": "14kap395xd3d5n7ini5cyif2ygz0db8bv0py5ipwlac2zcwgmfwl"
+ "commit": "68e7e8ef6775a870eb00828e87de09dba65a0fd7",
+ "sha256": "1brmmh68qcznd0n296ad3547p2awv03kvg1swdz653akci2pkd0n"
},
"stable": {
"version": [
@@ -86478,11 +88338,11 @@
"repo": "tkf/emacs-request",
"unstable": {
"version": [
- 20200517,
- 1305
+ 20201026,
+ 2324
],
- "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef",
- "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"
+ "commit": "0183da84cb45eb94da996cd2eab714ef0d7504cc",
+ "sha256": "16q2mb0ir3a6kpgbkv6ag0zs10pj4gr2j1qdizzfqx7m4piyfj0n"
},
"stable": {
"version": [
@@ -86509,8 +88369,8 @@
"deferred",
"request"
],
- "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef",
- "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"
+ "commit": "0183da84cb45eb94da996cd2eab714ef0d7504cc",
+ "sha256": "16q2mb0ir3a6kpgbkv6ag0zs10pj4gr2j1qdizzfqx7m4piyfj0n"
},
"stable": {
"version": [
@@ -86614,11 +88474,11 @@
"repo": "iqbalansari/restart-emacs",
"unstable": {
"version": [
- 20180601,
- 1031
+ 20201127,
+ 1425
],
- "commit": "9aa90d3df9e08bc420e1c9845ee3ff568e911bd9",
- "sha256": "02x1a85k7r95z8091zgjiaj9nf0zvx1jy4xvl3hr12qbnrx1wfav"
+ "commit": "1607da2bc657fe05ae01f7fdf26f716eafead02c",
+ "sha256": "0afy3icvlj9j6dl3jj6i286mwdhjl7kgvykv1wnbjx2c6gbwfpxa"
},
"stable": {
"version": [
@@ -86638,11 +88498,11 @@
"repo": "pashky/restclient.el",
"unstable": {
"version": [
- 20200502,
- 831
+ 20200901,
+ 1442
],
- "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3",
- "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk"
+ "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3",
+ "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b"
}
},
{
@@ -86660,8 +88520,8 @@
"helm",
"restclient"
],
- "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3",
- "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk"
+ "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3",
+ "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b"
}
},
{
@@ -86708,6 +88568,29 @@
"sha256": "08rwhkx2chphrfqd6l2bjr1w4rn394q8w5iy93cdprl5y56axvp6"
}
},
+ {
+ "ename": "revbufs",
+ "commit": "959511aaaee405b1e56a9966a8746a24bc477f5e",
+ "sha256": "15l2arcm9khmq4gngli9k06x0pcbbkb68hhdhf6bc5dxssfps2gw",
+ "fetcher": "github",
+ "repo": "tychoish/revbufs",
+ "unstable": {
+ "version": [
+ 20200907,
+ 2223
+ ],
+ "commit": "df3c02d3063951582c693ae12547993cec8256e2",
+ "sha256": "087drifqzap5nh6ias109wsk0ndc2yp7xp62k7n2imp3m4wlq77z"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2
+ ],
+ "commit": "74dc21949fe0f910e92b8e4e85318c8fb0b7c86a",
+ "sha256": "1mwplm93src8js33dlpdmjrbc6hr5yf92x4d7jzh14wpiahzpxaz"
+ }
+ },
{
"ename": "reveal-in-folder",
"commit": "26682a1fb2d885168ca922521df7f3d8fbfe43a8",
@@ -86716,28 +88599,28 @@
"repo": "jcs-elpa/reveal-in-folder",
"unstable": {
"version": [
- 20200618,
- 1211
+ 20201022,
+ 533
],
"deps": [
"f",
"s"
],
- "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707",
- "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr"
+ "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182",
+ "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw"
},
"stable": {
"version": [
0,
- 0,
- 5
+ 1,
+ 0
],
"deps": [
"f",
"s"
],
- "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707",
- "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr"
+ "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182",
+ "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw"
}
},
{
@@ -86810,11 +88693,11 @@
"repo": "kmuto/review-el",
"unstable": {
"version": [
- 20200710,
- 155
+ 20201019,
+ 104
],
- "commit": "343e7155f8238a7a53ef1f753319b8e2f9e8e8b9",
- "sha256": "13wgrj5qbg2pv6d9yxkbsrrllvd40m4p7911g23wcwnnx211p943"
+ "commit": "e6a2a10d4544cd2d5893e44dc534681af8db4fea",
+ "sha256": "0l16jn39hsadnzkz9yz7fwzwa544w3gvnm2r71g8piqca0as01qy"
}
},
{
@@ -86840,14 +88723,11 @@
"repo": "galdor/rfc-mode",
"unstable": {
"version": [
- 20200719,
- 1241
+ 20201121,
+ 544
],
- "deps": [
- "helm"
- ],
- "commit": "02546beecf4c495940885e7b7b911d84b12646ef",
- "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875"
+ "commit": "21c966a02cdd4783dc6ea50b807589abc405d929",
+ "sha256": "1g8j80nklf14a178qhb7im01zrw84gmix4gcdn5l45194q6ngifk"
},
"stable": {
"version": [
@@ -86870,30 +88750,28 @@
"repo": "dajva/rg.el",
"unstable": {
"version": [
- 20200703,
- 1250
+ 20201018,
+ 1400
],
"deps": [
- "s",
"transient",
"wgrep"
],
- "commit": "853c1acaf999500d867180b9e71938366c8e1a7c",
- "sha256": "0lp32mjmbzjbsvzia2zd29yv0i75mqvp1w7c0jcwvyyl6gqbg3k1"
+ "commit": "151f3ed7dd0d5829a8aacc0e911d445ad00046cd",
+ "sha256": "13c9hlf3hrvqzcmbaqqbr91fz9wcf7fll4czvxsc3c58bhfqcsan"
},
"stable": {
"version": [
- 1,
- 8,
- 1
+ 2,
+ 0,
+ 2
],
"deps": [
- "cl-lib",
- "s",
+ "transient",
"wgrep"
],
- "commit": "3f07304b8a7ee70ac91f3b66e76dc1d621a96bff",
- "sha256": "0k7x5z7mh9flwih35cqy8chs54rack3nswdcpw5wcpgv6xim227y"
+ "commit": "2ec8d1d36cfb9750c9a65c4a2687ea76399fccb3",
+ "sha256": "15qcnsnbni0aincm9pxpfhff3c5ivd5zs2s2qchjzhcn4kdm6kxr"
}
},
{
@@ -87029,8 +88907,8 @@
"repo": "DogLooksGood/emacs-rime",
"unstable": {
"version": [
- 20200816,
- 827
+ 20201129,
+ 1748
],
"deps": [
"cl-lib",
@@ -87038,14 +88916,14 @@
"popup",
"posframe"
],
- "commit": "aab21695f1dee0db3ddf0f0c834b94aecec7057c",
- "sha256": "0rzghfnrdyrqijw76f4vvsn3hsninwp3qyvr1p7r0ddz21xz04np"
+ "commit": "0faa6e40d272fa79a4ce4f39901a811fc8191de0",
+ "sha256": "10hqalawki31q0z66n46sw57cc30iaf7hgcjkplnk79vp4290xph"
},
"stable": {
"version": [
1,
0,
- 3
+ 4
],
"deps": [
"cl-lib",
@@ -87053,8 +88931,8 @@
"popup",
"posframe"
],
- "commit": "2a0b116d56bf54456eb5d6e8e80a7a6cf6944863",
- "sha256": "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5"
+ "commit": "ee7f951f0bc3b55034634019dd385706bc413dbb",
+ "sha256": "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9"
}
},
{
@@ -87169,26 +89047,26 @@
"repo": "thornjad/rivet-mode",
"unstable": {
"version": [
- 20200514,
- 1617
+ 20201013,
+ 1905
],
"deps": [
"web-mode"
],
- "commit": "9f2e6c4f777dbe306b715ab42663a6fc82a7e431",
- "sha256": "09rsyq28caz4mrwm32i1f8wdzz35grigp7dilzxxqg0y4fpsf81f"
+ "commit": "3dd4fc28f29e4d4f43a881ed5816dea41a912419",
+ "sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd"
},
"stable": {
"version": [
4,
- 0,
- 2
+ 1,
+ 0
],
"deps": [
"web-mode"
],
- "commit": "b40bc13761e0b14b4ba67a0c600d69fd129c8746",
- "sha256": "1g7xz8yygpbcqn0fjnad8kim75q6yqlvsab596my115w9p9l23y6"
+ "commit": "6cf58cf04fee933113857af07414b3f27c24b505",
+ "sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8"
}
},
{
@@ -87205,8 +89083,8 @@
"deps": [
"js2-mode"
],
- "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8",
- "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i"
+ "commit": "b697fe4d92cc84fa99a7bcb476f815935ea0d919",
+ "sha256": "1b779mncahhdgydsvmh7jycq2vchdrn01qj2m5g36aa01wq1v3ih"
},
"stable": {
"version": [
@@ -87244,14 +89122,14 @@
"repo": "dgutov/robe",
"unstable": {
"version": [
- 20200628,
- 1225
+ 20201119,
+ 316
],
"deps": [
"inf-ruby"
],
- "commit": "082da38797d247f9c64568ad712a345e041d5c84",
- "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl"
+ "commit": "f04dcc7f8d4c14ad4761bd534bf58a49a5f2957f",
+ "sha256": "0yl9casjj9sya03mgcyans5fh3kbrkl1g7g566nlf4n77yrajqwm"
},
"stable": {
"version": [
@@ -87266,6 +89144,21 @@
"sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl"
}
},
+ {
+ "ename": "robot-mode",
+ "commit": "51cc7ea77a8f782ff5f1fb2415c337abb805e410",
+ "sha256": "1whsj9pjg1ybhfinrc9hvy4cmccc6932q3gy96ky6af8vr1zwcfg",
+ "fetcher": "github",
+ "repo": "kopoli/robot-mode",
+ "unstable": {
+ "version": [
+ 20201208,
+ 1959
+ ],
+ "commit": "e8ca45ea811a4c6758fa1a086d8f89b8812653ca",
+ "sha256": "0iji80p1llvp93s42cgyffx0py9j1kjk3bjycajcy1hxsha240xl"
+ }
+ },
{
"ename": "robots-txt-mode",
"commit": "eb13cb0dba1696cc51132cd1ff723fa17f892a7c",
@@ -87320,6 +89213,21 @@
"sha256": "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z"
}
},
+ {
+ "ename": "ron-mode",
+ "commit": "67c658fe2ee340f3902c7ff5c0138995e69fe5dc",
+ "sha256": "1w0zicbva3xvqi1qz87fbr4ciq28hg70f0n2q70drh4nqb4ahwm2",
+ "fetcher": "git",
+ "url": "https://codeberg.org/Hutzdog/ron-mode",
+ "unstable": {
+ "version": [
+ 20200830,
+ 1554
+ ],
+ "commit": "c5e0454b9916d6b73adc15dab8abbb0b0a68ea22",
+ "sha256": "132r5346m3li5n7v7fyzyg8sg3679apl7q4y57n5aq395s0q9wyn"
+ }
+ },
{
"ename": "rope-read-mode",
"commit": "7bf40e9d550fba9ded11b99032d78c69af21a6f3",
@@ -87328,11 +89236,11 @@
"repo": "marcowahl/rope-read-mode",
"unstable": {
"version": [
- 20191215,
- 1240
+ 20201025,
+ 948
],
- "commit": "d1246557e2c9c685b0ee4ec0e58237431b846096",
- "sha256": "11yd10b6pxg92ybn4lv3n7h7b7xa4xsvsmpz42hbqdarm50hxsdn"
+ "commit": "6f024d9409ba454b83a2a1ccd57d9a3ebba90a39",
+ "sha256": "0y18i4ly61jyvxymvgjr99arhxfn5y5s659jnqf4gvyp3d671dkf"
},
"stable": {
"version": [
@@ -87484,11 +89392,11 @@
"repo": "Andersbakken/rtags",
"unstable": {
"version": [
- 20200810,
- 2326
+ 20201008,
+ 1707
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -87513,8 +89421,8 @@
"deps": [
"rtags"
],
- "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
- "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
+ "commit": "63a7d9b733def9fe76568f81321a65a450829575",
+ "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw"
},
"stable": {
"version": [
@@ -87804,15 +89712,15 @@
"repo": "ruby-test-mode/ruby-test-mode",
"unstable": {
"version": [
- 20200521,
- 907
+ 20201027,
+ 905
],
"deps": [
"pcre2el",
"ruby-mode"
],
- "commit": "5bb6b7b7ba0a4c91ba2e029853215e76e5df7772",
- "sha256": "19sacch06cxj1803m8ac246cl9sp1wsxbp7zgrhmw1gdpsnpxac8"
+ "commit": "4af8a51483e5ed3104693a0052c2aebf8361c52c",
+ "sha256": "178dbacbhs7j74ia4ay1h84k9cx6jacyw82q6g0hnm2kgzg4x85k"
},
"stable": {
"version": [
@@ -87894,11 +89802,11 @@
"repo": "ideasman42/emacs-run-stuff",
"unstable": {
"version": [
- 20200106,
- 443
+ 20201109,
+ 351
],
- "commit": "d9f7fde3d33446481655d18ca5423c03a23c2e41",
- "sha256": "1g0n3cji2yj35hkcq3p4wnw3iv99k2hagidg6z7qpfavxasyxyn9"
+ "commit": "54787de62839c48428f2e1edc4e2aa64851e9849",
+ "sha256": "0zbf2nvnwx6yyjjk4xfdpn15bna6r32n02q32qzk6bnqipw54ca3"
}
},
{
@@ -87985,11 +89893,11 @@
"repo": "rust-lang/rust-mode",
"unstable": {
"version": [
- 20200709,
- 723
+ 20201204,
+ 1527
],
- "commit": "ca7d99c6fd90fc1e636aa9d4020a2f077786a0c3",
- "sha256": "1m24g08q7w76aq0gnb2pdp0jbadi19fw4jmbgmx47180glz082qh"
+ "commit": "c5c7ed31a2e1106ab4835b135618a34570796dc7",
+ "sha256": "1r2qm3n4788pyyglp23ghzbfq8xzni1vb2jgzc6v65x1047j5rl3"
},
"stable": {
"version": [
@@ -88032,10 +89940,11 @@
"repo": "brotzeit/rustic",
"unstable": {
"version": [
- 20200724,
- 1517
+ 20201202,
+ 846
],
"deps": [
+ "async",
"dash",
"f",
"ht",
@@ -88047,8 +89956,8 @@
"spinner",
"xterm-color"
],
- "commit": "75b99201bb4e7a0bd990c006896ad7897f284ca2",
- "sha256": "1ddma5fi2yaxg2c2hvigfz4hbp218l71ixcnnkzp8ilqr8m2jvjj"
+ "commit": "91ad5db27b86bb2ba6f3019b764d0f45ec93f484",
+ "sha256": "02d6kn7lj1ql6yycvprzdicxb0n6ilb2xbc2qq9q7yn1ibyfymdj"
}
},
{
@@ -88059,20 +89968,20 @@
"repo": "senny/rvm.el",
"unstable": {
"version": [
- 20150402,
- 1442
+ 20201026,
+ 424
],
- "commit": "081d5173158054c6d0780b9462c74c5697eac1fc",
- "sha256": "1s950jmhrwjmzrr3qv3636sn2rhxfvaqlrl36h8700pq3791l1fs"
+ "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee",
+ "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w"
},
"stable": {
"version": [
1,
4,
- 0
+ 1
],
- "commit": "8e45a9bad8e317ff195f384dab14d3402497dc79",
- "sha256": "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm"
+ "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee",
+ "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w"
}
},
{
@@ -88083,11 +89992,11 @@
"repo": "Kungsgeten/ryo-modal",
"unstable": {
"version": [
- 20200515,
- 1703
+ 20201117,
+ 1903
],
- "commit": "5d988e8b3a5d3d6f2f58d97031d2f500ef55473b",
- "sha256": "0p7f02h5vsf4500gf4nl95myvh7pha47rdllscgs3b9jcx1kgyz2"
+ "commit": "f14479e277ac7db75bf6756e0589941f84fdd749",
+ "sha256": "16q1b1dvdh0s7jd58x48m11c925f97lnlm1xn6z1iz8c0bxgqqjm"
}
},
{
@@ -88156,15 +90065,15 @@
"repo": "mattusifer/s3ed",
"unstable": {
"version": [
- 20200720,
- 1313
+ 20200929,
+ 1317
],
"deps": [
"dash",
"s"
],
- "commit": "3e3b962d3848e6cc8ce9dc491b2e29e915a5c351",
- "sha256": "0v8c3zwnfy40clbq6lb03z33n5pj36sz5jpprmgppms3w2ba6fw8"
+ "commit": "2234444ead6c4c6fc3fea548958b36d2c29a9938",
+ "sha256": "0amzpw75w3hb186y4m1k3j9c1j3cxbd2cy20gcma218bgg2xg5s0"
}
},
{
@@ -88199,16 +90108,16 @@
"repo": "sagemath/sage-shell-mode",
"unstable": {
"version": [
- 20200524,
- 958
+ 20201108,
+ 943
],
"deps": [
"cl-lib",
"deferred",
"let-alist"
],
- "commit": "855fb4ece47cea2c72295ce2158e0915829835b5",
- "sha256": "12s289g5xc1b7szyp0zhxdxh6rzhlhkzwiwg14hf020c41mz27am"
+ "commit": "c19c3c681142154d6068d1e0236fea825eda2fe2",
+ "sha256": "10fmm38rlirbrjrkxp73x2wvcb1nkvp0pbg7czwzd6pilxlwsvcq"
},
"stable": {
"version": [
@@ -88255,6 +90164,17 @@
],
"commit": "73328baf0fb94ac0d0de645a8f6d42e5ae27f773",
"sha256": "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "73328baf0fb94ac0d0de645a8f6d42e5ae27f773",
+ "sha256": "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq"
}
},
{
@@ -88344,11 +90264,11 @@
"repo": "djcb/sauron",
"unstable": {
"version": [
- 20200516,
- 1406
+ 20201015,
+ 836
],
- "commit": "d2e06866d1045fa16015d135b8964d9caacc2985",
- "sha256": "04z3hn46m6xy3jpfd00c7x24h27dgv5zcysci3lxzmmq9k4iqsg3"
+ "commit": "5daade4836da5b1b2ab26d84128d6c38328a5d52",
+ "sha256": "0fkq8knq023zm538ls4zxghlkn9zf4rfccpmmgfcpad6bdm00cpc"
},
"stable": {
"version": [
@@ -88412,14 +90332,14 @@
"repo": "nicolaisingh/saveplace-pdf-view",
"unstable": {
"version": [
- 20200719,
- 113
+ 20201130,
+ 222
],
"deps": [
"pdf-tools"
],
- "commit": "bbbc466fff060b372a9d2b30e48ec6bbb7d03095",
- "sha256": "13dxd06dicv50rl1kk6c5971iaj7x3imkqs5q2ndm0daqzrp0lva"
+ "commit": "88e07be656544bcdfa332d25880abff168ca1423",
+ "sha256": "0zn6mhq2cqjfir91w9zry6pi5r8jp4i2437lq8xfjdirrpa55lmy"
}
},
{
@@ -88453,26 +90373,26 @@
"repo": "clojure-emacs/sayid",
"unstable": {
"version": [
- 20190919,
- 654
+ 20200902,
+ 703
],
"deps": [
"cider"
],
- "commit": "cbc3546fb6b1374080f1646ac3a6532a5723b7eb",
- "sha256": "06aysbwr4lr9cd8mbfdpkiz8458hwl5qg41nq1wnl5dx0gvw3fgn"
+ "commit": "27f35778de9509067716a7bed14306787334a589",
+ "sha256": "01a6cvk3ycg0z1qg30rqsnx49drmdfpgd78mhf2m6avvagzf8l9s"
},
"stable": {
"version": [
0,
- 0,
- 18
+ 1,
+ 0
],
"deps": [
"cider"
],
- "commit": "5412d0e129337f0f97a5501521f86dd7deee5804",
- "sha256": "1immns40clz78frsd4dc5ck5n90ac5pfid40bw3phxwr4prhmgf6"
+ "commit": "985837897ca6f9bc5f1d1b1414ad15554a60d3b3",
+ "sha256": "0vdz3dxwi02an5k956apq3ah0dpzly9zd44fhmrqlcjimxc69m7p"
}
},
{
@@ -88483,11 +90403,11 @@
"repo": "hvesalai/emacs-sbt-mode",
"unstable": {
"version": [
- 20200521,
- 632
+ 20201021,
+ 1937
],
- "commit": "4358ed862a1b1ec18ac9699afb4862146669eb79",
- "sha256": "1qm5ziilapfpafqch3pl5iijfj1kwccl2r7g4xl5a2pqnc480sjl"
+ "commit": "7b121fce50430a44bd743583c87d7645bf157be2",
+ "sha256": "0jqq2a5rp6nfi4n2rpdxd8yzc01jhm2mfg3lmn7aacmnwi6554ji"
},
"stable": {
"version": [
@@ -88507,11 +90427,11 @@
"repo": "openscad/openscad",
"unstable": {
"version": [
- 20200628,
- 2256
+ 20200830,
+ 301
],
- "commit": "0c9a36b82c7129a0fdce20ce99e15ecdffd3b437",
- "sha256": "0qsvi7d3bcsai99dvbdfm8n6qafvwj51r4g4ph5jch2f1yb8m995"
+ "commit": "1896c18602265c9b41ff9c1b320699dd0b9b813c",
+ "sha256": "1d3r0r7932w7m3nmv435s0m8qv0ph3a40jpqi412yg7406l920l4"
}
},
{
@@ -88540,11 +90460,11 @@
"repo": "hvesalai/emacs-scala-mode",
"unstable": {
"version": [
- 20200524,
- 1304
+ 20201106,
+ 2057
],
- "commit": "1d08e885b1489313666c7f15a3962432a4f757ee",
- "sha256": "06g6szxb9a4ih90mcryv9r1h6nqbpk3x4icd1i6nh2ky1sj6s37q"
+ "commit": "2bf56219924e0cbc0325547799144b02d4085935",
+ "sha256": "1cs5d9x69q2akzf7a64awapjxljbqggxv391k885ld3zqglqkzks"
},
"stable": {
"version": [
@@ -88598,11 +90518,11 @@
"repo": "ashinn/scheme-complete",
"unstable": {
"version": [
- 20181029,
- 1255
+ 20201112,
+ 442
],
- "commit": "b86ee41d48664839181498313f4f3dc2fef17d6f",
- "sha256": "1by7ky8za6idam4m4xgmf0f5ss0cacd7wv53glhmjb4nslxhgl7d"
+ "commit": "b9a1448c4696f117d9ea4e59b6162dc31112e71a",
+ "sha256": "1smxr5bkzbfrjx21vhrj1wagmqx5yd92i997dbgs16iaqbzzr7cz"
}
},
{
@@ -88637,11 +90557,11 @@
"repo": "emacs-pe/scihub.el",
"unstable": {
"version": [
- 20200604,
- 920
+ 20201009,
+ 420
],
- "commit": "5a4666ca99de6a90108b4606b4c57270c03002ce",
- "sha256": "1njvf7712ryfd83xk27b6d2nx653j57x3ckn7xba7an4i0g7gk4a"
+ "commit": "4f8852dc675fcf3d20ae6e945f4579890ed81de5",
+ "sha256": "1hgial1zp4i3m2bahy3hz5f8fkj87m1nc3xccavzgcpxrkkbksx6"
}
},
{
@@ -88845,14 +90765,11 @@
"repo": "zk-phi/scratch-pop",
"unstable": {
"version": [
- 20200818,
- 1820
+ 20200910,
+ 226
],
- "deps": [
- "popwin"
- ],
- "commit": "b1bdd0f8a345737069194ab8727f164f5d8560b4",
- "sha256": "03x0kb0cf4yzjxl9nqwl3sg9nl75l9n8k4ain0yw0h2vpi2g0wf3"
+ "commit": "cbe842fd78e4b742ece9fc493ebf43e69d872866",
+ "sha256": "1rqmh5nv9qlc17bvqm7q000r0h0y1ymgy7gvxyhjwk6yhaynh0jw"
}
},
{
@@ -88897,11 +90814,11 @@
"repo": "ideasman42/emacs-scroll-on-drag",
"unstable": {
"version": [
- 20200411,
- 1050
+ 20201013,
+ 123
],
- "commit": "42d96a60a207cd73e7a58111358deb05f084c59e",
- "sha256": "00l2n5kx5p18qdlfh2y355w34yp2fy401canrglz6dq1f7615lnz"
+ "commit": "3cd1e1801aaddd011992d284280b5b43ccbee17b",
+ "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f"
}
},
{
@@ -89031,6 +90948,38 @@
"sha256": "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i"
}
},
+ {
+ "ename": "searcher",
+ "commit": "88a19196a3bdbc00245c8721bc518cd760482355",
+ "sha256": "0n8hwqdb5kasbai7mixdvr1yq7h7xg639ykqz2lfc22k43fgjfy6",
+ "fetcher": "github",
+ "repo": "jcs-elpa/searcher",
+ "unstable": {
+ "version": [
+ 20201010,
+ 641
+ ],
+ "deps": [
+ "dash",
+ "f"
+ ],
+ "commit": "432d2ea9f7d0ab7274ff2927d26e7adca85be169",
+ "sha256": "07kwcyg8v5svqq2v24qn4rd43r590gr9nmv3270aqad8lqjlrrn8"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 1
+ ],
+ "deps": [
+ "dash",
+ "f"
+ ],
+ "commit": "432d2ea9f7d0ab7274ff2927d26e7adca85be169",
+ "sha256": "07kwcyg8v5svqq2v24qn4rd43r590gr9nmv3270aqad8lqjlrrn8"
+ }
+ },
{
"ename": "searchq",
"commit": "9738c1be0511540bfd8f324334518c72c9c38c94",
@@ -89216,8 +91165,8 @@
20200209,
2107
],
- "commit": "bb9e66678f34e9bc23624ff6292cf5e7857e8e5f",
- "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg"
+ "commit": "1840de71f7414b7cd6ce425747c8e26a413233aa",
+ "sha256": "1aabqqqcafkqmyarf5kb1k0gglmlpn6kr3h3x0yph5gd6sk3l4ll"
},
"stable": {
"version": [
@@ -89237,19 +91186,19 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20200817,
- 1459
+ 20201207,
+ 1851
],
- "commit": "5448e7cbaeb8d58c5dfd474cd0e03d6db60ac532",
- "sha256": "09xfi0gfk9jmjmz941cfzwrv15jlzqxzwlq4m0qb29g1r4kv62ng"
+ "commit": "632a22cd5edc34611d74eee3cd95fcaa19e699b4",
+ "sha256": "143chfxkbwa096l4r01pcj3slzzhvd8b0vvgvb8h0g4af90yfksn"
},
"stable": {
"version": [
- 2,
+ 3,
0
],
- "commit": "51b75f4b287b13beff86810eb3a060747ac191e9",
- "sha256": "08wm4ybidn8g7sy5a009lnsm0f1p7a3jfzpzxnzylvnyrmyhi3y4"
+ "commit": "bec406a47bd95f5b7363be239783a01631858520",
+ "sha256": "0j10yxlikyg7qxcmp4fnddyd5nc3hlz080d1zcbijq020a08k86g"
}
},
{
@@ -89260,15 +91209,15 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200716,
- 1414
+ 20201026,
+ 1413
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
- "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
+ "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95",
+ "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0"
},
"stable": {
"version": [
@@ -89325,14 +91274,15 @@
"repo": "wanderlust/semi",
"unstable": {
"version": [
- 20200818,
- 1252
+ 20201115,
+ 116
],
"deps": [
+ "apel",
"flim"
],
- "commit": "10897f024fd9282c73385d24514cc4b57fe193db",
- "sha256": "14d4j17l0ngg6fp00mf2zgyz6989cx9n5n3za7ifcfr8gjbbn7gp"
+ "commit": "f279ebe1c1f9c14bdd5d3da01af24277a6167b69",
+ "sha256": "1a387s4h167lsray5k5gzm8jpnrg5az7y982iamk67rz5i1ccgz5"
}
},
{
@@ -89444,15 +91394,16 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20200702,
- 634
+ 20200827,
+ 725
],
"deps": [
"dash",
+ "dash-functional",
"edit-indirect"
],
- "commit": "fa752df206f8f6e64f27e2a6d998ddd58e3c444b",
- "sha256": "1c0k5cg2si4i0hwdi7lbh058rq6vmry8ncddgq5dxbih14wpbys4"
+ "commit": "dc0b3448f3d9738f5233c34c5c8fc172eda26323",
+ "sha256": "0qjfhal2pjw1lk7qyb89lwibabpycibf5vsadinvqnn77m25sx04"
}
},
{
@@ -89742,14 +91693,14 @@
"url": "https://depp.brause.cc/shackle.git",
"unstable": {
"version": [
- 20200529,
- 1839
+ 20201116,
+ 1428
],
"deps": [
"cl-lib"
],
- "commit": "171c3f437d853f34782b201d86ef765665b755e2",
- "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg"
+ "commit": "1c88d2a2fdd2efb3e990da69d6fedeaee5ff71a2",
+ "sha256": "15adhf4iqcmirngcbq5gnn80yxg4hp9kyiccwn23hqq4az05pfyx"
},
"stable": {
"version": [
@@ -89872,6 +91823,24 @@
"sha256": "04h8vhg0fxabjlqgfqsvxkgsmkcp5qmcinxg46xib386r7rzrx4g"
}
},
+ {
+ "ename": "sharper",
+ "commit": "3f7deebb6316003609d2f92f032286b7dace9ba8",
+ "sha256": "087rgvca6jbsqn4ljjphx9ysqydzm8pqsfpl4m5s5mv46c3jmg7v",
+ "fetcher": "github",
+ "repo": "sebasmonia/sharper",
+ "unstable": {
+ "version": [
+ 20201120,
+ 124
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "d610b839dbb907cc0a49b7edfe7fe39aa3f9dd6d",
+ "sha256": "07npr8bhbfvm7kqywrm9k4rd938babdln2c4nyx4yk7xxsl1cbml"
+ }
+ },
{
"ename": "shell-command",
"commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1",
@@ -90189,11 +92158,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20200813,
- 37
+ 20201021,
+ 552
],
- "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4",
- "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk"
+ "commit": "267d4220715eabacca1ad1661d76be5ceed7072c",
+ "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q"
}
},
{
@@ -90265,20 +92234,20 @@
"repo": "jcs-elpa/show-eol",
"unstable": {
"version": [
- 20200723,
- 706
+ 20200921,
+ 1201
],
- "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea",
- "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7"
+ "commit": "02fdb5b2832889afd6cad5c517da9b1e4611c766",
+ "sha256": "0yy97yzc8v1h0vjpm6zbrdwy8sd931mscrbrq1svvv2y227s4ffl"
},
"stable": {
"version": [
0,
0,
- 4
+ 5
],
- "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea",
- "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7"
+ "commit": "02fdb5b2832889afd6cad5c517da9b1e4611c766",
+ "sha256": "0yy97yzc8v1h0vjpm6zbrdwy8sd931mscrbrq1svvv2y227s4ffl"
}
},
{
@@ -90364,25 +92333,26 @@
"repo": "chenyanming/shrface",
"unstable": {
"version": [
- 20200816,
- 1032
+ 20201108,
+ 640
],
"deps": [
"org"
],
- "commit": "9470de04daf0d917d0501432cea78cd6f5cefec4",
- "sha256": "00qi4dg0684all2aw9dljzd3hp01vk3hsfqpf2pvri8l31a9dls5"
+ "commit": "da8acfb347c14e82a9c56cfd65e57b8adb8eb5d2",
+ "sha256": "1gc5w4svkfvd4a0sqyaq4570iabql4w6yayamcpf20n7i8wvlpws"
},
"stable": {
"version": [
2,
- 6
+ 6,
+ 1
],
"deps": [
"org"
],
- "commit": "c82447df5b7fb87fa17e53919dc2da81c7dddec6",
- "sha256": "1nncamyrn5c88lq973w1a28qg15gsdad51ifl1mhqprzkpw7jsjq"
+ "commit": "716b8a51ab331952f5b617152055799e32efb77e",
+ "sha256": "10yrkza38ylvahgq5ga78brkzi5c2ms2v9800a0y8ld019zxkr7r"
}
},
{
@@ -90518,20 +92488,20 @@
"repo": "riscy/shx-for-emacs",
"unstable": {
"version": [
- 20200410,
- 639
+ 20201121,
+ 1824
],
- "commit": "5308d6891276b0aa2b0fd865f6c6f8c1a80ecb54",
- "sha256": "01sz7iqny2r1zfipkria6r5w48rlbrp3ranqqyywvsxhwwr3apmp"
+ "commit": "09ae2124369ded4f38459d2456f72536d172227a",
+ "sha256": "1q07f1ppxx3z01c6zc20pg7kwfmzjzqbsmq3qxgkn3ggchyw0680"
},
"stable": {
"version": [
1,
- 4,
+ 5,
0
],
- "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397",
- "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73"
+ "commit": "63e0feb8eca13691d4ebd5cf3a3ddef4d7675ece",
+ "sha256": "1cb5w6p9gnfxgh8qp7yj2f5ibpk1b4b5af3ynldaaj6yfpa8hqzn"
}
},
{
@@ -90572,11 +92542,11 @@
"repo": "rnkn/side-notes",
"unstable": {
"version": [
- 20200617,
- 1445
+ 20200926,
+ 1404
],
- "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f",
- "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3"
+ "commit": "f5135f652d2b21f55b4809151143845c6807de01",
+ "sha256": "1jnh4djxp4k0c1r6yq0n0zi9vadsj9daqnajs33g2npvhmyav0sr"
},
"stable": {
"version": [
@@ -90753,19 +92723,19 @@
"repo": "gexplorer/simple-modeline",
"unstable": {
"version": [
- 20200427,
- 717
+ 20201130,
+ 844
],
- "commit": "08197f4c37aa28c8305f0b0316619421e42a8b75",
- "sha256": "1wqqaknii7nkvm8nfjr2wzwjwr4w60a2x044y1kgk6zfkfb106lh"
+ "commit": "6bb96a00c5fcce48e681d8e75b000b4047815181",
+ "sha256": "0fgsrbpn8ybksrb0f1z7dzg1v5pshijv9ndr21hdhcwl1cwcv9f1"
},
"stable": {
"version": [
1,
- 1
+ 2
],
- "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51",
- "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m"
+ "commit": "f0b983ba3b5b44390ba2dbd419bb6f29908f95fb",
+ "sha256": "164f95pj38a9hz315fs91ppvgn32a26v7vjz1pnrsvmllricm4zp"
}
},
{
@@ -90831,11 +92801,11 @@
"repo": "wachikun/simple-screen",
"unstable": {
"version": [
- 20161009,
- 920
+ 20200926,
+ 109
],
- "commit": "596e3a451d9af24730ab31a8fe15c91a4264d09d",
- "sha256": "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1"
+ "commit": "3ce535755986f7c25890d11e42fa621a3a069a4f",
+ "sha256": "1cfgmpffqdxg536whik4ph2knxnmbgr4njq744glx82sfy9qp6wx"
}
},
{
@@ -90945,14 +92915,14 @@
"repo": "laishulu/emacs-smart-input-source",
"unstable": {
"version": [
- 20200816,
- 1533
+ 20201125,
+ 1155
],
"deps": [
"terminal-focus-reporting"
],
- "commit": "2568d04908af2d529f5ce0e71f0da541ff53e2a8",
- "sha256": "0kmfhq6rypcc00ylmhf0m9nd51r6kzqfp6hcd22riynq51fb2cyh"
+ "commit": "20479e5f4f26d18bd99c32bb0d6fb49d30904812",
+ "sha256": "1slrkkwc1fampcqaqc88d77kdcmanv3zj7qq6p59bqh9ynpsgy40"
}
},
{
@@ -91124,8 +93094,8 @@
"repo": "yuya373/emacs-slack",
"unstable": {
"version": [
- 20200725,
- 1052
+ 20200830,
+ 1021
],
"deps": [
"alert",
@@ -91135,8 +93105,8 @@
"request",
"websocket"
],
- "commit": "7570e82604b59b65e9ef31c5325bef45769ae027",
- "sha256": "1i7fb4icj9h4lkcsfqqqhsi59msmslckcgxaa5aag4v3cdy93prg"
+ "commit": "1f6a40faec0d8d9c9de51c444508d05a3e995ccd",
+ "sha256": "19lan9nd8qfw2ws7mx814vrin04c892yn5c8g3nad7lpnzszgr1r"
}
},
{
@@ -91328,8 +93298,8 @@
20190701,
1624
],
- "commit": "6c135ad18897c3566d4dadfe847061532600ba2e",
- "sha256": "1k46a9apxk95hd98rip84f728sjq52qbv286sixy3l59k8vls53q"
+ "commit": "f36a84f3c503c46ba0d011874d387a34b01c6bf6",
+ "sha256": "12r1agaz2d0i6ig4ry83bnxcj9bkmfhd6my3fjna2d45j4isybxn"
},
"stable": {
"version": [
@@ -91363,11 +93333,11 @@
"repo": "Fuco1/slovak-holidays",
"unstable": {
"version": [
- 20150418,
- 855
+ 20200919,
+ 1345
],
- "commit": "effb16dfcd14797bf7448f5113085479db339c02",
- "sha256": "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28"
+ "commit": "4c6f635a2153ecb8f76d566d40ccb9d7b1d5fdc7",
+ "sha256": "05gjpmqxbbppxl2yag1c7shdld22grxqax4kinjs6ydkbd5mv5ai"
}
},
{
@@ -91422,11 +93392,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20200816,
- 928
+ 20201208,
+ 1836
],
- "commit": "155cb0655e037477b592f8bde9c80022427293e5",
- "sha256": "0g0ncqb7x3g3gafxm5j0v893cvnskq4idb5442f0v8d3y9pr0lyi"
+ "commit": "41b1cc8087a435ea646e0b45feaaea1da14f5e29",
+ "sha256": "0bvr2rp5bc11f2fzw3r8y0625lk7z770c12ljbvhf5bm5m82h56y"
},
"stable": {
"version": [
@@ -91598,11 +93568,11 @@
"repo": "zenitani/elisp",
"unstable": {
"version": [
- 20200727,
- 1249
+ 20201029,
+ 1600
],
- "commit": "1f14c86af7ca5813ddc0b6dfcf2edd4a81371644",
- "sha256": "0z1mmbgsx2lxrlyg59kz39khbir5k3cwb83mpz49ixfmy54byx5n"
+ "commit": "2edfcf2004ce927f11ca9cb43e2e4b93f43524a9",
+ "sha256": "17bf25jyqryz6i8viljqcv9fszfllfzwrgps4685xm0gjxxys62q"
}
},
{
@@ -91613,11 +93583,11 @@
"repo": "7696122/smart-cursor-color",
"unstable": {
"version": [
- 20141124,
- 1719
+ 20201207,
+ 2228
],
- "commit": "1d190f49ca77734b55ac58f1b6276e42ada967b0",
- "sha256": "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn"
+ "commit": "d532f0b27e37cbd3bfc0be09d0b54aa38f1648f1",
+ "sha256": "1zdvnhl8v3ivqxdz0xdaayxsw282xb6m2n6gv0jm2ahi5s63z5l0"
}
},
{
@@ -91628,11 +93598,11 @@
"repo": "malsyned/smart-dash",
"unstable": {
"version": [
- 20200104,
- 1620
+ 20201202,
+ 1616
],
- "commit": "9db5c6bb4a51457281588523a2725939a31d3f26",
- "sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr"
+ "commit": "b4a298572e7acc3f39a908997fdcfa356bac0591",
+ "sha256": "1lkld9g53064wz2m3xxpjpf8vs75fa8kxxnvgpipvzq55sl1j9v7"
}
},
{
@@ -91691,14 +93661,14 @@
"repo": "jojojames/smart-jump",
"unstable": {
"version": [
- 20190925,
- 1518
+ 20201113,
+ 2039
],
"deps": [
"dumb-jump"
],
- "commit": "07800ddd508cf620e6360e4a1f5bb25f8eab3ab1",
- "sha256": "0g6s5v2mpdd06i8yih8c8qj3bz1j1bdnki1937mn5ca163gjlrr9"
+ "commit": "8c6e9bdc86ea492fa618361a56a9784cc923b3e1",
+ "sha256": "0zscn6396bl5g9rdw2p6vv5nf5vgmhx562k9vgb72l5m81lxfvyj"
}
},
{
@@ -91837,11 +93807,11 @@
"repo": "iquiw/smart-semicolon",
"unstable": {
"version": [
- 20171008,
- 133
+ 20200909,
+ 1412
],
- "commit": "bcea2aa37befa40abf8b24a2d2314904e6df43b3",
- "sha256": "0c58ncxwf8wakql2pfiawkl3rlfxsf2zy937nvahf9ygiic8bl3y"
+ "commit": "dd52a3e1a7b043fb88f799827c7b3e39f60a14f1",
+ "sha256": "109iygijidw2wljc9i151zh4r0n6ivrakb2p4zdy9cml7dwk3lzk"
},
"stable": {
"version": [
@@ -91891,19 +93861,19 @@
"repo": "jcsalomon/smarttabs",
"unstable": {
"version": [
- 20160629,
- 1452
+ 20200907,
+ 2025
],
- "commit": "9cc2594b82b03e7d68645a4878f9359f8b8c34c5",
- "sha256": "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx"
+ "commit": "1044c17e42479de943e69cdeb85e4d05ad9cca8c",
+ "sha256": "0hkgw9i4yynazx5vbkb8a1lfp0yndyi8c1w3cf7ajxpnig3hs9j6"
},
"stable": {
"version": [
1,
- 0
+ 1
],
- "commit": "8b196d596b331f03fba0efdb4e31d2fd0752c4a7",
- "sha256": "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z"
+ "commit": "1044c17e42479de943e69cdeb85e4d05ad9cca8c",
+ "sha256": "0hkgw9i4yynazx5vbkb8a1lfp0yndyi8c1w3cf7ajxpnig3hs9j6"
}
},
{
@@ -91932,15 +93902,15 @@
"repo": "Fuco1/smartparens",
"unstable": {
"version": [
- 20200324,
- 2147
+ 20201128,
+ 2212
],
"deps": [
"cl-lib",
"dash"
],
- "commit": "555626a43f9bb1985aa9a0eb675f2b88b29702c8",
- "sha256": "0hfywwhzv2dphi7gacp1sdyk47cmajzx5sqrcwxkn7mlwx876nsx"
+ "commit": "b8bdd9265e6950e038bbcd68ead5582c6964baf2",
+ "sha256": "1dlyp801fw3cmpi6ks3sq1kpz3wqzgh4i114pn333hifgbzl5p23"
},
"stable": {
"version": [
@@ -92068,8 +94038,8 @@
20200323,
533
],
- "commit": "a0e9bc2ea694aa2940102e1f4cfd8db8be437931",
- "sha256": "05n6vgxw91cxk5ri4mmsxc62jcad0yhjjnn16gk1qhjxjqvrlcis"
+ "commit": "0cfe0ff083d55bb90c6dfaf1dc930500099c4d5c",
+ "sha256": "0vz4fnni2qjghmy040m37xw1p5rlmjljgmzvwrz3gh896kwk48b5"
},
"stable": {
"version": [
@@ -92275,28 +94245,28 @@
"repo": "kyleam/snakemake-mode",
"unstable": {
"version": [
- 20200720,
- 349
+ 20201109,
+ 315
],
"deps": [
"cl-lib",
"magit-popup"
],
- "commit": "44b88fc2aff7c970c2699de2d8615d81092342f6",
- "sha256": "0538bfjaj19s5fa94x3s0np4jj7cw2wc77yngxk809h8bb82s7ba"
+ "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393",
+ "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm"
},
"stable": {
"version": [
1,
- 7,
+ 8,
0
],
"deps": [
"cl-lib",
"magit-popup"
],
- "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76",
- "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2"
+ "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393",
+ "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm"
}
},
{
@@ -92523,14 +94493,14 @@
"repo": "hlissner/emacs-solaire-mode",
"unstable": {
"version": [
- 20200812,
- 1552
+ 20201006,
+ 22
],
"deps": [
"cl-lib"
],
- "commit": "cd63b675140232f399e7733d7ce95a0b931b1058",
- "sha256": "0c7l1q7xyzvxqlk7vawfrx7gmzsmycjy2lib12wmgvfh83bgc3bh"
+ "commit": "c697925f7e03819a4046a233f6ab31664aca9d6a",
+ "sha256": "1fwyranv159sgfsc07h7vjn7c2js95zk2hw06d1dr1ddnl5hgrvf"
},
"stable": {
"version": [
@@ -92553,14 +94523,14 @@
"repo": "bbatsov/solarized-emacs",
"unstable": {
"version": [
- 20200717,
- 1054
+ 20201207,
+ 1431
],
"deps": [
"dash"
],
- "commit": "63eb59a7ef32abc6780883e27df69a6e42a8a6e4",
- "sha256": "1hqqmji6vh468w73xi3fvkyzznr27f83czz0pcxzb00q62cbdqf4"
+ "commit": "67f261c7b3d1a041e5c8964df680f8132703fc17",
+ "sha256": "03x5p135i2rshsvvsls2pl70mslzifzfznd310wiqgscg7vja1wy"
},
"stable": {
"version": [
@@ -92632,6 +94602,30 @@
"sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8"
}
},
+ {
+ "ename": "solo-jazz-theme",
+ "commit": "c3f81983a08589c735ad7dfe2deb2ce3ee9ebd45",
+ "sha256": "0jj8bvgj8v2kxnrrzkw8v1f76gycf1hqgajsx65asccahvzbzv9j",
+ "fetcher": "github",
+ "repo": "cstby/solo-jazz-emacs-theme",
+ "unstable": {
+ "version": [
+ 20201106,
+ 1640
+ ],
+ "commit": "3a2d1a0b404ba7c765526a1b76e0f1148ed8d0f2",
+ "sha256": "00fs6ylz29p7fsqvc7jgdbbsakkkvf27w3cxg0rlja87m7628khs"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 6,
+ 0
+ ],
+ "commit": "16a943f8ea86e0dbf737a8c1e779b3002e6e140b",
+ "sha256": "0crfnpxh32lg2f3crv92j81ylc0h15hkhgbyg708wzlv2bjrxibh"
+ }
+ },
{
"ename": "somafm",
"commit": "6003d09cefb7da19baa39b6c4a96d265844abbce",
@@ -92648,8 +94642,8 @@
"dash",
"request"
],
- "commit": "9fdb75e150e78170b3ca7863a8a0638c6ecc0fc0",
- "sha256": "0qvr4cga8k4bn0jbfp626cjkxgvqkac902v7hxakj7l47arxcd5z"
+ "commit": "918e7c876f26f74ab21b585de2607819e9e74c08",
+ "sha256": "1a2bsz5b9mz5wxj5bf4k79ddjln987k8s2d12q8fifq5pnj1gp26"
}
},
{
@@ -92696,14 +94690,14 @@
"repo": "mtreca/emacs-theme-sorcery",
"unstable": {
"version": [
- 20200413,
- 2242
+ 20200929,
+ 1001
],
"deps": [
"autothemer"
],
- "commit": "fb041d0d8d4ae2840ddcfb1bd56fefe687da8c52",
- "sha256": "1j54m18xsn44m5xshmk2pfxn795svjn0zv77qwfxn1d2p5j0r6ni"
+ "commit": "d438fe3f985f19ad0f7244ca780e474df8f31ce5",
+ "sha256": "01qpdp14vzlq3pzbw14ri1gwmw32lkijxsv1mn6b39m0xmsimnkj"
}
},
{
@@ -92753,14 +94747,14 @@
"repo": "emacsattic/sos",
"unstable": {
"version": [
- 20200510,
- 1734
+ 20141215,
+ 403
],
"deps": [
"org"
],
- "commit": "6c25beae9f6db8fc7a037112ad5d4be9f5f36986",
- "sha256": "1ia90sanqbigpag63w953kvfd1gyaakcvh65fsd79pcx4k38p4ly"
+ "commit": "1573adca912b88b5010d99a25c83a5b2313bd39c",
+ "sha256": "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p"
},
"stable": {
"version": [
@@ -93052,8 +95046,8 @@
"repo": "TheBB/spaceline",
"unstable": {
"version": [
- 20191230,
- 1221
+ 20201016,
+ 1043
],
"deps": [
"cl-lib",
@@ -93061,8 +95055,8 @@
"powerline",
"s"
],
- "commit": "1b26af2c1a701481ac5d90928fe0200e389756c3",
- "sha256": "11lwckqcgzsahrkkm5wk1ph4kc7d4yz05r7251g8c9f0q6vdj9dp"
+ "commit": "50cc5b26d823bbfd347becd7da03cd29c2a2a0dc",
+ "sha256": "0yyq8jppsa95m78fr7kfixl20qi8zpgkla64sv1a0v8x42nws02p"
},
"stable": {
"version": [
@@ -93122,11 +95116,11 @@
"repo": "nashamri/spacemacs-theme",
"unstable": {
"version": [
- 20200808,
- 1859
+ 20200825,
+ 1818
],
- "commit": "462ef2ac16ab8c51de21d5f3d2b1b6122b314391",
- "sha256": "1qhvf0xf58cm4x8wij1l6301q1y6jp8j7i61g8lizlb24f7fla9l"
+ "commit": "1f5b03254de6bfa9645711f2b79781f5cca8d203",
+ "sha256": "04x8x557va2nsl1wginvaq9ha9wfk8l45dgs88sxm60jyrci802x"
}
},
{
@@ -93219,6 +95213,21 @@
"sha256": "0hqp8r24wvzrkl630wbm0lynrcrnawv2yn2a3xgwqwwhwgva35rn"
}
},
+ {
+ "ename": "spatial-navigate",
+ "commit": "143e50e99f84cc7f0c9d0597b30c40609ac86dbb",
+ "sha256": "01w8sjygng0bkkwnfqbyhpd1aa6yls95293mnpdfipwa0zy3rivl",
+ "fetcher": "gitlab",
+ "repo": "ideasman42/emacs-spatial-navigate",
+ "unstable": {
+ "version": [
+ 20201115,
+ 1006
+ ],
+ "commit": "03bf203854f80b6a98a8098e4aed08f585cb1d71",
+ "sha256": "186qn9zbj4izvkhqwygv65rcx050wvi849ffmdw5l7bizd0m0zr6"
+ }
+ },
{
"ename": "speech-tagger",
"commit": "db80aa5d95846ee02a9d762aa68325ab5e37dcf7",
@@ -93298,14 +95307,26 @@
"repo": "ukari/speedbar-git-respect",
"unstable": {
"version": [
- 20191121,
- 2120
+ 20200901,
+ 246
],
"deps": [
"f"
],
- "commit": "4703650c20cb77f08833747529b55be13d450bae",
- "sha256": "0qb2azx3blm8iz0y5f8p5zxkbmx6pjzxwpfzg64qi3741xijv8lw"
+ "commit": "dd8f0849fc1dd21b42380e1a8c28a9a29acd9511",
+ "sha256": "0pzml057q2sswjfzd95i2acy50gpczfjbydivl4h5zkbpxgzhrw8"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 1
+ ],
+ "deps": [
+ "f"
+ ],
+ "commit": "9663b7d71385041fdd7488d74d54cb6c4e05b74a",
+ "sha256": "03cgy2yczmy186kzjj3qipr181zw83aarhk5w0gisvl7h7w0blj0"
}
},
{
@@ -93331,11 +95352,11 @@
"repo": "ideasman42/emacs-spell-fu",
"unstable": {
"version": [
- 20200623,
- 307
+ 20201006,
+ 1441
],
- "commit": "e94d01cdc822e02968971cde09276047a5d55772",
- "sha256": "0fph3l2cpis9k09d6yhl8rv9yb727ayqq6qw6pbmxmn687xmxx9q"
+ "commit": "a7db58747131dca2eee0e0757c3d254d391ddd1c",
+ "sha256": "05f58nz2bhb5bzy06glpv7pjfqpalv5pyggm43zsh1kl2pxwzb9a"
}
},
{
@@ -93737,17 +95758,17 @@
},
{
"ename": "sql-sqlline",
- "commit": "0fd21ac42207156f7300f4ab6ac082c801740daf",
- "sha256": "1b5jkdajif0yc558nv29y8vimnj6bq52z2m91qj6mplcbgpdrnn6",
+ "commit": "6fd01687e84065e33885927055c5c1e05da61955",
+ "sha256": "12nwvfj702gg06fxcjg8g283lj8q7ydq28k6qv1x6gmip7jsc1q8",
"fetcher": "gitlab",
- "repo": "matteo.redaelli/sql-sqlline",
+ "repo": "matteoredaelli/sql-sqlline",
"unstable": {
"version": [
- 20191028,
- 939
+ 20201102,
+ 1508
],
- "commit": "990c79b7ebbf8ecb1e1161c9a942973efd8e2833",
- "sha256": "0jl13ymbb0yxvkqipw821wq797izzj5j72vzdc5d30dwdd2wxm83"
+ "commit": "38baf140cae26f9d93fc45d5eaff7d5c7f050bff",
+ "sha256": "1parczkwng2bfqmnj19dc4rmm69srvv1wysf0258xkdcb3kvppzx"
}
},
{
@@ -93799,11 +95820,11 @@
"repo": "pekingduck/emacs-sqlite3-api",
"unstable": {
"version": [
- 20200710,
- 1432
+ 20200916,
+ 132
],
- "commit": "e5b14b03183cde855059084eba425428ec4618c1",
- "sha256": "1r7hs23xa2yhr0rbgdhxid8gg4fwhrk2wjrk1scrp37aj2szwpjm"
+ "commit": "95abc25cc67d652ce2ba79907224e581aef62e93",
+ "sha256": "1kx2ik7k0ads71r2xq4c8jkk460m44prggiiskj1g88yxx0rnqkj"
}
},
{
@@ -93908,11 +95929,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20200817,
- 549
+ 20201129,
+ 2137
],
- "commit": "1588f720ecd7f69a7972d5c9e113975af045c813",
- "sha256": "136zx2sr0n4lb396vpz5nq60zjc3cav4kpx8r5h3nzgnmamqz61b"
+ "commit": "22657a98d4cd7d0690dac0d437a27ec3eef6f1df",
+ "sha256": "0jdl6raw9nyylfdla40xlzxcacfk5nv4hr8279djyd68sjn62gbd"
},
"stable": {
"version": [
@@ -94025,11 +96046,11 @@
"repo": "jhgorrell/ssh-config-mode-el",
"unstable": {
"version": [
- 20200503,
- 2042
+ 20201103,
+ 334
],
- "commit": "8fda737131fef2e55c4965a938cf907acbf03372",
- "sha256": "1cjcav28a6bw8h8axx5ms2cacdqcjv6imb4pj4r4zx08jd4nljdk"
+ "commit": "87e61e92501c1a976c37c0bb874f1929e2b7e7e6",
+ "sha256": "01z3wf2v8r584gdw6l05cvv344l6acarb57lm59m4y2kqqkw85jc"
}
},
{
@@ -94040,11 +96061,11 @@
"repo": "cjohansson/emacs-ssh-deploy",
"unstable": {
"version": [
- 20200306,
- 1012
+ 20201006,
+ 1213
],
- "commit": "1bb2f821d4a78d483c147759348a29531486cdc4",
- "sha256": "1d79lgl7082fkawl08qlykc7x75whdikk899fv5shbbrwp7hq3l3"
+ "commit": "cc91b56a7f07ae63fcf78a040001491d040ec9ba",
+ "sha256": "10banrq8p0v10237yy2f04i0vvpjdz0by9cp92ambw94c3l3ii8f"
},
"stable": {
"version": [
@@ -94101,20 +96122,20 @@
"repo": "stan-dev/stan-mode",
"unstable": {
"version": [
- 20200221,
- 2025
+ 20200830,
+ 1032
],
- "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
- "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
},
"stable": {
"version": [
10,
- 1,
+ 2,
0
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
}
},
{
@@ -94125,28 +96146,28 @@
"repo": "stan-dev/stan-mode",
"unstable": {
"version": [
- 20200221,
- 2025
+ 20200830,
+ 1032
],
"deps": [
"stan-mode",
"yasnippet"
],
- "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
- "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
},
"stable": {
"version": [
10,
- 1,
+ 2,
0
],
"deps": [
"stan-mode",
"yasnippet"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "2dd330604563d143031fc8ffd516266217aa1f9b",
+ "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry"
}
},
{
@@ -94164,8 +96185,8 @@
"f",
"s"
],
- "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60",
- "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25"
+ "commit": "92460e21f964cb7495d974c42acd0b726af3fbcb",
+ "sha256": "1vxgg1gs2ma2c121dgqg9vnzcacb7dxdkxlwdxg0dkivnqicxiyg"
},
"stable": {
"version": [
@@ -94192,8 +96213,8 @@
20171115,
1731
],
- "commit": "cf84b14066d63694d931395c6026fd0245d8a62b",
- "sha256": "0dbcaz3faw8knx91yjsrb988sn2d9k0i5byhs1bi1ww36y6hmgs6"
+ "commit": "76cc8122a39a3ef5947d706377b007ef53a354fe",
+ "sha256": "034h6mrz8nh42k3dsw7lcaackg95xqa9khkdwl6pj0i3z4rhgph8"
}
},
{
@@ -94336,8 +96357,8 @@
20200606,
1308
],
- "commit": "333e9e434cec9aa2f887083cdf2cefcaa316f438",
- "sha256": "1q058qav0al8mb6f3f3jc4mnzlvhlis9dllchw3flw3gx57qcrx5"
+ "commit": "93c90734d7073bc68285dca5e450034f96376703",
+ "sha256": "022avhxsw50zs4i901zj56w15fzkpfgcwj8mr40lmbcmb6q7bbj0"
},
"stable": {
"version": [
@@ -94486,20 +96507,20 @@
"repo": "akicho8/string-inflection",
"unstable": {
"version": [
- 20200517,
- 115
+ 20200927,
+ 747
],
- "commit": "1937db7513db570606ea8798916180b7dd75d3b1",
- "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl"
+ "commit": "c4a519be102cb99dd86be3ee8c387f008d097635",
+ "sha256": "0f3nkfdpngax4zfw75jca2wywwh31ha6ywddh4125lbxi3y6m7s9"
},
"stable": {
"version": [
1,
0,
- 11
+ 12
],
- "commit": "1937db7513db570606ea8798916180b7dd75d3b1",
- "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl"
+ "commit": "c4a519be102cb99dd86be3ee8c387f008d097635",
+ "sha256": "0f3nkfdpngax4zfw75jca2wywwh31ha6ywddh4125lbxi3y6m7s9"
}
},
{
@@ -94671,6 +96692,21 @@
"sha256": "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n"
}
},
+ {
+ "ename": "su",
+ "commit": "f48d82af18e7e3caa1e7c51670e7009c2168fd4e",
+ "sha256": "05261i2hfzjalhbz9sbg7r44brbmvk08wg9b3924hi5bwran0bc3",
+ "fetcher": "github",
+ "repo": "PythonNut/su.el",
+ "unstable": {
+ "version": [
+ 20200820,
+ 57
+ ],
+ "commit": "eadfacdbcb8d54d83f6f6cfe7990b492f7217453",
+ "sha256": "0xwkkzs4pl3wgjq7n43klkh814h3kzh0mwnka07dbb0gv1xmaigl"
+ }
+ },
{
"ename": "subatomic-theme",
"commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
@@ -94756,14 +96792,11 @@
"repo": "zk-phi/sublimity",
"unstable": {
"version": [
- 20200816,
- 854
+ 20200905,
+ 1730
],
- "deps": [
- "cl-lib"
- ],
- "commit": "133ac118eaa51cce81978ed78abba6aa8d427577",
- "sha256": "0sqjdrzsp7pf1wj14vcr322n8fydjzzii4msdvlhj0xr3xhl0469"
+ "commit": "8e2ffc4d62194106130014531e7b54fc9b4b9e6c",
+ "sha256": "0lx0kyzsjn9dhahyi3smcg6hykralrn09mnnn8x74mbpdv4alwrv"
},
"stable": {
"version": [
@@ -94920,11 +96953,11 @@
"repo": "mvarela/Sunburn-Theme",
"unstable": {
"version": [
- 20180602,
- 1929
+ 20201203,
+ 1732
],
- "commit": "ddb01b6f1f4f823398f7f8e08900c2b4a7811d3b",
- "sha256": "18qfcrr4xlwwhhaq7dwh31bbl84a53akgrw2c6lynnyyi4vk2wpq"
+ "commit": "cf2faed6fe96a8af18b1bc2121937cfb3a84018d",
+ "sha256": "1l2bai0dqhn763psavnraamyb4kvhw6r6g3hf4q6b6821h70b05k"
}
},
{
@@ -94968,20 +97001,20 @@
"repo": "tlikonen/suomalainen-kalenteri",
"unstable": {
"version": [
- 20190310,
- 910
+ 20200830,
+ 1107
],
- "commit": "c8c03fe9bae57d4e15c287aef4f98911a3529240",
- "sha256": "1n4nz309rr1cpx1c5aighakpcmrbzzg2xprh5hi4kln0rngggycp"
+ "commit": "5b209ff7b7d3dcd09b623915aba1e137c875fa0e",
+ "sha256": "0ym0rfyrnj4f6c6nhz0yfvl1n1fsdb2n20gksw4blqg94ccafqh1"
},
"stable": {
"version": [
- 2017,
+ 2020,
8,
- 1
+ 30
],
- "commit": "c702e33cb6e13cb28bd761844e95be112a3c04f3",
- "sha256": "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"
+ "commit": "99fd77d25fc12c0a9f1fc75f0b83b31774d493bd",
+ "sha256": "12b2534cz9qqc923cf4nj76gmx3l19wrqmha077rlgl5pqlgqh6b"
}
},
{
@@ -94992,11 +97025,11 @@
"repo": "bbatsov/super-save",
"unstable": {
"version": [
- 20190806,
- 915
+ 20200930,
+ 1634
],
- "commit": "279aa8e0103d6bd367619b7f57f9d60d7a3c5cfd",
- "sha256": "14x3w6czyrw48bw7cfkdyv51jksf67nznv9wyp0hb4hrjdxaq1aq"
+ "commit": "886b5518c8a8b4e1f5e59c332d5d80d95b61201d",
+ "sha256": "1w62sd1vcn164y70rgwgys6a8q8mwzplkiwqiib8vjzqn87w0lqv"
},
"stable": {
"version": [
@@ -95061,11 +97094,11 @@
"repo": "leafOfTree/svelte-mode",
"unstable": {
"version": [
- 20200816,
- 354
+ 20201009,
+ 831
],
- "commit": "5db0451429d4bf68f5dd131837faa6eb601a631d",
- "sha256": "1ffr9yzxr1z8xmvl0lf7nfp9gjp79zps556d3kni45dbnkdi0z1h"
+ "commit": "2a19e0aeea9dd90388d86d6adf2339c9c94b73e8",
+ "sha256": "17xdsgzjd4ys79053nmsfvhmx8c78zizka7hbka4y1j92lqm33gz"
}
},
{
@@ -95098,6 +97131,21 @@
"sha256": "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic"
}
},
+ {
+ "ename": "svg-tag-mode",
+ "commit": "430d86db7bfc43f9d41fe34d19a3ca48f8efb2be",
+ "sha256": "06mq4va7m46i7y2b4hc3fpkmjy5x3g2j0bpjyvianhcyhwyxfafs",
+ "fetcher": "github",
+ "repo": "rougier/svg-tag-mode",
+ "unstable": {
+ "version": [
+ 20201129,
+ 608
+ ],
+ "commit": "87489d28450559078aa15b4a435143a297508e48",
+ "sha256": "0gyhmv60dx0zxx4bmhzsd7q5vfnkpfwlj6539bn272fwcr7zncp8"
+ }
+ },
{
"ename": "svnwrapper",
"commit": "cb43431d7a7276cdf1ea741b2b218bc46c2722f9",
@@ -95236,16 +97284,16 @@
"repo": "danielmartin/swift-helpful",
"unstable": {
"version": [
- 20200701,
- 2005
+ 20201031,
+ 1654
],
"deps": [
"dash",
"lsp-mode",
"swift-mode"
],
- "commit": "2c8c9cda5ed9d9e96bb3a39c6d0905a15dd9e2e6",
- "sha256": "1kq4jxhig6bg4cifggy06a6ydksg68nr2gbnxn589znacxbs0iy9"
+ "commit": "b609fd94ae66832d41fcb70709042c19ef37879f",
+ "sha256": "09q46ip155wkdz1vp4vsal1lhfzgm4lz052b0q6vdgfz4k8ncbz7"
},
"stable": {
"version": [
@@ -95269,26 +97317,26 @@
"repo": "swift-emacs/swift-mode",
"unstable": {
"version": [
- 20200606,
- 730
+ 20201128,
+ 1029
],
"deps": [
"seq"
],
- "commit": "d266fbd300a1bf1592e1462ead4be093b8b68f98",
- "sha256": "0l3i74acv1msmbfkn99mz9g73kd7j1a7j0b082vcxw6kr69476yc"
+ "commit": "0bc8d8d80736d6d874edf8f59c0b37618368b183",
+ "sha256": "1srbbpp7dqzpfjk0a5l6li749qzwpb1vbqbf5jwiy7h99y43fa4q"
},
"stable": {
"version": [
8,
- 0,
- 2
+ 1,
+ 1
],
"deps": [
"seq"
],
- "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff",
- "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592"
+ "commit": "e65a80a659c74d0a62b00dff183a0f7fc8385ce1",
+ "sha256": "18i6m2zys0nc9j29f7bkzjcfp7rcaycr473ykhprsfikfcgwkj3y"
}
},
{
@@ -95353,14 +97401,14 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200503,
- 1102
+ 20201208,
+ 1419
],
"deps": [
"ivy"
],
- "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
- "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f",
+ "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6"
},
"stable": {
"version": [
@@ -95454,11 +97502,11 @@
"repo": "dimitri/switch-window",
"unstable": {
"version": [
- 20200502,
- 511
+ 20201019,
+ 823
],
- "commit": "8710f6304d843365fb59b6efe7e1f729d14e557c",
- "sha256": "1v8qx519dwhpwg9ba08nl3kp329n3p1dbjj7iiiwmn22580nrkqh"
+ "commit": "5bba78073bc18197392f4d86eb1fe284f906219c",
+ "sha256": "1slrimhdl7frncsszpa8m17j2y11zbr3dwqvsmkayy85sfiq5345"
},
"stable": {
"version": [
@@ -95600,16 +97648,16 @@
"repo": "bgwines/symbol-navigation-hydra",
"unstable": {
"version": [
- 20200811,
- 655
+ 20201205,
+ 1846
],
"deps": [
"auto-highlight-symbol",
"hydra",
"multiple-cursors"
],
- "commit": "20a63121695452e39f1a3c9bfea1e313359c5f1e",
- "sha256": "08fs5wr9p2rbwlydx2xmwqmvzr6q05fg4dji6wdf40dn3pb5w78g"
+ "commit": "9bbea3931348a69b3a05621296a7b096d7588456",
+ "sha256": "01n8q7pdmxq0lfianhywm94326x56v93bh03yr8s402y1i9ggca3"
}
},
{
@@ -95620,22 +97668,25 @@
"repo": "wolray/symbol-overlay",
"unstable": {
"version": [
- 20200809,
- 2023
+ 20200828,
+ 425
],
"deps": [
"seq"
],
- "commit": "f2734ce633c2b498d3ea70042a3ae9f93f9f046a",
- "sha256": "1n1a2jldshfyyyxc3msr16fzczjlpglzdy7ab4qpyyz6ghklaqys"
+ "commit": "39f772b531117edba596e7a1210b3dbb87d56adb",
+ "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2"
},
"stable": {
"version": [
4,
- 1
+ 2
],
- "commit": "d1464042783e252f5cac1fcac82fee16fc3534db",
- "sha256": "0d5ir4f3xmz3kr0w93zw45ha4hzz4rvldiza3q9fmqm7m1w2c995"
+ "deps": [
+ "seq"
+ ],
+ "commit": "39f772b531117edba596e7a1210b3dbb87d56adb",
+ "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2"
}
},
{
@@ -95652,8 +97703,8 @@
"deps": [
"f"
],
- "commit": "cd344b6c2cb6a8fcf061af2c85441644a4e7a006",
- "sha256": "193lq58mhkq0rrinkaxiyhkk60qf7q0gx03na2968zcrahrd8w75"
+ "commit": "c254ec56e83a5d9de04df0856248723cf6d4be50",
+ "sha256": "1vlfzg89ygynw0dxxbsd40wky2k14vapdxb50kdgk2h4yszppzas"
},
"stable": {
"version": [
@@ -95672,8 +97723,8 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20200526,
- 211
+ 20201205,
+ 2143
],
"deps": [
"cider",
@@ -95687,16 +97738,18 @@
"lispy",
"paredit",
"racket-mode",
+ "seq",
"slime",
- "smartparens"
+ "smartparens",
+ "undo-tree"
],
- "commit": "b35e3622601ca5b27bb8e1b7ab301cc6dd674a62",
- "sha256": "118s8xxas5nmj181p7mf9lsal7jl0pkph3gs1gyr0x6c5y93b1ci"
+ "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6",
+ "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq"
},
"stable": {
"version": [
0,
- 7,
+ 8,
0
],
"deps": [
@@ -95711,11 +97764,13 @@
"lispy",
"paredit",
"racket-mode",
+ "seq",
"slime",
- "smartparens"
+ "smartparens",
+ "undo-tree"
],
- "commit": "8209d63d88b596e5e4ed66c56085c978f33acda5",
- "sha256": "0l0pb9d5q84wv4jiappm3wi800dslv9ciq9rla0mrv4xb2lhf3pp"
+ "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6",
+ "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq"
}
},
{
@@ -95849,14 +97904,14 @@
"repo": "emacs-berlin/syntactic-close",
"unstable": {
"version": [
- 20200408,
- 1148
+ 20200909,
+ 1320
],
"deps": [
"cl-lib"
],
- "commit": "c21ffdf6a2f8c2a83d3efc729852cd2b09fe03a6",
- "sha256": "1m6y7njkn5vibgnr3pnh6nci75j2ksr93ajp01jwpxxxc0wmipa8"
+ "commit": "fbeb5c03b3ba94d7302c541ae7281a84de02b499",
+ "sha256": "1cwfnj0n64q632ldarhf2pg6nvkmw3hldb6kf60b96karp1qsrrc"
}
},
{
@@ -95891,11 +97946,11 @@
"repo": "jpkotta/syntax-subword",
"unstable": {
"version": [
- 20160519,
- 1905
+ 20160205,
+ 2154
],
- "commit": "ad0db0fcb464652a1d3408f525dee9293ce2b70c",
- "sha256": "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x"
+ "commit": "9aa9b3f846bfe2474370642458a693ac4760d9fe",
+ "sha256": "15zvh6dk02rm16zs6c9zvw1w76ycn61g3cpx6jb3456ff9zn6m9m"
},
"stable": {
"version": [
@@ -96265,11 +98320,11 @@
"repo": "tmalsburg/tango-plus-theme",
"unstable": {
"version": [
- 20200423,
- 804
+ 20201103,
+ 903
],
- "commit": "1e9484bb392bb0aad2be159505c502320f8d0a5c",
- "sha256": "1819s9c0nm4pkgcpxqnr20075krq30qn6hpg4zl54cnrxbfbiq9f"
+ "commit": "07ee34725bc19fc1679effb262a014dbc6311aa2",
+ "sha256": "1flm1vq5fxmix0y6vnikbqr2v4q4idvzj26ilgq7pgx3m9d2q0gi"
}
},
{
@@ -96280,11 +98335,11 @@
"repo": "juba/color-theme-tangotango",
"unstable": {
"version": [
- 20170924,
- 1509
+ 20200907,
+ 729
],
- "commit": "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144",
- "sha256": "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z"
+ "commit": "2293311166308a76bda691898b6952921bb95da9",
+ "sha256": "1964h3sgd5pzh58i1gjawhlpqfli2n183n9c55y8klb5i3kbf32h"
}
},
{
@@ -96319,11 +98374,11 @@
"repo": "saf-dmitry/taskpaper-mode",
"unstable": {
"version": [
- 20200701,
- 1436
+ 20201207,
+ 1629
],
- "commit": "5ded73ae13d58ab0bbd52ac7556ff29e114a96d6",
- "sha256": "00bvjrbcqalwlw1lc883p8l7szb9qniqp120pwd6hgyvgpr7h3s1"
+ "commit": "d80c86c0842f77ba524867bf9e53b28a8627a665",
+ "sha256": "10rjnfqqgzbmzmfrgyqrx3hnrxr57knq8698azfyc46jvysrfhy3"
},
"stable": {
"version": [
@@ -96367,8 +98422,8 @@
"deps": [
"cider"
],
- "commit": "8dfb4f92db2d8598ba809636a82d210c378b4845",
- "sha256": "1sdi1rr9xq7spps5hagzs8irfljxmbd5y3hh4jiyvn54cwicg3g8"
+ "commit": "331e14b838a42adebbd325f80f60830fa0915d76",
+ "sha256": "1jpig982z0lbbnv2167q4lfv8dhhpg698gi6i7184lrjxr7dxqw7"
},
"stable": {
"version": [
@@ -96432,11 +98487,11 @@
"repo": "kanchoku/tc",
"unstable": {
"version": [
- 20181109,
- 428
+ 20201022,
+ 1646
],
- "commit": "cb3403fb134dc62d8a48253027891785849cff31",
- "sha256": "14q01mar66x3bv0ghfws0pv3qrpg9szgzb99ql3qfhbnkw0m859d"
+ "commit": "5c6bbb0ff08e5d81e905198156ae5600df7ff7ab",
+ "sha256": "0n78aiwdkb7k8hj1cxg2gawlgq228vi2v0fyjicry6l4i1p4d1ds"
}
},
{
@@ -96483,8 +98538,8 @@
20181231,
640
],
- "commit": "3aae07c71249de616d42fed7fa2585c4fa6f25c6",
- "sha256": "0l3mhn8m96d9mxs9kkp6clj5qzns5dw9w628kf9ibwbbc5fq01aa"
+ "commit": "2122e4b32ed4edd2d7ebc0ff8ebf407e29d6e910",
+ "sha256": "0pz41xkb0wz3kcn08ikn4wn9ywnaf3rpvmxsqz9bjpqnc6l8vni1"
}
},
{
@@ -96510,15 +98565,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20200814,
- 1652
+ 20201206,
+ 1235
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "9594ebcb0f605e5b01bc4ec6d1bd1b6470002bc0",
- "sha256": "0hm6yvr4ygkcycw850sd4lcwmrr49s88nhan08hal0xylzazlq24"
+ "commit": "223e56eee186f4403b03196b3191f0c0d4353dce",
+ "sha256": "1jmyc6kask9ja07gqzi0rq6lrlj1hm85v7q6x4llbqch7ngb04l6"
},
"stable": {
"version": [
@@ -96590,6 +98645,39 @@
"sha256": "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9"
}
},
+ {
+ "ename": "teletext",
+ "commit": "bb8c8385f8214a47dadf6a3e6f614cb98949095b",
+ "sha256": "05q8jq5pcrchp33pd43f8lf8sf67m1mj2a8qn2ly0ci0885gif6i",
+ "fetcher": "github",
+ "repo": "lassik/emacs-teletext",
+ "unstable": {
+ "version": [
+ 20201019,
+ 700
+ ],
+ "commit": "e674ff636e9d15cade171ef432aaeead8109dc48",
+ "sha256": "0ws2b1kmhrbnhmy2ld7kjkximqpbb8cdcpvz33638ylcvb46vd1x"
+ }
+ },
+ {
+ "ename": "teletext-yle",
+ "commit": "bb8c8385f8214a47dadf6a3e6f614cb98949095b",
+ "sha256": "10ykpz4n6ir68idx0878fbw8x7fwj1qsj29kqd4alpfikdw2z4cp",
+ "fetcher": "github",
+ "repo": "lassik/emacs-teletext-yle",
+ "unstable": {
+ "version": [
+ 20201019,
+ 756
+ ],
+ "deps": [
+ "teletext"
+ ],
+ "commit": "c5ba744191eb35b6877863b31bc00e6e9a264927",
+ "sha256": "11rck07k0fz1rflzwb8b9h7kc7xsgq6q8nhxfnb0pswd58dnrxiv"
+ }
+ },
{
"ename": "template-overlays",
"commit": "8856e67aae1f623714bc2a61a7b4773ed1fb2934",
@@ -96616,20 +98704,20 @@
"repo": "clarete/templatel",
"unstable": {
"version": [
- 20200818,
- 241
+ 20201206,
+ 302
],
- "commit": "796021c2964a5bfbba7abf7f339f970bbedc3aab",
- "sha256": "1yv85ik2slaibnajsfns1icliw0qyqw871jxdklav918lic9fia0"
+ "commit": "8c4ba0d5db5280a78d94bb1cc3dbd2f1abd37e9e",
+ "sha256": "177m72c2gdmp2jq55z1sgff8izpv39n1s7qsin2bfl4p9ccwywmr"
},
"stable": {
"version": [
0,
1,
- 1
+ 3
],
- "commit": "6785b487aaa6bbab3cffcf74e9f596c0058c1b18",
- "sha256": "1qdjbbr6mq2ib8aan5hb47vdj2s50yxfidmjyfyyms28qpi3524g"
+ "commit": "8c4ba0d5db5280a78d94bb1cc3dbd2f1abd37e9e",
+ "sha256": "177m72c2gdmp2jq55z1sgff8izpv39n1s7qsin2bfl4p9ccwywmr"
}
},
{
@@ -96957,9 +99045,9 @@
},
{
"ename": "terminal-toggle",
- "commit": "673974fe768f88a7c67c929bb6b9b27fc028d4e2",
- "sha256": "0l1gklcgas2g0kx5q59dzhv20pki5hxv4h3rsbrwbpq5rxkxymbx",
- "fetcher": "github",
+ "commit": "2db07414d2d39b2d40a2ae91491032844b82d801",
+ "sha256": "09cn0zcimxzfgq31vwwwvaqbqhkcl7mbz5pz4kvzh3vs77ck2mmk",
+ "fetcher": "gitlab",
"repo": "mtekman/terminal-toggle.el",
"unstable": {
"version": [
@@ -97103,14 +99191,15 @@
"repo": "emacsorphanage/terraform-mode",
"unstable": {
"version": [
- 20170112,
- 517
+ 20201208,
+ 1827
],
"deps": [
+ "dash",
"hcl-mode"
],
- "commit": "2967e7bdc05d15617e121052f6e43c61439b9070",
- "sha256": "0f8p3ns0xw1p64jm22q4pf0ajmb5vp2ppl4qvgxvyna6cvcmw4k5"
+ "commit": "a9fa5bdaf58e9cae32ee44b7d0883f5600441b05",
+ "sha256": "12v8mldxpa32v63zg4y3c7dihbw4v5agy3kd9rpiyymf6z0pcad5"
},
"stable": {
"version": [
@@ -97376,8 +99465,8 @@
"deps": [
"tablist"
],
- "commit": "3c20cb76ccd7951eda0b5f076cd79e42f71e7220",
- "sha256": "0pwx1cxc1d2hx823520b5a942nhl5w8alnhlq4kwi869wwzkmxfw"
+ "commit": "6865d7bf772a6ecabacc868e45a0f5a5e197e1a5",
+ "sha256": "1xrw81n3llyr3191mpnr85grhayhkq5cq6g56p52mc4sahmqbqlg"
}
},
{
@@ -97388,11 +99477,11 @@
"repo": "hadronzoo/theme-changer",
"unstable": {
"version": [
- 20171221,
- 1927
+ 20200919,
+ 2307
],
- "commit": "61945695a30d678e6a5d47cbe7c8aff59a8c30ea",
- "sha256": "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn"
+ "commit": "13adb7d0cf0e8dfbb79b0f649d33474ddf4301a2",
+ "sha256": "0f8b81ck229z3gf34ic9v27w776fal16wg17mbiqxzj0pqfl6y9n"
},
"stable": {
"version": [
@@ -97412,26 +99501,26 @@
"repo": "myTerminal/theme-looper",
"unstable": {
"version": [
- 20200410,
- 1757
+ 20201107,
+ 4
],
"deps": [
"cl-lib"
],
- "commit": "eece1cef4483c02402f845d6158b35f6578447c3",
- "sha256": "17slczwsd0av87fq44q9y1w6nvzvjfr2qn1majz5nqxfn55i6x9x"
+ "commit": "6bc170097f1dfb7ea4db91544c5ab653279e15cd",
+ "sha256": "0amm2jw86nyjzrga93n7jhz7p603mid46y41dsw2x8wz2rbh06r2"
},
"stable": {
"version": [
2,
- 6,
+ 7,
0
],
"deps": [
"cl-lib"
],
- "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b",
- "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g"
+ "commit": "6bc170097f1dfb7ea4db91544c5ab653279e15cd",
+ "sha256": "0amm2jw86nyjzrga93n7jhz7p603mid46y41dsw2x8wz2rbh06r2"
}
},
{
@@ -97555,18 +99644,18 @@
20200212,
1903
],
- "commit": "32b109977cbde37bf719c2955ff7dd1e657a6c70",
- "sha256": "0ww3k4yd5bk40r3v1a96mgzhaayqgb0v2kjvxzn10wcybqxf1zqb"
+ "commit": "35d5f61e460a48a7f8e7813a91729a597b938e7a",
+ "sha256": "0xarzygijicc3a5m4vzmhkcrfjawfq3593rwkqdwfg3cgyskkh5j"
},
"stable": {
"version": [
2020,
- 8,
- 17,
+ 12,
+ 7,
0
],
- "commit": "b733bf19c3c68c0aa6d5e0bb7db4321fe13b47a2",
- "sha256": "11kpja52drs4xsja6gyg37rq1681pfgv71cc3lksh2dn6jrn8nbq"
+ "commit": "1aa52cbe490307cab99aaee5ff74e470576d35ea",
+ "sha256": "02z6cjfnq7mvgiw5qj2b0cilm064a6n8f80jsrqn086ikfhf8r1h"
}
},
{
@@ -97622,8 +99711,8 @@
"deps": [
"haskell-mode"
],
- "commit": "137192a2ef6c4f457ddba38a0397570266333854",
- "sha256": "1wwmgzlqih3j8slggmi79xiy811qzlrwjqpd7y37lj508w96qppi"
+ "commit": "efba2f81cbd79f081cc5b84c98215aeb47d071de",
+ "sha256": "1mrhbcr5f4qif7kb1ywz07gvh4g4aafrh9991df6wicddlczrq5s"
},
"stable": {
"version": [
@@ -97646,8 +99735,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20200811,
- 2114
+ 20201031,
+ 539
],
"deps": [
"cl-lib",
@@ -97656,14 +99745,14 @@
"s",
"typescript-mode"
],
- "commit": "f0b6dac4829c3daecf02bf445a5b41b4c68f2911",
- "sha256": "0533kxxl68vsx99b5nwdhy885nl2ad8wc6my38kardmklshjpvj1"
+ "commit": "a43a37bfa23bd482cd96e55c0c39973f83128c57",
+ "sha256": "09c8pqlsi472mvxibh16k1b6398c2lwc4qlcm6irw1gf4w9q0xhj"
},
"stable": {
"version": [
- 3,
- 7,
- 4
+ 4,
+ 0,
+ 2
],
"deps": [
"cl-lib",
@@ -97672,8 +99761,8 @@
"s",
"typescript-mode"
],
- "commit": "1878a097fc41ee81c40c155022c8feaaf8bfaa6d",
- "sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav"
+ "commit": "dafb6befd83e5eea2e2c7f79ab89bc4877001b6d",
+ "sha256": "1n2dihpl53a48jis3l4rry581wpr5lxjd433drlkaa4lqgx8cw67"
}
},
{
@@ -97871,14 +99960,14 @@
"repo": "yyr/tinkerer.el",
"unstable": {
"version": [
- 20170906,
- 1224
+ 20200914,
+ 1756
],
"deps": [
"s"
],
- "commit": "e34135555f3748b578c7f8706dfd0c888fb87581",
- "sha256": "0lzrarqh965ysd7w0z5rbisl45j11fbibyxmgivgy9parvhg59hk"
+ "commit": "7cedeb264a44cd62bcd9c778dca52316d09e07e5",
+ "sha256": "0ym6cxglacclk0sgwbnbswwslf8bs6d0drj89nrabnhad15prxgz"
}
},
{
@@ -98007,8 +100096,23 @@
"names",
"s"
],
- "commit": "923524efe8e6e5e0d269de6bb253b45e02d9a663",
- "sha256": "0bhck6vrb48zxfh5id637mq57k7jv4f2ax0lrhyvr0nw8m0ndqmx"
+ "commit": "92f67c6d270c7c923edcde81a235ed0b49a61a70",
+ "sha256": "0b94ma5ycq5hvmkrwf3yp265dh140bx5dk7dp0r4n9xilpwk7nla"
+ }
+ },
+ {
+ "ename": "toc-mode",
+ "commit": "a6a89db329bf990e95c1a89d1cbea73396308ed5",
+ "sha256": "1c0q0d4rzvkh62p7bg6msmxp2njqvjz73ds4g9kpmc081qvkz2ig",
+ "fetcher": "github",
+ "repo": "dalanicolai/toc-mode",
+ "unstable": {
+ "version": [
+ 20201028,
+ 1141
+ ],
+ "commit": "36fe728f387ab2087e4096cb4734a8642dd7f880",
+ "sha256": "1v3h1aw8p98rhy3mx8nngwl0v0pzk6pabr9mmah20cdgz1j8ax0s"
}
},
{
@@ -98019,11 +100123,11 @@
"repo": "snosov1/toc-org",
"unstable": {
"version": [
- 20190902,
- 1055
+ 20201105,
+ 826
],
- "commit": "5deaec41ed0e5c51715737d7f74c5ae1b3c00387",
- "sha256": "041fpryiz9584m0sl31jz6bs86621mr7lk6pyhiml46n60iccfzp"
+ "commit": "aef220c266f53d36055f74f4a243c6483c563d2a",
+ "sha256": "1gknxlypzgmyi30mdii94018mk5z28xqbla4hb5p1ihhl7p32r1p"
},
"stable": {
"version": [
@@ -98117,8 +100221,8 @@
"deps": [
"cl-lib"
],
- "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b",
- "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv"
+ "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740",
+ "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck"
}
},
{
@@ -98192,6 +100296,15 @@
20130903,
1255
],
+ "commit": "994644f9e68c383071eeee23389a7989b228c2d2",
+ "sha256": "01k03dbvng5rzdvr51wk5xfg3za723qaqwnpd3yh211hknb83k3q"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
"commit": "9633a6872928e737a2335aae1065768b23d8c3b3",
"sha256": "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban"
}
@@ -98394,6 +100507,36 @@
"sha256": "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv"
}
},
+ {
+ "ename": "tr-ime",
+ "commit": "b7ea719d0923650050b252ec0ff6fc8bd7484e99",
+ "sha256": "0py1qq6wnyg3mn0smnrxijvx5spy92cgn0awa0svn375css79kbk",
+ "fetcher": "github",
+ "repo": "trueroad/tr-emacs-ime-module",
+ "unstable": {
+ "version": [
+ 20201128,
+ 928
+ ],
+ "deps": [
+ "w32-ime"
+ ],
+ "commit": "9406b498e6a256a5928f03cd089fdd2823b03876",
+ "sha256": "0q4f7c1nrvz58ycbjgfih1m3xyb0x4wn405yz4gm1172j0phcmlj"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 1
+ ],
+ "deps": [
+ "w32-ime"
+ ],
+ "commit": "5cb95d1fa59f46215d637916168a9eb1fc5e857f",
+ "sha256": "1xixsfzkv4hdirwm06d55dvdkfh2jvhpkl8r91a1xlqqg20f6rag"
+ }
+ },
{
"ename": "traad",
"commit": "2b3eb31c077fcaff94b74b757c1ce17650333943",
@@ -98444,11 +100587,11 @@
"repo": "jorgenschaefer/circe",
"unstable": {
"version": [
- 20171210,
- 2102
+ 20201101,
+ 1045
],
- "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7",
- "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy"
+ "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4",
+ "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx"
},
"stable": {
"version": [
@@ -98503,11 +100646,11 @@
"repo": "raghavgautam/tramp-hdfs",
"unstable": {
"version": [
- 20170821,
- 1320
+ 20201001,
+ 2022
],
- "commit": "f8406f77bf83b66306ced693a5e4aaf606f46762",
- "sha256": "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl"
+ "commit": "822c7b8a5bfca97544817d04e8a4ff1ffbaf4267",
+ "sha256": "0kxxdpmr9h0kqsylh8aj8m5arwf4m5yrkcadjssa76drhdlhcirl"
}
},
{
@@ -98551,11 +100694,11 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20200819,
- 1133
+ 20201205,
+ 1610
],
- "commit": "f5d81ef0ed24be935f3c0192b746a1738d903d37",
- "sha256": "0kyrf0nh9l9x1jwfca1921qc0w2ii1xp4ya4mv2jmanm3apbihb9"
+ "commit": "0d79ccfaf899f6192151d1191fbc234795489923",
+ "sha256": "077q180qx8q7r8pjqii823l3xpxaz8dfqy3rr31maynhbr1w46g3"
},
"stable": {
"version": [
@@ -98593,26 +100736,26 @@
"repo": "holomorph/transmission",
"unstable": {
"version": [
- 20200620,
- 402
+ 20201209,
+ 458
],
"deps": [
"let-alist"
],
- "commit": "7ed254437c1f95ce7f59e87e90d6ec5e4d91c01d",
- "sha256": "15qim9dfir08hkqf0ynwf1953cq60726rkjyc32l8hkpjlgw23ar"
+ "commit": "deb7090e1e3faf50b691c5b73148be690575c76b",
+ "sha256": "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc"
},
"stable": {
"version": [
0,
12,
- 1
+ 2
],
"deps": [
"let-alist"
],
- "commit": "03a36853f141387654b7cb9217c7417db096a083",
- "sha256": "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"
+ "commit": "deb7090e1e3faf50b691c5b73148be690575c76b",
+ "sha256": "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc"
}
},
{
@@ -98662,20 +100805,20 @@
"repo": "jcs-elpa/transwin",
"unstable": {
"version": [
- 20200704,
- 356
+ 20200910,
+ 1636
],
- "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694",
- "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2"
+ "commit": "20694aae145edd6ad496a395ef1a53ab37a59521",
+ "sha256": "01afsgkzn5y4ld5m1gmvai8pgdy73kmllivmz18a2q9fdrgaa6xb"
},
"stable": {
"version": [
0,
1,
- 2
+ 3
],
- "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694",
- "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2"
+ "commit": "20694aae145edd6ad496a395ef1a53ab37a59521",
+ "sha256": "01afsgkzn5y4ld5m1gmvai8pgdy73kmllivmz18a2q9fdrgaa6xb"
}
},
{
@@ -98753,6 +100896,66 @@
"sha256": "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix"
}
},
+ {
+ "ename": "tree-sitter",
+ "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3",
+ "sha256": "1jdnsmy1gwz2f6kybmh8lcf9lg7qw58694drz0dmw34w3q7jjwys",
+ "fetcher": "github",
+ "repo": "ubolonton/emacs-tree-sitter",
+ "unstable": {
+ "version": [
+ 20201107,
+ 1648
+ ],
+ "deps": [
+ "tsc"
+ ],
+ "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383",
+ "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 12,
+ 1
+ ],
+ "deps": [
+ "tsc"
+ ],
+ "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd",
+ "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p"
+ }
+ },
+ {
+ "ename": "tree-sitter-langs",
+ "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3",
+ "sha256": "147p5hmpys4qhg5ymsmgbc3wx3x2jjw625waprfph7sr6h2cfrps",
+ "fetcher": "github",
+ "repo": "ubolonton/emacs-tree-sitter",
+ "unstable": {
+ "version": [
+ 20201205,
+ 431
+ ],
+ "deps": [
+ "tree-sitter"
+ ],
+ "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383",
+ "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 12,
+ 1
+ ],
+ "deps": [
+ "tree-sitter"
+ ],
+ "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd",
+ "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p"
+ }
+ },
{
"ename": "treefactor",
"commit": "e3e956cbbaed3af8beeb927a730cb553df1fac21",
@@ -98797,8 +101000,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200816,
- 939
+ 20201128,
+ 1158
],
"deps": [
"ace-window",
@@ -98810,8 +101013,8 @@
"pfuture",
"s"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -98840,15 +101043,15 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200801,
- 920
+ 20200819,
+ 1950
],
"deps": [
"all-the-icons",
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
}
},
{
@@ -98866,8 +101069,8 @@
"evil",
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -98890,14 +101093,14 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200530,
- 2129
+ 20201005,
+ 1309
],
"deps": [
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -98920,16 +101123,16 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200421,
- 1426
+ 20201025,
+ 957
],
"deps": [
"magit",
"pfuture",
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -98953,16 +101156,16 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200530,
- 2129
+ 20200901,
+ 1550
],
"deps": [
"dash",
"persp-mode",
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -98978,6 +101181,26 @@
"sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
}
},
+ {
+ "ename": "treemacs-perspective",
+ "commit": "bdc1cc9c16984a5e948a3ced981155c4ea0eeba2",
+ "sha256": "1pd30gc0y2yqd5rn27bdgaygcgrvsjdwhcy24mkssvixaa2slhv0",
+ "fetcher": "github",
+ "repo": "Alexander-Miller/treemacs",
+ "unstable": {
+ "version": [
+ 20200901,
+ 1550
+ ],
+ "deps": [
+ "dash",
+ "perspective",
+ "treemacs"
+ ],
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
+ }
+ },
{
"ename": "treemacs-projectile",
"commit": "37cca017cf529a0553ba73bcb824a945ec8b1137",
@@ -98993,8 +101216,8 @@
"projectile",
"treemacs"
],
- "commit": "400b3916b61e61a299916f053cc52b48638479b7",
- "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14",
+ "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy"
},
"stable": {
"version": [
@@ -99033,6 +101256,21 @@
"sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn"
}
},
+ {
+ "ename": "treeview",
+ "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52",
+ "sha256": "18df7xpz42z408784w0s39hwp5pxrramzrbk7zfbr4qrnxnk0bva",
+ "fetcher": "github",
+ "repo": "tilmanrassy/emacs-treeview",
+ "unstable": {
+ "version": [
+ 20200921,
+ 6
+ ],
+ "commit": "e6012303670d112596e00eb3cb505eb0e0d61d84",
+ "sha256": "0drjzjwrk7fkcc6q8qbvzf60dgcbnysm482cdvzikc0phzgjpl9n"
+ }
+ },
{
"ename": "trident-mode",
"commit": "091dcc3775ec2137cb61d66df4e72aca4900897a",
@@ -99225,6 +101463,30 @@
"sha256": "1103gb66db91rnqvs1adqzdsgjh14apb171zghd1dzswhjgiff8q"
}
},
+ {
+ "ename": "tsc",
+ "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3",
+ "sha256": "1ml2cha9xwdsx35n52aymdvp65r09hss3rvy5lqbq9aw57p9infy",
+ "fetcher": "github",
+ "repo": "ubolonton/emacs-tree-sitter",
+ "unstable": {
+ "version": [
+ 20201116,
+ 1148
+ ],
+ "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383",
+ "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 12,
+ 1
+ ],
+ "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd",
+ "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p"
+ }
+ },
{
"ename": "tss",
"commit": "d52e20f5ca38ed399d19f18f778b8601baf78460",
@@ -99512,6 +101774,24 @@
"sha256": "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z"
}
},
+ {
+ "ename": "twtxt",
+ "commit": "4627ee00b9439d9dac9971ad1060af4bcf31446c",
+ "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l",
+ "fetcher": "github",
+ "repo": "deadblackclover/twtxt-el",
+ "unstable": {
+ "version": [
+ 20200824,
+ 1323
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "e7bafaf92124bb4f2a0be5c1a635b80f9b3a8c87",
+ "sha256": "1qqc6ykrpq311fwn5mvzc3yl6z48v1c3yq3vi8g9zv63ywj33bbk"
+ }
+ },
{
"ename": "typescript-mode",
"commit": "94455323364d5a6b00e2786d577134eb350826b4",
@@ -99520,11 +101800,11 @@
"repo": "emacs-typescript/typescript.el",
"unstable": {
"version": [
- 20200817,
- 817
+ 20201002,
+ 1109
],
- "commit": "42a60e5c881082db2ec2c541a5c154308c4863e6",
- "sha256": "14hn0v5gcbzj6y2xs30qyh8wba4l073x5281xd7xs05f9yv7dv5j"
+ "commit": "54f14c482701c4f937bf51469f70812624e07f87",
+ "sha256": "0rl5i34rdg3rk5s2xidf1yz6j5y30mb8qm6l4myw3r973fyasvlr"
},
"stable": {
"version": [
@@ -99628,28 +101908,32 @@
"repo": "kadircancetin/typo-suggest",
"unstable": {
"version": [
- 20200801,
- 1000
+ 20200830,
+ 1143
],
"deps": [
"company",
- "helm"
+ "dash",
+ "helm",
+ "s"
],
- "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1",
- "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf"
+ "commit": "3014d18ae2f0b6b857bb613f373e034c743f4d2e",
+ "sha256": "0pbmmwk5qh1ld9yzy4vxxp9ix4kzw9m71qjwqz0fqw3md9xlr6z6"
},
"stable": {
"version": [
0,
0,
- 3
+ 4
],
"deps": [
"company",
- "helm"
+ "dash",
+ "helm",
+ "s"
],
- "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1",
- "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf"
+ "commit": "938fdad51d1177627ed9a34da6b937481861bda2",
+ "sha256": "0q8kgjnbcmqr1my7qgfcwjbk9misgkq4ymvrslhwlfwnnkg18x9a"
}
},
{
@@ -99828,28 +102112,28 @@
"repo": "undercover-el/undercover.el",
"unstable": {
"version": [
- 20191122,
- 2126
+ 20200830,
+ 1638
],
"deps": [
"dash",
"shut-up"
],
- "commit": "9f4fbd04cd25c61397a7058bf2bad33c7b669aa4",
- "sha256": "13cn2cxspaqa9filclk66963by7khaci4lyrxgmjpdz04rijkh1q"
+ "commit": "a73c50aedbca0416d0e4d4fbeee27131bdd117aa",
+ "sha256": "0jkbwj8qb10nsl7imcnjlhrp1c9skw088cirrvn7380hlq07w346"
},
"stable": {
"version": [
0,
- 6,
- 1
+ 7,
+ 0
],
"deps": [
"dash",
"shut-up"
],
- "commit": "86f856c799aacfd48d2eb42d1a6afda0e6e49845",
- "sha256": "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29"
+ "commit": "9515b247649d05219bf96b1843eed7c4d02a332e",
+ "sha256": "1dh4cpn1l1shchr0gg6jyld1qbjn3fy12s43pksfww4sm4rjn9rn"
}
},
{
@@ -99946,11 +102230,11 @@
"repo": "ideasman42/emacs-undo-fu-session",
"unstable": {
"version": [
- 20200517,
- 949
+ 20201016,
+ 2319
],
- "commit": "e2043f8350970e1a9ef06a94956a733826cdf32b",
- "sha256": "14qlrdal1z64cqqssa34cw1yzsppslgwwy23060sxgjz2vvwwwfb"
+ "commit": "56cdd3538a058c6916bdf2d9010c2179f2505829",
+ "sha256": "04wq1alrzzlidcb4mjb5j7pg68pks1vgv7kvvmi6dzb3l602mb2a"
}
},
{
@@ -99964,8 +102248,8 @@
20200204,
1612
],
- "commit": "20409358ad321fb937152cf93a50a4a775e405d6",
- "sha256": "0mc6qldsjh8671kayl6wxmmcb8q0wjcg09qr7ppmsmwzsd9ydn0n"
+ "commit": "5a9eb34ed945a4d62362528cc7557b9c4e81a12b",
+ "sha256": "10ybvgdrw9hzqwbzvsr3hmzci4yp9rxi5nbcm6iafrsn7p1vv1wj"
}
},
{
@@ -100021,6 +102305,24 @@
"sha256": "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"
}
},
+ {
+ "ename": "unicad",
+ "commit": "4d0c741ea6670887c581f1f1cb55c49c7084a988",
+ "sha256": "14sxvyb9ckrk2y3aqb00zrc08l02y23kyzfyc1lx56mvswajlw02",
+ "fetcher": "github",
+ "repo": "ukari/unicad",
+ "unstable": {
+ "version": [
+ 20200914,
+ 1500
+ ],
+ "deps": [
+ "nadvice"
+ ],
+ "commit": "a5fd4e326a0607acc3776c11f41826e60b6486c6",
+ "sha256": "035k8fkvrcglqn15fqcd962jyr154b3y8iczddjjc6wfxp16i21x"
+ }
+ },
{
"ename": "unicode-emoticons",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -100569,25 +102871,26 @@
"repo": "jwiegley/use-package",
"unstable": {
"version": [
- 20200721,
- 2156
+ 20201110,
+ 2133
],
"deps": [
"bind-key"
],
- "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
- "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
},
"stable": {
"version": [
2,
- 4
+ 4,
+ 1
],
"deps": [
"bind-key"
],
- "commit": "39a8b8812c2c9f6f0b299e6a04e504ef393694ce",
- "sha256": "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
}
},
{
@@ -100607,13 +102910,14 @@
"key-chord",
"use-package"
],
- "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
- "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
},
"stable": {
"version": [
2,
- 4
+ 4,
+ 1
],
"deps": [
"bind-chord",
@@ -100621,8 +102925,8 @@
"key-chord",
"use-package"
],
- "commit": "39a8b8812c2c9f6f0b299e6a04e504ef393694ce",
- "sha256": "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
}
},
{
@@ -100669,20 +102973,21 @@
"system-packages",
"use-package"
],
- "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
- "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
},
"stable": {
"version": [
2,
- 4
+ 4,
+ 1
],
"deps": [
"system-packages",
"use-package"
],
- "commit": "39a8b8812c2c9f6f0b299e6a04e504ef393694ce",
- "sha256": "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"
+ "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b",
+ "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"
}
},
{
@@ -100714,6 +103019,36 @@
"sha256": "19dja25illcvwpx8j1kigw8dzby41bm57prx1bhaxkmsakxyl863"
}
},
+ {
+ "ename": "use-proxy",
+ "commit": "e9fb7f05b76517aa918fbd08a52719d1692d6dfc",
+ "sha256": "05j06mbbyb4imlg480y29cfwkmpn93qdjd7jx687lrikg2z0ypbc",
+ "fetcher": "github",
+ "repo": "rayw000/use-proxy",
+ "unstable": {
+ "version": [
+ 20201209,
+ 853
+ ],
+ "deps": [
+ "exec-path-from-shell"
+ ],
+ "commit": "43499194224483b27628fdf99f6f9ff6e731d844",
+ "sha256": "1j6vkg0z7m8yzrgy0innq7r2d5pchbqs3y5gf51qdzsfqdmff3ys"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 1
+ ],
+ "deps": [
+ "exec-path-from-shell"
+ ],
+ "commit": "43499194224483b27628fdf99f6f9ff6e731d844",
+ "sha256": "1j6vkg0z7m8yzrgy0innq7r2d5pchbqs3y5gf51qdzsfqdmff3ys"
+ }
+ },
{
"ename": "use-ttf",
"commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
@@ -100722,26 +103057,26 @@
"repo": "jcs-elpa/use-ttf",
"unstable": {
"version": [
- 20200720,
- 957
+ 20201021,
+ 1620
],
"deps": [
"s"
],
- "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d",
- "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia"
+ "commit": "e430695957011aeff51fe7e7ed1a154226f205f5",
+ "sha256": "09x64f7qqan6bdfqjfb6m29ql5hnsi6x2az6hpb0wpgdxgy1vbm6"
},
"stable": {
"version": [
0,
- 0,
- 6
+ 1,
+ 1
],
"deps": [
"s"
],
- "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d",
- "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia"
+ "commit": "42d8664f0d1c33a5a3d49d48eb5f7944607f514e",
+ "sha256": "0iw4h9w5ddj61s5n9q23pcir1lnfqjasxsgh6x2rff3v997iv4g0"
}
},
{
@@ -100814,15 +103149,15 @@
"repo": "damon-kwok/v-mode",
"unstable": {
"version": [
- 20200812,
- 956
+ 20200823,
+ 535
],
"deps": [
"dash",
"hydra"
],
- "commit": "15a73b304e624d9b07fd8f23670569678d6cd9c3",
- "sha256": "1arbd9wwaqlhc1hl4hgpfjn4ncyrirjmpq8sgnhffgw7vkzl99pv"
+ "commit": "d97fb8de5ab19359029dec1195f3d5b87aeb27b1",
+ "sha256": "1rhk9bcrn43gv0cz92cbvhhjvbifyq7lkdg3hcrla87b2dm4rp3l"
}
},
{
@@ -100902,17 +103237,17 @@
},
{
"ename": "vala-mode",
- "commit": "cea26fa67a524b7c14be2952cfbd4f657431415f",
- "sha256": "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p",
+ "commit": "06cf1a337bf4bc355c3b297f6387e658f668d3b1",
+ "sha256": "1m8mimvdasbikawrs4xjx2q9f1g92k66hc8spbza4vg4sfl98m8s",
"fetcher": "github",
- "repo": "emacsorphanage/vala-mode",
+ "repo": "rrthomas/vala-mode",
"unstable": {
"version": [
- 20150324,
- 2225
+ 20201019,
+ 1317
],
- "commit": "fb2871a4492d75d03d72e60474919ab89adb267b",
- "sha256": "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44"
+ "commit": "6fcc4d87108179f973273dbc44c57fed44b061ae",
+ "sha256": "03wmnlpwi2wjm34ycffikdd3wgzy14kiida5lqx37js2am769jzh"
}
},
{
@@ -100948,6 +103283,21 @@
"sha256": "1p0b7jh572wfz7cmzfbd70pr7i59xbbi15jw6rvzgnr558v3fmlg"
}
},
+ {
+ "ename": "validate-html",
+ "commit": "9642a3c32d773bd935fd8f0d11c753a9b139f98e",
+ "sha256": "113amcpmjljnbyzmwpf6gsl7vdrs48b4hmax6lk5pb61ylv9fyhp",
+ "fetcher": "github",
+ "repo": "arthurgleckler/validate-html",
+ "unstable": {
+ "version": [
+ 20200913,
+ 2002
+ ],
+ "commit": "04321596380c7a87ed85762b6764e98b2ef31bf8",
+ "sha256": "09c24i4b5yg21qzlyss4si607d1n63sj5dr2pysikkzzd81b9hki"
+ }
+ },
{
"ename": "vbasense",
"commit": "8e7dd1e985d55149f48e4f93a31fb28ec01a4add",
@@ -101027,19 +103377,34 @@
"sha256": "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq"
}
},
+ {
+ "ename": "vc-defer",
+ "commit": "cdb8bf3425c0a634909db317720b5d77d8edfdb0",
+ "sha256": "160c5vzn026h2ckr9s3caa4w9c4nv2hcfm2jkk0cavdp5qzbxz4d",
+ "fetcher": "github",
+ "repo": "google/vc-defer",
+ "unstable": {
+ "version": [
+ 20201116,
+ 701
+ ],
+ "commit": "aeafc419c1788b3ac4f0590c635374eefd7c220c",
+ "sha256": "12465b6ac6yzlyxnd0ic4s07i1zy4v0i2z3qy3cjjd7wm3ixbyfd"
+ }
+ },
{
"ename": "vc-fossil",
- "commit": "31c5ee4b625b90c1af66d7d11a25af8e1aa307b1",
- "sha256": "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb",
+ "commit": "06babba8280a9a880b3eb39fef759f208916406d",
+ "sha256": "008c4hpq3815sagnigk45xn5dsygyagprgl7hz3955iq0vy9kbdj",
"fetcher": "github",
"repo": "venks1/emacs-fossil",
"unstable": {
"version": [
- 20180215,
- 1635
+ 20201121,
+ 1726
],
- "commit": "7c5af95181213db38f81f5f9586f3334301a3ea0",
- "sha256": "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m"
+ "commit": "31b0ee6285cca98d376eb5b6e1bc832c419c9fd0",
+ "sha256": "1jva2vnpz97mrzpix5z2y8z9qph7p1r39ajyvdzjfx6vlvwgsv0i"
}
},
{
@@ -101189,14 +103554,14 @@
"repo": "justbur/emacs-vdiff",
"unstable": {
"version": [
- 20200214,
- 1845
+ 20201103,
+ 1427
],
"deps": [
"hydra"
],
- "commit": "c0541ae9c2cb878be9ab3935da058a72155a14fc",
- "sha256": "0jqkr92y5xrwlj2aa8nm2s153nbzsy9xf04c2rixizg7xzz5jky8"
+ "commit": "007e44be19d068fd6b49874b6e9b8df8b1f552bd",
+ "sha256": "197xrwph1llrzjgkhlvagiwdgfp68pb45w5afg89ndahpqc2725s"
},
"stable": {
"version": [
@@ -101401,8 +103766,8 @@
"cider",
"parseedn"
],
- "commit": "b0160c883f53ce069c0b4498880474c158ac7245",
- "sha256": "1msc6s90a048lk4i8gqkhgnm1k52k40m62q9n1s0dwgmq1yj3zyl"
+ "commit": "8a9e3f9344fd1b81ec52ea9655313c0490ab5d7b",
+ "sha256": "1b49lszx5gs9yc1zisklqqgijygdnfy2zryhipn7i1nvmpjzglv9"
}
},
{
@@ -101413,20 +103778,20 @@
"repo": "federicotdn/verb",
"unstable": {
"version": [
- 20200801,
- 2217
+ 20201127,
+ 2022
],
- "commit": "f8755213c8fadea92b7a2313fb38c0ee37b8a2cc",
- "sha256": "0f59rw78hfc7hkgd9ja2hzyb6gaf400aa6375zcl3zxh2ljnvbvb"
+ "commit": "ea6be4ad2bf9fdd2907df51b1cf51dd5bd356c40",
+ "sha256": "0k8s43pqwicws9qaaa5nz7qkzg0dymbzrsdcb7gg3x6jzg1wy119"
},
"stable": {
"version": [
2,
- 12,
+ 13,
0
],
- "commit": "08ddce1306ad1b8707300fee33848b7a48897fd3",
- "sha256": "1azwmqhlasir5fhy2r3yd861xvk6lxrzq60svvyjss3kdlqp1irj"
+ "commit": "e714404d8b190e4c82383f9ffe1ff613f3efebe7",
+ "sha256": "0116n67d3d26mvifs6a7pn2yvj511nrmmnjkykjfb5i8dhpa0lyq"
}
},
{
@@ -101474,15 +103839,15 @@
"repo": "damon-kwok/verona-mode",
"unstable": {
"version": [
- 20200812,
- 807
+ 20200823,
+ 536
],
"deps": [
"dash",
"hydra"
],
- "commit": "3519f83e68af163a6b01753ad7bb4cecf26c24b2",
- "sha256": "1ck3x1w0nyn31s3fdks6wms5ic5n56jcxg49r56j3dwnifpk87mm"
+ "commit": "72dd31ef847344d79409503f3c42169041eb3da4",
+ "sha256": "04am1kzrimnkl2g1inik5l50i6gr5mafs0jdinvalhrdnbdr45iq"
}
},
{
@@ -101738,21 +104103,21 @@
},
{
"ename": "vimish-fold",
- "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
- "sha256": "1ld9sab9r82wr74rscxcmsmd07jgkmkysbcn5aswzyrf1gn62gr9",
+ "commit": "dc35329aa019e491045d412c4bfa98dfcf264d72",
+ "sha256": "0jglpv8s7lm8p6vpc7scy74da0c9an8c6azh23djkn2b838280d7",
"fetcher": "github",
- "repo": "seregaxvm/vimish-fold",
+ "repo": "matsievskiysv/vimish-fold",
"unstable": {
"version": [
- 20200524,
- 1729
+ 20201205,
+ 1156
],
"deps": [
"cl-lib",
"f"
],
- "commit": "9d12e39f01da517565666e09a2e32e01aed24a90",
- "sha256": "0xdk95hiamnim0bn1w5g0lccb9wc0sxbczrb95q3ndaw3cxxjaa2"
+ "commit": "a6501cbfe3db791f9ca17fd986c7202a87f3adb8",
+ "sha256": "0w0r951c6vn890h1cz5l8rl6hicna6rbdzfgbg4lpm280yds9lpb"
},
"stable": {
"version": [
@@ -101791,15 +104156,15 @@
"repo": "luisgerhorst/virtual-auto-fill",
"unstable": {
"version": [
- 20200217,
- 2333
+ 20200906,
+ 2038
],
"deps": [
"adaptive-wrap",
"visual-fill-column"
],
- "commit": "291f6178a5423f01f2f69d6bc48603d4f605b61a",
- "sha256": "15kg23xkcc060y8a5f9657gk3bvkax23myhajaa0b2i1qcd6p43i"
+ "commit": "ac8bf947a1f87efe8967cb18166178f5fd93a8e1",
+ "sha256": "1mhw6ysi29s57dccq8a1jh810hz0a90ssw66ih5byvrysgs0hmqw"
}
},
{
@@ -101895,19 +104260,19 @@
"repo": "joostkremers/visual-fill-column",
"unstable": {
"version": [
- 20200428,
- 816
+ 20201008,
+ 919
],
- "commit": "64d38bc1c00953be05c193c01332a633be67aac2",
- "sha256": "1gkl2bg0ax16d3b17n7s3j5ng261jxfl6q3bi5bff03jph900x1p"
+ "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065",
+ "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g"
},
"stable": {
"version": [
1,
- 11
+ 14
],
- "commit": "57c2a72d46900117ea92e0a01b97e19481800503",
- "sha256": "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"
+ "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065",
+ "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g"
}
},
{
@@ -102082,11 +104447,11 @@
"repo": "dbrock/volume.el",
"unstable": {
"version": [
- 20200523,
- 1246
+ 20201002,
+ 1022
],
- "commit": "bd0ca8430098164740f111ac2bd2582d7f628b79",
- "sha256": "0v8x9d0qq8gjlf6ydri580wix6hisf6x9pywg5px6cqj53r8g6rc"
+ "commit": "afb75a5f7fe41eb28c8dbb1378e80d103eea05c7",
+ "sha256": "001f9s569pvqa7ycmd15aqb6sq5zq31vy7wq0qrbbbs6swm293d5"
}
},
{
@@ -102097,19 +104462,19 @@
"repo": "jcs-elpa/vs-dark-theme",
"unstable": {
"version": [
- 20191209,
- 1600
+ 20201025,
+ 1148
],
- "commit": "aea1ca9932df2c19a19e47f7971b7bc6b821181f",
- "sha256": "0nk0vsxww46rrm1ijfpq58bn3zai7qmj2iqg1k8g14w7fc2si8mi"
+ "commit": "3d087e1c48872b5b623ac72c85a9bd3d80ec02cd",
+ "sha256": "1j326w78drqsr4bxq2sjfnf3ax3hwk1k63flbqj8vfq5w1pc5iy0"
},
"stable": {
"version": [
0,
- 1
+ 2
],
- "commit": "c3c6b0be8bd525079b341490afc8875941b8af79",
- "sha256": "0w4gygxdfbb7gp92f59p9qvw725l70sy2baf4h6rifrf92af55f2"
+ "commit": "3d087e1c48872b5b623ac72c85a9bd3d80ec02cd",
+ "sha256": "1j326w78drqsr4bxq2sjfnf3ax3hwk1k63flbqj8vfq5w1pc5iy0"
}
},
{
@@ -102120,19 +104485,19 @@
"repo": "jcs-elpa/vs-light-theme",
"unstable": {
"version": [
- 20191209,
- 1600
+ 20201025,
+ 1148
],
- "commit": "5c11a73bfc5f3873490ed0ba88eed44e4707e455",
- "sha256": "1ifwm4dwmv4f97p1byv3l5k26gyb97zp60wjhrzrdj2g49fg716g"
+ "commit": "4e6501118bafb62ecfca8797b6c6d81310d95fd2",
+ "sha256": "17n9c6fj70rgrc63g72vdxnv8xjnqa6w0rrvh6ih3z2xmky91b2a"
},
"stable": {
"version": [
0,
- 1
+ 2
],
- "commit": "8b34cbe6294ad02676970bd72c9efbcc09981f3f",
- "sha256": "0sw8k737ra2qhakxyf83lz41a5sv0dzw5xssnvyiyrarh73n5pp0"
+ "commit": "4e6501118bafb62ecfca8797b6c6d81310d95fd2",
+ "sha256": "17n9c6fj70rgrc63g72vdxnv8xjnqa6w0rrvh6ih3z2xmky91b2a"
}
},
{
@@ -102158,11 +104523,11 @@
"repo": "ianpan870102/vscode-dark-plus-emacs-theme",
"unstable": {
"version": [
- 20200818,
- 341
+ 20201116,
+ 749
],
- "commit": "a33ef7fd5d9249bbb59fcb822c032e28bb3bf792",
- "sha256": "0wm54jy09hsg3vbw4qc5k4nzznsn3mqcn0al8mwh2522q6kb6l8j"
+ "commit": "4a4c7502ceda44d189a5fb09018ef2bc3f3c8d5f",
+ "sha256": "0vgg301za0bgdgcj8kfniysvjq1iyia3jk6lvi6vwrzc8sy9hx6z"
},
"stable": {
"version": [
@@ -102197,11 +104562,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20200813,
- 1748
+ 20201206,
+ 205
],
- "commit": "797357bf65952337627f2d0c594c2fef600aafae",
- "sha256": "0lqlx97kb1mpw17lmrx2xa407ixn3wl2cv9rdwrvlrlvg8kcpjmn"
+ "commit": "a670b786539d3c8865d8f68fe0c67a2d4afbf1aa",
+ "sha256": "0s244crjkbzl2jhp9m4sm1xdhbpxwph0m3jg18livirgajvdz6hn"
}
},
{
@@ -102212,15 +104577,29 @@
"repo": "jixiuf/vterm-toggle",
"unstable": {
"version": [
- 20200614,
- 1452
+ 20201204,
+ 1537
],
"deps": [
- "projectile",
"vterm"
],
- "commit": "7f762d216fc7311bac4182f650e0207574c29357",
- "sha256": "0nz3qcd2jmjfky0xn62fkhnxchf9nap3li5blis0jgi6igj47ykq"
+ "commit": "61cb072af997aa961e2aebe0125b883ff3bd6f43",
+ "sha256": "082gcdb3lnjn361hnsc1pzxx8dma7pm4iv03kd284fszs032amp2"
+ }
+ },
+ {
+ "ename": "vtm",
+ "commit": "4e4f8793e78e488db863ddfc163390281c18e2c3",
+ "sha256": "1r1nyzcqx9gjmsh0qykmbc69gdn2k6rbzbsvb5rhrlxivl9pgajc",
+ "fetcher": "github",
+ "repo": "laishulu/emacs-vterm-manager",
+ "unstable": {
+ "version": [
+ 20200921,
+ 338
+ ],
+ "commit": "d770fd8cff7c24688199392ad93c01485c6a9569",
+ "sha256": "1xyhwlmh7mqdhr45y63qh5k71jsgh9sj08bvwsk7znh2zgzqy954"
}
},
{
@@ -102355,6 +104734,28 @@
"sha256": "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97"
}
},
+ {
+ "ename": "w32-ime",
+ "commit": "4a559ecf639296b3e03ee5be99c9af6104aff646",
+ "sha256": "1vx84li2k8kynhqazv8ch513s9qn6rnynqjbd89d0ij9kdi5h0k9",
+ "fetcher": "github",
+ "repo": "trueroad/w32-ime.el",
+ "unstable": {
+ "version": [
+ 20201107,
+ 143
+ ],
+ "commit": "9c62273dce0ba685a591577885b1e216ba832ec1",
+ "sha256": "1bbl1y4ym37h0sh81zd1qv9k7151maf3bxdrzr725livvl2rdk13"
+ },
+ "stable": {
+ "version": [
+ 20201005
+ ],
+ "commit": "34ba004717ecb9d46c3fc20162005261cffb0bcd",
+ "sha256": "1n9bbc8s8ls9idjbh1f2nsf4cb829qpdbdq0iws56xqyd8sxsss4"
+ }
+ },
{
"ename": "w3m",
"commit": "85c53c48caab0845101c487e4fee7e2cda15f706",
@@ -102363,11 +104764,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20200818,
- 141
+ 20201129,
+ 2228
],
- "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4",
- "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk"
+ "commit": "267d4220715eabacca1ad1661d76be5ceed7072c",
+ "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q"
}
},
{
@@ -102455,11 +104856,11 @@
"repo": "darkstego/wakib-keys",
"unstable": {
"version": [
- 20200430,
- 2155
+ 20201001,
+ 1448
],
- "commit": "d958150c053dae57445be37cda1c2b50efcbaac3",
- "sha256": "0fbh10yjva3bfpl76ddsnspzlpmbxj1azr3p4n2z0az75xx24wsa"
+ "commit": "b803fcaef31539e070a08202b9039bbeb29e8f66",
+ "sha256": "1bjl9h8p63334dxbbcdz6rmmskslrlbbvakhklzica9al7gr92w5"
}
},
{
@@ -102470,15 +104871,15 @@
"repo": "plexus/walkclj",
"unstable": {
"version": [
- 20180718,
- 900
+ 20201116,
+ 735
],
"deps": [
"parseclj",
"treepy"
],
- "commit": "2e54fa813b11d1a87c890cdf117f30165a193024",
- "sha256": "0bgvniw3ibcjsmzwrndg6pxwbpnpnxsb8ijs2gxg5kbm1hqqly32"
+ "commit": "2077475eb3c8d1a170c3a3b0e836420469024f0f",
+ "sha256": "1ml1jz2dcva98kgzvrbad4myvyx2g1xzl584vj0mj41x0h6m47b3"
}
},
{
@@ -102489,15 +104890,16 @@
"repo": "abrochard/walkman",
"unstable": {
"version": [
- 20200418,
- 1554
+ 20201124,
+ 1725
],
"deps": [
+ "json-mode",
"org",
"transient"
],
- "commit": "07a7710084c328dc238626f8b6e7d019380502de",
- "sha256": "13g8wgcv3qydx6vhznx1iypmlrzl3cm02prrkqp70gjvgblk06nm"
+ "commit": "ade5f2a7c4a4260b39cfc23d40112b4fcb7a572b",
+ "sha256": "1ldy46sylhlm6zjk55lachz3vyx2klz30nj2ycc1m27568n7b1jy"
}
},
{
@@ -102508,11 +104910,11 @@
"repo": "farlado/emacs-wallpaper",
"unstable": {
"version": [
- 20200408,
- 1353
+ 20201019,
+ 2123
],
- "commit": "9fb5be9c2f7279f7ef2860eefd416359b9026ba3",
- "sha256": "18vm8g4iwf2a9l40bg7cvpdziv10mv24x61z86xwjmnqbr7sxd8q"
+ "commit": "cc0101726dd2fa2b4eda06924c7abfae54f663e2",
+ "sha256": "0k6jysr9sdz3x8h0pslpssjr23hwp358472vmgd2jmfzvjk3m21i"
}
},
{
@@ -102574,14 +104976,16 @@
"repo": "wanderlust/wanderlust",
"unstable": {
"version": [
- 20200124,
- 858
+ 20201128,
+ 2357
],
"deps": [
+ "apel",
+ "flim",
"semi"
],
- "commit": "7af0d582cd48a37469e0606ea35887740d78c8b5",
- "sha256": "08gr4q5i4z1bs5qbfxmf9imjin1v1qvsk7x37qvr84p16kdr9vxn"
+ "commit": "5db307a0441b6b7aa4ecfd34344842d78f15611b",
+ "sha256": "03044c5lq9j5i1a5d0wy195m1n7353g2kjldinbla650fhwjhix1"
}
},
{
@@ -102675,30 +105079,6 @@
"sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc"
}
},
- {
- "ename": "wcheck-mode",
- "commit": "5d10b59f568fdedf248c2e8eaa06c4a74032ca56",
- "sha256": "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k",
- "fetcher": "github",
- "repo": "tlikonen/wcheck-mode",
- "unstable": {
- "version": [
- 20190626,
- 1839
- ],
- "commit": "271198bca70c05b4591c836d3c670b72cdfabe9c",
- "sha256": "19wypzzqfy0xbcbf4gz2c1c1mapp6s68rk0crv71vvjq6dmbq5yz"
- },
- "stable": {
- "version": [
- 2019,
- 6,
- 17
- ],
- "commit": "c50e1f565802816a67852213dc31532290704412",
- "sha256": "18ri9y23fd736d49sa1027k4lh0saw0zyiwds50jk6j9w4rvlzy9"
- }
- },
{
"ename": "wdl-mode",
"commit": "8cf1f20913d765ae36ecc2c9a69470ff51124e56",
@@ -102841,11 +105221,11 @@
"repo": "fxbois/web-mode",
"unstable": {
"version": [
- 20200612,
- 1038
+ 20201107,
+ 1152
],
- "commit": "60ffd878c4371644bd964f00fea38054645e3e47",
- "sha256": "0la14k422jqcny1bxgvv8yidanl3pv5kkdfbiwq8skxsd6m2xfq5"
+ "commit": "890e837f7ea49f54c02b107377036431cbe7adb6",
+ "sha256": "1mzxnzha4z1y4n1wr2kawidnlh30s4kvdbcavzicvvygvafdvc36"
},
"stable": {
"version": [
@@ -102934,11 +105314,11 @@
"repo": "eschulte/emacs-web-server",
"unstable": {
"version": [
- 20200330,
- 1407
+ 20201030,
+ 1619
],
- "commit": "9edf4b5e3c6cea1738acf08241919e00437ec530",
- "sha256": "1cf2g67q064pnji0hbg0x5ziqmxwim127sd4q849cifxj7a4rqaw"
+ "commit": "7b517abf236e7fe718696a4cb7566d718ea68a3f",
+ "sha256": "0qbi6qwxvm1z5fws432jb7ir1x4abyy680i3ccpv7xpi81qwhw7i"
}
},
{
@@ -102985,28 +105365,28 @@
"repo": "etu/webpaste.el",
"unstable": {
"version": [
- 20200503,
- 1919
+ 20201129,
+ 1909
],
"deps": [
"cl-lib",
"request"
],
- "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0",
- "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx"
+ "commit": "a9c4aa418526dbaf19348325ca30c249e2cf8440",
+ "sha256": "1lwv4zqws7kkxzbcgppgsn93vv6njc4qfh9i15bxjsj7jx3lwkgm"
},
"stable": {
"version": [
3,
- 1,
- 1
+ 2,
+ 0
],
"deps": [
"cl-lib",
"request"
],
- "commit": "5e963e8ef17e937745b8f3b64f29690290c7a5c0",
- "sha256": "1i9scalpinp87wnapgpdw51p1q0y9wjf6nv4jbskzn7irvlkhhzx"
+ "commit": "9662b1c9c40e822d90842c82a778f65c709d3358",
+ "sha256": "08545ihkzflw80rwklnxiswrpdrl8kr74xzxm5wsgrf36fkj9rn2"
}
},
{
@@ -103017,14 +105397,14 @@
"repo": "ahyatt/emacs-websocket",
"unstable": {
"version": [
- 20200419,
- 2124
+ 20201122,
+ 246
],
"deps": [
"cl-lib"
],
- "commit": "5aaf9d12068f98fb4efa772a3e5f4bb350b79a99",
- "sha256": "13qwvjid9d67kk4ggvc2hvm6j4wy1jassd02krp8as91h5hr0y36"
+ "commit": "36deb3ff85368d000a88435d5a645ffbab490654",
+ "sha256": "08q24pp6r8s74bxah6lk0rs9y4bygfpl4pcpw2yngd5i4wajsjvx"
},
"stable": {
"version": [
@@ -103141,11 +105521,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20200818,
- 2225
+ 20201208,
+ 1748
],
- "commit": "d17297aee3a15b326e813d6c12831b587f6267fd",
- "sha256": "0brixf1j1hdmj0wvd3qzlmr844fvd61nxgc5adczpy0qivc1c1c9"
+ "commit": "5a68065a2b2d66aad75a832d19fc65b3d30ac0a0",
+ "sha256": "1s1j1lw1i98r1j7zsrhxpjjlvr7kqs3b03m4pj5mnd8g31ddvgb8"
}
},
{
@@ -103294,10 +105674,10 @@
},
{
"ename": "what-the-commit",
- "commit": "6d22725c2fce506c659bd33aabca182be0048905",
- "sha256": "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak",
+ "commit": "9af2c90af887e37c080a4a70e84ec5691c599d94",
+ "sha256": "1lzafqw6j4xc7y8vg3q84wc1xxhc6z39dlw1sjs2vwnm9xzjnkl4",
"fetcher": "github",
- "repo": "danielbarbarito/what-the-commit.el",
+ "repo": "danbarbarito/what-the-commit.el",
"unstable": {
"version": [
20150901,
@@ -103315,20 +105695,20 @@
"repo": "justbur/emacs-which-key",
"unstable": {
"version": [
- 20200817,
- 2358
+ 20200908,
+ 2301
],
- "commit": "e48e190a75a0c176e1deac218b891e77792d6921",
- "sha256": "1wr5lqjc5si0s0rn266jxfwln93l7aw79885w66gbjcynfy8rji3"
+ "commit": "ca268fd313d3fb2bd03a8b5e4bdcca675ce58ca7",
+ "sha256": "0rvlhj05v5b67axv2l6mdz9112p5h8w465zii3xs2fpjhrpx6sxx"
},
"stable": {
"version": [
3,
- 4,
+ 5,
0
],
- "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a",
- "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05"
+ "commit": "ae59b7edb0d82aa0251803fdfbde6b865083c8b8",
+ "sha256": "13lgjsm9pwgjsxg7lzc1c9sw2bzssxikfj6grnshqfll8kz8yr4r"
}
},
{
@@ -103453,11 +105833,11 @@
"repo": "whizzml/whizzml-mode",
"unstable": {
"version": [
- 20191216,
- 1743
+ 20201013,
+ 239
],
- "commit": "65fa17f8c1dc50dcb90277b64019c2846a317293",
- "sha256": "0swlmzfrxpv3slssmpad3hgxfxlmi8jp3422mvcsg9xbdslg2qb5"
+ "commit": "3dce3be0c32b9b2d259e462b4b27c530af47466a",
+ "sha256": "00fv8s66iwahjcdi6a45jpr9fhwjfpzv9qnfr6m8pwlkzv0caxkr"
},
"stable": {
"version": [
@@ -103500,19 +105880,25 @@
"repo": "purcell/whole-line-or-region",
"unstable": {
"version": [
- 20200305,
- 221
+ 20200924,
+ 129
],
- "commit": "9791ae59f8bd8b9375d2dede92de8eba5f0d89fb",
- "sha256": "0fk2nhcjkwrni8np8788z9aanrj1hxchg37a1j1z9ds42f0ghj6h"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "f0051d301f83d6dd26ce30a8ea039a8510c79cc0",
+ "sha256": "0y02938a02mb6imlljsz2i9d2ki37hiqyhlyq341la2dr6iwn8sl"
},
"stable": {
"version": [
- 1,
- 6
+ 2,
+ 0
],
- "commit": "0d11174ba5e1145167000aa8f65c273a3d0db6b3",
- "sha256": "1zw4aabadhsn81i3bwdl4717fq6a0njypavw2riyzbz465axd60i"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "4189d03cfda752f04364e2abc0117080ed4112cd",
+ "sha256": "09jy46qxq5whk8l6znkvghjyc55cmi6z734aagmhiw33wmiyadm4"
}
},
{
@@ -103820,11 +106206,11 @@
"repo": "Javyre/winds.el",
"unstable": {
"version": [
- 20200501,
- 419
+ 20201121,
+ 123
],
- "commit": "720a0cedfdc20940f4c740e74fa0e16983cb0367",
- "sha256": "00s0c2ilmypygqlrfa0ajig25h5jijxwwzpcfxgwbjf71wn5g9mg"
+ "commit": "5827e890059d0ce67ebb4779da63c15afccf0973",
+ "sha256": "0j56cwq283ywkpy1mmmrim5hncmmgh8i7h419w2x9nbxnv3yb4d5"
}
},
{
@@ -104015,26 +106401,26 @@
"repo": "magit/with-editor",
"unstable": {
"version": [
- 20200720,
- 2014
+ 20201030,
+ 1232
],
"deps": [
"async"
],
- "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3",
- "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3"
+ "commit": "6735180e73e787b79535c245b162249b70dbf841",
+ "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k"
},
"stable": {
"version": [
- 2,
- 9,
- 4
+ 3,
+ 0,
+ 2
],
"deps": [
"async"
],
- "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3",
- "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3"
+ "commit": "6735180e73e787b79535c245b162249b70dbf841",
+ "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k"
}
},
{
@@ -104094,26 +106480,26 @@
"repo": "p3r7/with-shell-interpreter",
"unstable": {
"version": [
- 20200527,
- 828
+ 20200828,
+ 1217
],
"deps": [
"cl-lib"
],
- "commit": "f8a01beda6260bd2eff3f9fe154ddc16da7b6504",
- "sha256": "1xwmg85211s6fvc9agb8ib06klbk6cn890gpjq33bns6ldjsq41s"
+ "commit": "3fd1ea892e44f7fe6f86df2b5c0a0a1e0f3913fa",
+ "sha256": "1ifl8dww1pzqpbr18b1vq5yc5y4hwgrna6g1z9p6p9rgl7r0p5xz"
},
"stable": {
"version": [
0,
2,
- 3
+ 4
],
"deps": [
"cl-lib"
],
- "commit": "eb2b629c885ca002b7225e20d03231835910d6be",
- "sha256": "0b6z516lwcl08gnhlw99z9sdw15qxk3kanicpp0l0hcbmzann46k"
+ "commit": "45b7d6ad63165c82a95966b291abbfe305d3ada2",
+ "sha256": "0amqw629ah23ngw99iciiljycgikzsrcwpskgbzg0xbv0zzbyjgn"
}
},
{
@@ -104345,8 +106731,8 @@
"repo": "abo-abo/worf",
"unstable": {
"version": [
- 20200121,
- 1629
+ 20201114,
+ 1141
],
"deps": [
"ace-link",
@@ -104354,8 +106740,8 @@
"swiper",
"zoutline"
],
- "commit": "bdc8240ff4188c7403a020eb58dc10eea104b7df",
- "sha256": "1lkix09lwnjsycaacwdn7gyqnm0n2frcp1p0l3hfhayz3p18dy5p"
+ "commit": "a341c87ab6e696968436b38c1c34488d50764f48",
+ "sha256": "14dlmpxxhhg3y55ysdgn4q65x3q94jk7xlmjhhz3abqc5xjbq127"
},
"stable": {
"version": [
@@ -104532,14 +106918,14 @@
"repo": "joostkremers/writeroom-mode",
"unstable": {
"version": [
- 20200519,
- 37
+ 20201107,
+ 2227
],
"deps": [
"visual-fill-column"
],
- "commit": "8a226a31a12a9203067094774ba6fd6175793e70",
- "sha256": "1wb8lkza1a6yfgpwqlc78iq7b5hamss9lak2alwmp9j9aiwys1n0"
+ "commit": "92c47dfa659c418700d064a479e30590bcfc1904",
+ "sha256": "0bn2ff9j8gy2nb5km2r8w45avcs98gab8fsvr9ph220p58jk805c"
},
"stable": {
"version": [
@@ -104561,11 +106947,11 @@
"repo": "lewang/ws-butler",
"unstable": {
"version": [
- 20170111,
- 2334
+ 20201117,
+ 1528
],
- "commit": "52321b99be69aa1b661da7743c4421a30d8b6bcb",
- "sha256": "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf"
+ "commit": "e3a38d93e01014cd47bf5af4924459bd145fd7c4",
+ "sha256": "1vcgg8wr5zpkn9ynyx8sad7srmd31dzkc40wnrzs8aan8nsah5bx"
},
"stable": {
"version": [
@@ -104587,8 +106973,8 @@
20191031,
1211
],
- "commit": "b87dee6d2d21fc868a3fae35bbd3f08910ad57e0",
- "sha256": "1phxq59nsxw6zx1v097j9iqm54am9pln2wzcszsxj2ipjskiz7xn"
+ "commit": "53330a2a43c4875f8682457df1a869a4c9028660",
+ "sha256": "1swwaphlbvpalk7mgdgkaal8ffivhxil5fhfkxzazqnkl4i5zbmy"
},
"stable": {
"version": [
@@ -104638,20 +107024,20 @@
"repo": "redguardtoo/wucuo",
"unstable": {
"version": [
- 20200710,
- 932
+ 20201208,
+ 811
],
- "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2",
- "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3"
+ "commit": "609bab2d72690c2eb1562e87dfa468b927eb1295",
+ "sha256": "0h14af90zcbinrn8q5csjc7px4yag20as995mvcn0ik8h9xk6jc7"
},
"stable": {
"version": [
0,
2,
- 6
+ 9
],
- "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2",
- "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3"
+ "commit": "4ef50b621b93c0554c4a9e045df1d936ce925ad1",
+ "sha256": "17316pq7hlfjx7lbmslmjja4bdvg8mra7nsbaa7dsib6anh75kvn"
}
},
{
@@ -104762,11 +107148,11 @@
"repo": "xahlee/xah-css-mode",
"unstable": {
"version": [
- 20200627,
- 1652
+ 20201207,
+ 2036
],
- "commit": "98e550db52865d6de141d5bbb85f8b4e68b56b39",
- "sha256": "0km4b9praqpkv4n6sixmxjfvisp5640zyd1x85q43vkxrm39p7ah"
+ "commit": "3971ebee16fe57107261f6eda6438a234637dc36",
+ "sha256": "1cmlv344wpcvriybcc52hg8xg6pdl041xpgsw6shrgys9hq5jdzd"
}
},
{
@@ -104777,11 +107163,11 @@
"repo": "xahlee/xah-elisp-mode",
"unstable": {
"version": [
- 20200719,
- 1648
+ 20201014,
+ 1717
],
- "commit": "a051862622c56b7cad2057a95d8201ab38b50752",
- "sha256": "00kan9rb133mf11qq0grdkph6ghv0hgwvdx3b21890mad20zmk1w"
+ "commit": "fd7200afd199a52aea560173689039015aac595d",
+ "sha256": "0lg5yg1ckbqi5rw8y9jjymdqxl2z8ka959vghkbk7s9h8v6sidpq"
}
},
{
@@ -104807,11 +107193,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20200707,
- 1310
+ 20201208,
+ 2351
],
- "commit": "8c9c4df25e1406b093a32c87da19803337e4e09c",
- "sha256": "10d1xvyd2mbvhmlf1x5snqn4d22xg0p53nq601s8b4f1gws6zs59"
+ "commit": "e6162ebb8ca24e1ae025e3cc125dfdc99e6ec622",
+ "sha256": "0zih4ynhq3jn0as9v22cbi5f097qxqkgj1y43ydlk4szixx952kf"
}
},
{
@@ -104867,11 +107253,11 @@
"repo": "xahlee/xah-reformat-code",
"unstable": {
"version": [
- 20170821,
- 1111
+ 20200913,
+ 1701
],
- "commit": "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1",
- "sha256": "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw"
+ "commit": "c4682148759051b8c27f7be573981f8fc92447e9",
+ "sha256": "0kj0aj4vqfpxcn84fvl83wh5c96iw5hr1ycq50x65f0zkyxx59gv"
}
},
{
@@ -104912,11 +107298,11 @@
"url": "https://depp.brause.cc/xbm-life.git",
"unstable": {
"version": [
- 20200506,
- 1217
+ 20201116,
+ 1119
],
- "commit": "311ef62438c4ab057c054fcdda4dbfa5980759b5",
- "sha256": "1h8s5wiib9hb9bgqr3r5abpib9m61aa2pwiy3isjs5fkacvvxi9l"
+ "commit": "c5f442b152c46e5f31632e87be5c3a3c157a5ab1",
+ "sha256": "1481g835hk0j296jvjyawjcyj6lkvsjwz01r329i5bzhyvyn6lm5"
},
"stable": {
"version": [
@@ -104980,11 +107366,11 @@
"repo": "dkogan/xcscope.el",
"unstable": {
"version": [
- 20190723,
- 629
+ 20201025,
+ 2002
],
- "commit": "f3e2c84bd92f5a78182cc8d81f5358979a6c241c",
- "sha256": "0w2bxrnidladpzrd82z3w3gvjhajs71k5vjk2y03r09i9fwn2ykc"
+ "commit": "8e441efab0757778fe3594ff68c378bf90f539f9",
+ "sha256": "0v3jypw0c9m8lbiyq9dv4b7jpqjb1lr0qx619dy9xa48rdj107rh"
},
"stable": {
"version": [
@@ -105003,8 +107389,8 @@
"repo": "dandavison/xenops",
"unstable": {
"version": [
- 20200730,
- 1646
+ 20201111,
+ 1643
],
"deps": [
"aio",
@@ -105015,8 +107401,8 @@
"f",
"s"
],
- "commit": "78cbe16b74480ac6304865c9c3cfad36b5d49d1d",
- "sha256": "1rpcckp60pw1blkxs7wlp60pvpr847b6g2rcd6p0hpf5sx9wirgv"
+ "commit": "fd9a8ba23727170db9baef98950d51f4bfd99d34",
+ "sha256": "1g2bxwvhhn919wzgl4nlkisyl0886fs8bbdl0dn2ry7i3a732jbc"
}
},
{
@@ -105119,20 +107505,20 @@
"repo": "xml-rpc-el/xml-rpc-el",
"unstable": {
"version": [
- 20181002,
- 1353
+ 20200907,
+ 42
],
- "commit": "8f624f8b964e9145acb504e4457c9510e87dd93c",
- "sha256": "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj"
+ "commit": "8020ccd176986d8e49e0bb5dd9f4e756cf12eafc",
+ "sha256": "07vgwnk96i1vpsv2glg6kbkamjcs72xiznsa6xk7nl0nranzr3hd"
},
"stable": {
"version": [
1,
6,
- 13
+ 15
],
- "commit": "8f624f8b964e9145acb504e4457c9510e87dd93c",
- "sha256": "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj"
+ "commit": "8020ccd176986d8e49e0bb5dd9f4e756cf12eafc",
+ "sha256": "07vgwnk96i1vpsv2glg6kbkamjcs72xiznsa6xk7nl0nranzr3hd"
}
},
{
@@ -105166,19 +107552,19 @@
"repo": "ndw/xmlunicode",
"unstable": {
"version": [
- 20200812,
- 747
+ 20200823,
+ 755
],
- "commit": "8ae84ded4341aaa303903b4da142ef3ea456391e",
- "sha256": "0ki8i41jkkzk791dg5wvpl6nfa4py2bfcs6lf3wmw8y768vx6mbg"
+ "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc",
+ "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5"
},
"stable": {
"version": [
1,
- 22
+ 23
],
- "commit": "852bcbd0bd014f62c41ac78648e4f6664209b40b",
- "sha256": "03b18jhfpbhkaq5fj30k6drwpcpvrb6gf1l43ja1mnqyrilvni2x"
+ "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc",
+ "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5"
}
},
{
@@ -105204,11 +107590,11 @@
"repo": "seanfarley/xonsh-mode",
"unstable": {
"version": [
- 20191214,
- 114
+ 20201020,
+ 52
],
- "commit": "01819823822b6ebe01c02af548276cb2deb343f4",
- "sha256": "043ijxkab06zlag9hsd0xdw5bxqi6n8sd10zr62f7drwchmw9ln0"
+ "commit": "7fa581524533a9b6b770426e4445e571a69e469d",
+ "sha256": "0lfi2372clkkzi4a940fwparsfhxxzb7bmysfd50n1myakgldri5"
}
},
{
@@ -105237,20 +107623,20 @@
"repo": "paddymcall/xquery-tool.el",
"unstable": {
"version": [
- 20190523,
- 1119
+ 20200907,
+ 811
],
- "commit": "7f0859cc722607240689e57e14de8e0719052016",
- "sha256": "03vip403ifz9r4xkpiyi4mvb2plrn1f8906msdas84y13alhwnhq"
+ "commit": "bfbe9a70fb9fc7fdd24dcfa7085b16fb01f14501",
+ "sha256": "1bmsrj24apag8lwqzgs3gyfmxwmraq4psfcr8szib1f71yzq9sli"
},
"stable": {
"version": [
0,
- 1,
- 11
+ 2,
+ 0
],
- "commit": "7f0859cc722607240689e57e14de8e0719052016",
- "sha256": "03vip403ifz9r4xkpiyi4mvb2plrn1f8906msdas84y13alhwnhq"
+ "commit": "bd48e0f56b58e36309f7966dcf67db69d65100a4",
+ "sha256": "1c97pxkq9fq3bzycp02zmwldli3svqrg9lkxgfm95xd1b0qbigf6"
}
},
{
@@ -105317,8 +107703,8 @@
20200605,
2017
],
- "commit": "b9b1f84fb10fff5261702e38bf15b3ae75a4b6bb",
- "sha256": "0mb5a1g7sby3v4gaqgg9w3lr5albd99mj3kd2bgga7h7kbcjfp5a"
+ "commit": "1a4012854c69a5cdaeb5a73d2ad705011892fca3",
+ "sha256": "0mqqyqhkr70m12w9pf831aidqc6xz0cp16yii4g3nsjck914r6l9"
},
"stable": {
"version": [
@@ -105424,11 +107810,11 @@
"repo": "canatella/xwwp",
"unstable": {
"version": [
- 20200413,
- 757
+ 20200917,
+ 643
],
- "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
- "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+ "commit": "f67e070a6e1b233e60274deb717274b000923231",
+ "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg"
}
},
{
@@ -105439,14 +107825,14 @@
"repo": "canatella/xwwp",
"unstable": {
"version": [
- 20200331,
- 800
+ 20200917,
+ 642
],
"deps": [
"xwwp"
],
- "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
- "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+ "commit": "f67e070a6e1b233e60274deb717274b000923231",
+ "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg"
}
},
{
@@ -105457,14 +107843,14 @@
"repo": "canatella/xwwp",
"unstable": {
"version": [
- 20200331,
- 800
+ 20200917,
+ 642
],
"deps": [
"xwwp"
],
- "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
- "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+ "commit": "f67e070a6e1b233e60274deb717274b000923231",
+ "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg"
}
},
{
@@ -105547,8 +107933,8 @@
20200511,
2005
],
- "commit": "63b9b698fbb547603c3f66932c6d3e3bb217c443",
- "sha256": "0v0lp2n0xdxfiasr3lcydj9q4krfvzqi568iyngq6zxlryc75wi0"
+ "commit": "91159ce448e3bc9cc5759051e2b126599567893e",
+ "sha256": "1f0zb417y40iwx3x116lyp74hv9x6z5c500ydvig3qsjf7l82dx2"
}
},
{
@@ -105574,26 +107960,26 @@
"repo": "knu/yaml-imenu.el",
"unstable": {
"version": [
- 20181001,
- 627
+ 20201023,
+ 1524
],
"deps": [
"yaml-mode"
],
- "commit": "78a383098807014d9e7f2941196d8271677158cd",
- "sha256": "1f85m0h19wjb0xrwkxrh7vrpphm8l5nkrv82zsl097dqw3ijj3f1"
+ "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae",
+ "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p"
},
"stable": {
"version": [
1,
0,
- 1
+ 2
],
"deps": [
"yaml-mode"
],
- "commit": "78a383098807014d9e7f2941196d8271677158cd",
- "sha256": "1f85m0h19wjb0xrwkxrh7vrpphm8l5nkrv82zsl097dqw3ijj3f1"
+ "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae",
+ "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p"
}
},
{
@@ -105604,20 +107990,20 @@
"repo": "yoshiki/yaml-mode",
"unstable": {
"version": [
- 20200725,
- 1836
+ 20201109,
+ 1026
],
- "commit": "68fecb5f0dec712a10c8655df6881392a4613617",
- "sha256": "11lasdsray1cy01m4yiklin2apgfk2bac93m2ii88vjlv6b6vv04"
+ "commit": "fc5e1c58f94472944c4aa838f00f6adcac6fa992",
+ "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l"
},
"stable": {
"version": [
0,
0,
- 14
+ 15
],
- "commit": "5b4a0db384f996554454b5642e4531c502421de8",
- "sha256": "18g064ardqi1f3xz7j6rs1x9fvv9sn0iq9vgid8c6qvxq7gwj00r"
+ "commit": "fc5e1c58f94472944c4aa838f00f6adcac6fa992",
+ "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l"
}
},
{
@@ -105640,10 +108026,10 @@
},
{
"ename": "yandex-weather",
- "commit": "5221cee4c89dde5cebd9cddb3b4e4c5814b898d7",
- "sha256": "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md",
+ "commit": "dda8b0cb26b8c58ad58d74171821208dc5bfe452",
+ "sha256": "0s9q861cm7qjzzdngk3xm78p2qd4rjbyihw6j92j9x6jdh3p7nd8",
"fetcher": "github",
- "repo": "abstractionlayer/yandex-weather.el",
+ "repo": "acme4j/yandex-weather.el",
"unstable": {
"version": [
20160311,
@@ -105685,11 +108071,11 @@
"repo": "Kungsgeten/yankpad",
"unstable": {
"version": [
- 20200409,
- 1747
+ 20201118,
+ 844
],
- "commit": "acfccf3633d7fd3b91d717fda4ae98e8e3345a06",
- "sha256": "0xprfvgfcjdl20j1hxjk3f4gy7m3v0x9p0vyl2ygxmjj7ibgi7kw"
+ "commit": "7aea1769d206c0051a014622ee64be4f4f1f0494",
+ "sha256": "08na5qixdhkdkbhssk12mspqalnbss8f77a2qgia3cwb0gm5ijvz"
},
"stable": {
"version": [
@@ -105732,11 +108118,11 @@
"repo": "binjo/yara-mode",
"unstable": {
"version": [
- 20190423,
- 710
+ 20200916,
+ 1341
],
- "commit": "cd8093b1bc4fc260462f5284b157008fefa84880",
- "sha256": "04pl0kbx5g8wz00x7bhpi9w29wmxdmy5dhdq3j4rk3nys5njxr8v"
+ "commit": "03976d2c01e1295e179f279f73c0cea117ccba32",
+ "sha256": "1r3l6fbzihj4ac1pzk35kgl78p6cnbbzh6hnq5l9rp2crc0615v9"
}
},
{
@@ -105808,26 +108194,20 @@
"repo": "emacsorphanage/yascroll",
"unstable": {
"version": [
- 20200701,
- 336
+ 20201018,
+ 1346
],
- "deps": [
- "cl-lib"
- ],
- "commit": "9e828920d1931da66a473a66019922b9c3b729f5",
- "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b"
+ "commit": "cd66d81c5d4ba39da3c385d12d22f7103ecd67c5",
+ "sha256": "04mhjh163gp2shivxhilpacy22lrd2vswjf7934ldphw8qfahl2f"
},
"stable": {
"version": [
0,
- 1,
- 9
+ 2,
+ 0
],
- "deps": [
- "cl-lib"
- ],
- "commit": "9e828920d1931da66a473a66019922b9c3b729f5",
- "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b"
+ "commit": "cd66d81c5d4ba39da3c385d12d22f7103ecd67c5",
+ "sha256": "04mhjh163gp2shivxhilpacy22lrd2vswjf7934ldphw8qfahl2f"
}
},
{
@@ -105886,15 +108266,14 @@
"repo": "AndreaCrotti/yasnippet-snippets",
"unstable": {
"version": [
- 20200802,
- 1658
+ 20201118,
+ 2148
],
"deps": [
- "s",
"yasnippet"
],
- "commit": "b83c0f2f3bd068aa93c8f4c0c07f0b0a137d9cda",
- "sha256": "0j1955y6gc3ddv783pd9kx834vvicpdsj49smkkpk4rj4s7pfxkz"
+ "commit": "9fc9c2144aa3db4d85fdd35f7df28e58aa1801b3",
+ "sha256": "1a0wf16ai4rlm3z3b7kk5000izq1xkjwc7cvjmxgmy02sa8bif69"
},
"stable": {
"version": [
@@ -105923,8 +108302,8 @@
"deps": [
"yasnippet"
],
- "commit": "23865adaee824db44acec8a4366ce2f29dd2e978",
- "sha256": "0ri0kw70yy6mm17drpw5sifscaan3f32fj3xapa0hbz5jxrs9cr9"
+ "commit": "399564fc1afa100aa6049ac6de11fb065882d230",
+ "sha256": "0gvysijv659z843r692wzfjz5p8j2dr79m8fzcnajnrpim9jf2j8"
},
"stable": {
"version": [
@@ -106013,8 +108392,8 @@
"request-deferred",
"s"
],
- "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477",
- "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv"
+ "commit": "c17ff9e0250a9b39d23af37015a2b300e2f36fed",
+ "sha256": "0amdz2ss953lm39yky1dv3zp20ig97mxsk7z81694bpxnhn4kxad"
},
"stable": {
"version": [
@@ -106179,11 +108558,11 @@
"repo": "ryuslash/yoshi-theme",
"unstable": {
"version": [
- 20200422,
- 208
+ 20200909,
+ 513
],
- "commit": "caa83e4475885a2c9a126630f0feec1ce2eb0c4e",
- "sha256": "0sga52lz54c2v08j6m9v3ddv7rlpdcgi9lkxn1cvajm5h60b20r8"
+ "commit": "1ca48766209d941f0300d725ce9bec5a8bc2d642",
+ "sha256": "1abzv19aghgjkzc15wcii3fvapjx221imap48gfn2d3ckbppy8lb"
},
"stable": {
"version": [
@@ -106237,30 +108616,30 @@
"repo": "tuedachu/ytdl",
"unstable": {
"version": [
- 20200727,
- 1824
+ 20201017,
+ 1024
],
"deps": [
"async",
"dash",
"transient"
],
- "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f",
- "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm"
+ "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03",
+ "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7"
},
"stable": {
"version": [
1,
3,
- 4
+ 5
],
"deps": [
"async",
"dash",
"transient"
],
- "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f",
- "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm"
+ "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03",
+ "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7"
}
},
{
@@ -106274,8 +108653,8 @@
20200725,
1056
],
- "commit": "d80c7964ec66589d5580fc13773e94f1834ab76f",
- "sha256": "124pvj39lcv3dfz2m42qyydyab0xk6c5da54ffhrqbg8vri34w9w"
+ "commit": "d40bc7ead8d4d7e4d16b03b66a93d63bef51cc5f",
+ "sha256": "0pxzfsxzrpv59dssrgx2mmwkm6rzk49ffjkgsa3wks7rdyfil3kf"
}
},
{
@@ -106388,19 +108767,20 @@
"repo": "bbatsov/zenburn-emacs",
"unstable": {
"version": [
- 20200701,
- 1333
+ 20201121,
+ 1050
],
- "commit": "c09dbd9a36bbc0062b90be182f2b4cac64128cee",
- "sha256": "0lr73kghsi1f5awhgsbvh4snkbdkkpjn5bwf6s6ypbybmjf6kjxd"
+ "commit": "ea9b8f3aedc6640cb0d15d77f7bb5d98830abe97",
+ "sha256": "171kqnjqhj69jl6idnbrnk2gpjv127h4n3y9cplnqpp7wfigzdzi"
},
"stable": {
"version": [
2,
- 6
+ 7,
+ 0
],
- "commit": "4c75edfe7862c903b2584266284ed951004f5b62",
- "sha256": "1n87r5hs7h5r8dgfid66skpzcypl9hssr9m3npp916g6jfsi782f"
+ "commit": "3e00f0e2e6202dd61216e2cb967c1da6a62e9a8d",
+ "sha256": "1991s1gz2i3jchf0yvcsjjb5flwn13ifbnnfkqqrxxvy2imfh18q"
}
},
{
@@ -106435,10 +108815,10 @@
},
{
"ename": "zeno-theme",
- "commit": "9703a222f51dc283e9462cceb5afeb009f7401dc",
- "sha256": "0bqv1gdqlh7i48ckpgss6h9mmc9hpkqlb94aam0kkq2ga125gmwc",
+ "commit": "b0f1866eff58e706c9f97895bcb7c9cf08b104be",
+ "sha256": "0wf6xslnb2avxd4zr1285cb4flwkmwc6j9d8zikrjz7jx3l0xqib",
"fetcher": "github",
- "repo": "jbharat/zeno-theme",
+ "repo": "1bharat/zeno-theme",
"unstable": {
"version": [
20181027,
@@ -106448,6 +108828,30 @@
"sha256": "1zl1ks7n35i9mn5w7ac3j15820fbgpbcmmysv25crvi4g9z94mqj"
}
},
+ {
+ "ename": "zenscript-mode",
+ "commit": "2879811c121d24f14f23fb45afabd31fbd4246e1",
+ "sha256": "141im3qrpssjzlpiy72zzdyhqdcshpn68yvdqdvcxajrakkh8d0w",
+ "fetcher": "github",
+ "repo": "eutropius225/zenscript-mode",
+ "unstable": {
+ "version": [
+ 20201206,
+ 2129
+ ],
+ "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a",
+ "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 0
+ ],
+ "commit": "5ec8663f3d2e6391f18a9f3a78864bcf6962898a",
+ "sha256": "1j99gds76dvnkrqrddd1fw6k3f8x7zixdpdv71qsirjw8nvsyhk4"
+ }
+ },
{
"ename": "zephir-mode",
"commit": "fac9fb89cbe5c3eea987fadf23db20c214eab4d9",
@@ -106547,15 +108951,15 @@
"repo": "EFLS/zetteldeft",
"unstable": {
"version": [
- 20200812,
- 2159
+ 20201207,
+ 852
],
"deps": [
"ace-window",
"deft"
],
- "commit": "2c4ddbf3e30e2f3ae6e877e08fd824b325fa7a62",
- "sha256": "029fh32d2vilxlqs5jl3wc907ykxdkv36jjfzappyghd1qkp0iyi"
+ "commit": "cd5e0a9ef748ed9d0484f8bc1e123c50017882b6",
+ "sha256": "0ifcs6x3wx5jah223wchs03r8fmcjsza50shm2dbk8zzzfk6zv1k"
},
"stable": {
"version": [
@@ -106577,15 +108981,15 @@
"repo": "damon-kwok/zetz-mode",
"unstable": {
"version": [
- 20200812,
- 957
+ 20200823,
+ 536
],
"deps": [
"dash",
"hydra"
],
- "commit": "3bd2cdb4f6c6e8400d58fa1001d0513e39ce38bb",
- "sha256": "0v1aa0hr607afxd03p44m1abx2c8a5k91i047q7nv8sv0cd65ack"
+ "commit": "04da33f4ffa9db5b3556f423276f4fd1db13ec67",
+ "sha256": "07cl2y6qdxbhjawg93l3yxkx6skmcnl9278qq1aksvh17v4ajydv"
},
"stable": {
"version": [
@@ -106609,11 +109013,11 @@
"repo": "ziglang/zig-mode",
"unstable": {
"version": [
- 20200713,
- 407
+ 20201022,
+ 955
],
- "commit": "d88580913586b8749ed0ac3ae228e825a68f9412",
- "sha256": "0r3cn6yxs013080il91x9b6fyx84bx3vzv7vkyr8npc2cz46klxs"
+ "commit": "6f10653cc17b9c74150ac2f6833eaaaf55488398",
+ "sha256": "00mz9z181ppr6ad9614k24vlzi4b6flqzzwc1f8vlp7ixnk9i47g"
}
},
{
@@ -106624,8 +109028,8 @@
"repo": "WillForan/zim-wiki-mode",
"unstable": {
"version": [
- 20200316,
- 1223
+ 20200908,
+ 218
],
"deps": [
"dokuwiki-mode",
@@ -106634,8 +109038,8 @@
"link-hint",
"pretty-hydra"
],
- "commit": "410fa67d5947b8801b03a58fcb2bd414cb5294f7",
- "sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5"
+ "commit": "f65a2da6ea762532355fc726319ba3e3dd217ec2",
+ "sha256": "0m18giykwldj21zgv5rbni0pbpbrx5mnmkj5jyd2zpgwi1n7w3im"
}
},
{
@@ -106646,14 +109050,14 @@
"repo": "schmir/zimports.el",
"unstable": {
"version": [
- 20200606,
- 1700
+ 20200809,
+ 2035
],
"deps": [
"projectile"
],
- "commit": "a96e9b993c9aaccf1fd07c8fddfc247c4e07618c",
- "sha256": "1bzfdwyc4aybvnh20q7ypghpi3zrhhs0v8488lksjl26j23mhrwk"
+ "commit": "4067b20a2ea25327504b0a42f443903728aa7966",
+ "sha256": "01ljp3cpslkmp8kxm24ayp5jlg6r431vpk6dm1b9ylr4x4p1klgx"
}
},
{
@@ -106673,20 +109077,20 @@
},
{
"ename": "zmq",
- "commit": "72f4dcc2723de826bf1af7235ac6d9119a243c63",
- "sha256": "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc",
+ "commit": "61e8b805f553b9eaf333b0ebc67830668bba55c1",
+ "sha256": "1r2lb39i08rpvbly5b2dbhpgnkdb276kr5hq965cv2snbmybyx2m",
"fetcher": "github",
- "repo": "dzop/emacs-zmq",
+ "repo": "nnicandro/emacs-zmq",
"unstable": {
"version": [
- 20200305,
- 2345
+ 20200912,
+ 1126
],
"deps": [
"cl-lib"
],
- "commit": "2aed40aee51d19cbca83d1f1edc23a5f1522dd8d",
- "sha256": "1viz4sw4vmnjhhqw68wp8a4ks1751s2dk09gx2gyl8gy5vw2fcg6"
+ "commit": "eb4e01715cbf2f356a8ae5e678ffec3380a907dc",
+ "sha256": "0s21w3yc41hvrd881f5y8w6jczyd3bq7nbw5m13xr96yrv1d24mz"
},
"stable": {
"version": [
@@ -106780,8 +109184,8 @@
"deps": [
"esxml"
],
- "commit": "48625814f42c39521405d08009e1d44108d880ac",
- "sha256": "1ii7w9y357l2467733wy7nnpikpdacjfj9bp2a54nq8h60gfr661"
+ "commit": "253a0484ea5076c0f485c561a3f8370ba560f4f2",
+ "sha256": "094kn0yxgzl9c39qm12h9cp6yia2rhaxwf9zmq2lk5x93nnss6m5"
},
"stable": {
"version": [
@@ -106876,11 +109280,11 @@
"repo": "emacsorphanage/zoom-window",
"unstable": {
"version": [
- 20200323,
- 720
+ 20201205,
+ 1038
],
- "commit": "ab14a365f3e496b07f5efc20992f9094ec166f06",
- "sha256": "0ah0gfzp0c90vrqmsfd6crl3i6bjqgb78hnpcvvg53gk5i19i4aw"
+ "commit": "474ca4723517d95356145950b134652d5dc0c7f7",
+ "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd"
},
"stable": {
"version": [
@@ -106954,15 +109358,15 @@
"repo": "egh/zotxt-emacs",
"unstable": {
"version": [
- 20200120,
- 1950
+ 20200514,
+ 423
],
"deps": [
"deferred",
"request"
],
- "commit": "2e7ce60fa4b0311c646a509c140fd1c94c08fa79",
- "sha256": "0ww0bg3bbrynnfhkkr7vdsrjc3341ngkzf83nn934zl0aphg87wb"
+ "commit": "63f13c794b165d047867d8e688cd17ae91bad858",
+ "sha256": "1s15fyg2ib3kpcxpc5i3cp8cayh163937az49agicnfsqwny5cpd"
},
"stable": {
"version": [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
index 0e09b0c20e..101dbdaa2e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
@@ -42,7 +42,12 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
let
-in stdenv.mkDerivation {
+in stdenv.mkDerivation (lib.optionalAttrs nativeComp {
+ NATIVE_FULL_AOT = "1";
+ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
+} // lib.optionalAttrs stdenv.isDarwin {
+ CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
+} // {
inherit pname version patches;
src = fetchurl {
@@ -88,10 +93,6 @@ in stdenv.mkDerivation {
""
];
- CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
-
- LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
-
nativeBuildInputs = [ pkgconfig makeWrapper ]
++ lib.optionals srcRepo [ autoreconfHook texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
@@ -141,8 +142,7 @@ in stdenv.mkDerivation {
siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
- rm -rf $out/var
- rm -rf $siteVersionDir
+ rm -r $out/share/emacs/$siteVersionDir/site-lisp
'' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do
dstdir=$out/share/emacs/$siteVersionDir/$srcdir
@@ -156,6 +156,11 @@ in stdenv.mkDerivation {
mv nextstep/Emacs.app $out/Applications
'' + lib.optionalString (nativeComp && withNS) ''
ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
+ '' + lib.optionalString nativeComp ''
+ mkdir -p $out/share/emacs/native-lisp
+ $out/bin/emacs --batch \
+ --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \
+ -f batch-native-compile $out/share/emacs/site-lisp/site-start.el
'';
postFixup = lib.concatStringsSep "\n" [
@@ -196,4 +201,4 @@ in stdenv.mkDerivation {
separately.
'';
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el
index 2f02d6d1a8..01a6422d73 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el
@@ -22,6 +22,36 @@ least specific (the system profile)"
(nix--profile-paths)))))
(setq load-path (append paths load-path)))
+;;; Remove wrapper site-lisp from EMACSLOADPATH so it's not propagated
+;;; to any other Emacsen that might be started as subprocesses.
+(let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLisp"))
+ (env-load-path (getenv "EMACSLOADPATH")))
+ (when wrapper-site-lisp
+ (setenv "emacsWithPackages_siteLisp" nil))
+ (when (and wrapper-site-lisp env-load-path)
+ (let* ((env-list (split-string env-load-path ":"))
+ (new-env-list (delete wrapper-site-lisp env-list)))
+ (setenv "EMACSLOADPATH" (when new-env-list
+ (mapconcat 'identity new-env-list ":"))))))
+
+(let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLispNative"))
+ (env-load-path (getenv "EMACSNATIVELOADPATH")))
+ (when wrapper-site-lisp
+ (setenv "emacsWithPackages_siteLispNative" nil))
+ (when (and wrapper-site-lisp env-load-path)
+ (let* ((env-list (split-string env-load-path ":"))
+ (new-env-list (delete wrapper-site-lisp env-list)))
+ (setenv "EMACSNATIVELOADPATH" (when new-env-list
+ (mapconcat 'identity new-env-list ":"))))))
+
+;;; Set up native-comp load path.
+(when (featurep 'comp)
+ ;; Append native-comp subdirectories from `NIX_PROFILES'.
+ (setq comp-eln-load-path
+ (append (mapcar (lambda (profile-dir)
+ (concat profile-dir "/share/emacs/native-lisp/"))
+ (nix--profile-paths))
+ comp-eln-load-path)))
;;; Make `woman' find the man pages
(defvar woman-manpath)
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix
index 07776bebe4..43dbd137f7 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf
+{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
+, vmopts ? null
}:
{ name, product, version, src, wmClass, jdk, meta }:
@@ -9,6 +10,11 @@ with stdenv.lib;
let loName = toLower product;
hiName = toUpper product;
execName = concatStringsSep "-" (init (splitString "-" name));
+ vmoptsName = loName
+ + ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
+ then ""
+ else "64" )
+ + ".vmoptions";
in
with stdenv; lib.makeOverridable mkDerivation rec {
@@ -26,6 +32,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
'';
};
+ vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts);
+
nativeBuildInputs = [ makeWrapper patchelf unzip ];
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
@@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
- --set JAVA_HOME "$jdk"
+ --set JAVA_HOME "$jdk" \
+ --set ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$item/share/applications" $out/share
'';
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
index 78e6ad30b7..9638bea60c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
@@ -2,12 +2,13 @@
, python
, jdk, cmake, libxml2, zlib, python3, ncurses5
, dotnet-sdk_3
+, vmopts ? null
}:
with stdenv.lib;
let
- mkJetBrainsProduct = callPackage ./common.nix { };
+ mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; };
# Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }:
@@ -48,7 +49,7 @@ let
patchelf \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
- bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
+ bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
patchelf \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
@@ -268,12 +269,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2020.2.5"; /* updated by script */
+ version = "2020.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */
+ sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -294,12 +295,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2020.2.3"; /* updated by script */
+ version = "2020.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */
+ sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -346,12 +347,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2020.2.4"; /* updated by script */
+ version = "2020.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */
+ sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -359,12 +360,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2020.2.5"; /* updated by script */
+ version = "2020.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */
+ sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -372,12 +373,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2020.2.5"; /* updated by script */
+ version = "2020.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */
+ sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix
index f1f8110665..67a2ac5fac 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
export version="v${version}"
'';
- doInstallCheckPhase = true;
+ doInstallCheck = true;
installCheckPhase = ''
- $out/bin/kak -ui json -E "kill 0"
+ $out/bin/kak -ui json -e "kill 0"
'';
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 524835402f..23c8f0698c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1j5m9mhjzp2r4wdwnnnckms8ic536s6y0iyry2zdndbsy215hqlz";
+ sha256 = "0xjijkmp3drnfrx4gb4bwf8n1dgwk310c0mssm6drffwix7ljpbz";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 9af12b386a..041c25f172 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.6.0";
+ version = "5.6.1";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1bm6jk7gkl4vi579x99mja4znrzzp15zk66ss600dn8aq11jrxv2";
+ sha256 = "1jma7j70imzxlyz8580m79jycif7zphga3zzfmqimn8syzz917hv";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix
new file mode 100644
index 0000000000..0fe00d0840
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitHub
+, capstone
+, jansson
+, wxGTK30
+, darwin
+, libicns
+, wxmac
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rehex";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "solemnwarning";
+ repo = pname;
+ rev = version;
+ sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32";
+ };
+
+ patchPhase = ''
+ substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \
+ 'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png'
+ '';
+
+ nativeBuildInputs = stdenv.lib.optionals (stdenv.isDarwin) [ libicns ];
+
+ buildInputs = [ capstone jansson ]
+ ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ wxGTK30 ])
+ ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ]));
+
+ makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]);
+
+ meta = with stdenv.lib; {
+ description = "Reverse Engineers' Hex Editor";
+ longDescription = ''
+ A cross-platform (Windows, Linux, Mac) hex editor for reverse
+ engineering, and everything else.
+ '';
+ homepage = "https://github.com/solemnwarning/rehex";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ markus1189 SuperSandro2000 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix
index 5191b916b6..c8eb119eb0 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "vis";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
rev = "v${version}";
- sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh";
+ sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji";
repo = "vis";
owner = "martanne";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh
index 0ddab6063c..5df4cafdee 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh
@@ -23,6 +23,6 @@ VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSC
VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL})
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix"
-VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip"
+VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL})
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix"
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 70f6211771..8f04e6b178 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n";
- x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x";
+ x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c";
+ x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r";
}.${system};
in
callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.51.1";
+ version = "1.52.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
index c7c57a9e3e..5181c2c676 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
+{ fetchurl, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }:
stdenv.mkDerivation rec {
- name = "zile-2.4.14";
+ name = "zile-2.6.0.90";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s";
+ sha256 = "1bhdwnasmqhy0hi3fqmpzr8xkw5zlqjpmf1cj42h4cg3fnamp6r3";
};
- buildInputs = [ ncurses boehmgc ];
- nativeBuildInputs = [ perl pkgconfig ]
+ buildInputs = [ glib libgee ncurses boehmgc vala ];
+ nativeBuildInputs = [ perl pkg-config ]
# `help2man' wants to run Zile, which won't work when the
# newly-produced binary can't be run at build-time.
++ stdenv.lib.optional
diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix
index 54d3d59875..6f395640f5 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix
@@ -1,8 +1,9 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
-, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
+, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
, withGrass ? true, grass
+, withWebKit ? true, qtwebkit
}:
with lib;
let
@@ -10,7 +11,7 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in mkDerivation rec {
- version = "3.10.11";
+ version = "3.10.13";
pname = "qgis";
name = "${pname}-unwrapped-${version}";
@@ -18,7 +19,7 @@ in mkDerivation rec {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q";
+ sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb";
};
passthru = {
@@ -28,8 +29,10 @@ in mkDerivation rec {
buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
- qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
- (lib.optional withGrass grass) ++ pythonBuildInputs;
+ qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ]
+ ++ lib.optional withGrass grass
+ ++ lib.optional withWebKit qtwebkit
+ ++ pythonBuildInputs;
nativeBuildInputs = [ cmake flex bison ninja ];
@@ -44,17 +47,15 @@ in mkDerivation rec {
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
- "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++
- lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
+ "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ]
+ ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
+ ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
meta = {
description = "A Free and Open Source Geographic Information System";
- homepage = "http://www.qgis.org";
+ homepage = "https://www.qgis.org";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
- maintainers = with lib.maintainers; [ lsix ];
- # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit
- # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
- broken = true;
+ maintainers = with lib.maintainers; [ lsix sikmir ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix
index bc7d888e2c..ef036fb71b 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "qmapshack";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "Maproom";
repo = pname;
rev = "V_${version}";
- sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
+ sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
index 50df22c186..96c2e80668 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
@@ -32,11 +32,11 @@
mkDerivation rec {
pname = "saga";
- version = "7.8.1";
+ version = "7.8.2";
src = fetchurl {
- url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
- sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM=";
+ url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
+ sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix
index f817a33216..d0d9f10087 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix
@@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
};
patches = [
+ # Fix version in qtikz.pro
(fetchpatch {
url = "https://github.com/fhackenberger/ktikz/commit/972685a406517bb85eb561f2c8e26f029eacd7db.patch";
sha256 = "13z40rcd4m4n088v7z2ns17lnpn0z3rzp31lsamic3qdcwjwa5k8";
})
+ # Fix missing qt5.15 QPainterPath include
+ (fetchpatch {
+ url = "https://github.com/fhackenberger/ktikz/commit/ebe4dfb72ac8a137b475ef688b9f7ac3e5c7f242.patch";
+ sha256 = "GIgPh+iUBPftHKIpZR3a0FxmLhMLuPUapF/t+bCuqMs=";
+ })
];
nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix
index c9110cbea0..24c80a6bd8 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix
@@ -1,13 +1,15 @@
{ stdenv
, lib
, fetchFromGitHub
-, python3
, wrapGAppsHook
+, installShellFiles
+, python3
, gobject-introspection
, gtk3
, gdk-pixbuf
+
# Recommended Dependencies:
-, unrarSupport ? false
+, unrarSupport ? false # unfree software
, unrar
, p7zip
, lhasa
@@ -18,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "mcomix3";
version = "unstable-2020-11-23";
- # fetch from github because no official release on pypi/github and no build system
+ # no official release on pypi/github and no build system
src = fetchFromGitHub {
repo = "${pname}";
owner = "multiSnow";
@@ -27,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
};
buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
- nativeBuildInputs = [ wrapGAppsHook ];
+ nativeBuildInputs = [ wrapGAppsHook installShellFiles ];
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
format = "other";
@@ -55,7 +57,8 @@ python3.pkgs.buildPythonApplication rec {
postInstall = ''
rmdir $libdir/mcomix/mcomix
- cp man/* $out/share/man/man1/
+ mv man/mcomix.1 man/${pname}.1
+ installManPage man/*
cp -r mime/icons/* $out/share/icons/hicolor/
cp mime/*.desktop $out/share/applications/
cp mime/*.appdata.xml $out/share/metainfo/
@@ -63,12 +66,13 @@ python3.pkgs.buildPythonApplication rec {
for folder in $out/share/icons/hicolor/*; do
mkdir $folder/{apps,mimetypes}
mv $folder/*.png $folder/mimetypes
+ cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png
done
'';
- # to prevent double wrapping
+ # prevent double wrapping
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
@@ -77,7 +81,7 @@ python3.pkgs.buildPythonApplication rec {
)
'';
- # real pytests seem to be broken upstream
+ # real pytests broken upstream
checkPhase = ''
$out/bin/comicthumb --help > /dev/null
$out/bin/${pname} --help > /dev/null
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix
index b201f9dbf0..d0c8d1c9ee 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix
@@ -66,7 +66,6 @@ mkDerivation rec {
libGLU libGL
libXt
openmpi
- (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ]))
tbb
boost
ffmpeg
@@ -78,6 +77,10 @@ mkDerivation rec {
qtsvg
];
+ propagatedBuildInputs = [
+ (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ]))
+ ];
+
meta = with stdenv.lib; {
homepage = "https://www.paraview.org/";
description = "3D Data analysis and visualization application";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix
index d8080e6fbb..ba7e945214 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/qvge/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "qvge";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "ArsMasiuk";
repo = pname;
rev = "v${version}";
- sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll";
+ sha256 = "0qy73dngl1xm6mr2306ddzbbrzk6yszp3y15phs861bfxynzkqjz";
};
prePatch = "cd src";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
index da453b4267..c21d0ed205 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
@@ -4,7 +4,7 @@
, cmake
, gettext
, wrapGAppsHook
-, pkgconfig
+, pkg-config
, glib
, gsettings-desktop-schemas
@@ -22,16 +22,16 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
- version = "1.0.19";
+ version = "1.0.20";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
- sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq";
+ sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k";
};
- nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
buildInputs =
[ glib
gsettings-desktop-schemas
@@ -50,8 +50,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
homepage = "https://xournalpp.github.io/";
diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix
index 315a5b3588..1f0f7b5ace 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix
@@ -42,8 +42,8 @@ let
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
- name = "${name}-${version}";
- inherit src;
+ pname = name;
+ inherit src version;
outputs = args.outputs or [ "out" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix
index 9a51aa786f..5a77cfec2f 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix
@@ -43,6 +43,6 @@ mkDerivation rec {
description = "A simple media player for KDE";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
- broken = lib.versionOlder qtbase.version "5.14";
+ broken = lib.versionOlder qtbase.version "5.15";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
index 6204919a32..92a0f1cde4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
@@ -9,6 +9,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
+ broken = lib.versionOlder qtbase.version "5.13.0";
};
output = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmime.nix b/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
index 4523a69fc1..ac877d8522 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
@@ -13,4 +13,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
index bbaad3a02f..3a264e4025 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
@@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
+ kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
+ fetchpatch
}:
mkDerivation {
@@ -11,5 +12,15 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
+
+ patches = [
+ (fetchpatch {
+ # Portaway from Obsolete methods of QPrinter
+ # Part of v20.12.0
+ url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
+ sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
+ })
+ ];
+
outputs = [ "out" "dev" ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix b/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
index 4ede854d54..6f79a46202 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
- kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
+ kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools,
qtspeech
}:
@@ -11,6 +11,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
+ broken = lib.versionOlder qtbase.version "5.13.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix b/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix
index 15dfe7f2e4..f31b37de93 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix
@@ -8,7 +8,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
- broken = lib.versionOlder qtbase.version "5.13";
+ broken = lib.versionOlder qtbase.version "5.15";
};
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ qtbase karchive ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libkgapi.nix b/third_party/nixpkgs/pkgs/applications/kde/libkgapi.nix
index 9d2d41c41d..0e1d71d274 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkgapi.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libkgapi.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- qtwebengine, kio, kcalendarcore, kcontacts,
+ qtbase, qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@@ -10,6 +10,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
+ broken = lib.versionOlder qtbase.version "5.14.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
index 09779f8876..635cd9a991 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
@@ -5,25 +5,25 @@ watchdog, wtforms }:
python3.pkgs.buildPythonApplication rec {
pname = "archivy";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchPypi {
inherit pname version;
- sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c";
+ sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506";
};
# Relax some dependencies
postPatch = ''
substituteInPlace requirements.txt \
- --replace 'validators ==' 'validators >=' \
- --replace 'elasticsearch ==' 'elasticsearch >=' \
- --replace 'python-dotenv ==' 'python-dotenv >=' \
- --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
--replace 'WTForms ==' 'WTForms >=' \
- --replace 'python_dotenv ==' 'python_dotenv >=' \
--replace 'attrs == 20.2.0' 'attrs' \
+ --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
+ --replace 'elasticsearch ==' 'elasticsearch >=' \
+ --replace 'python_dotenv ==' 'python_dotenv >=' \
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
- --replace 'requests ==' 'requests >='
+ --replace 'requests ==' 'requests >=' \
+ --replace 'validators ==' 'validators >=' \
+ --replace 'watchdog ==' 'watchdog >='
'';
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix
new file mode 100644
index 0000000000..e79d989e22
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix
@@ -0,0 +1,28 @@
+{ lib, appimageTools, fetchurl }:
+
+let
+ pname = "chrysalis";
+ version = "0.7.9";
+in appimageTools.wrapType2 rec {
+ name = "${pname}-${version}-binary";
+
+ src = fetchurl {
+ url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage";
+ sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi";
+ };
+
+ multiPkgs = null;
+ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
+ p.glib
+ ];
+
+ extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}";
+
+ meta = with lib; {
+ description = "A graphical configurator for Kaleidoscope-powered keyboards";
+ homepage = "https://github.com/keyboardio/Chrysalis";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ aw ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
index d76cf9b106..073983fa35 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dasel";
- version = "1.8.0";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw=";
+ sha256 = "1xyh41vb2rypajjzbysw6k8x39bna8j3fmxcqyjcrqs0dzx78nk3";
};
- vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
+ vendorSha256 = "1il1vnv0v97qh8f47md5i6qaac2k8par0pd0z7zqg67vxq6gim85";
buildFlagsArray = ''
-ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix
new file mode 100644
index 0000000000..98fe799b11
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchurl
+, autoPatchelfHook
+, gtk3
+, gobject-introspection
+, libxml2
+}:
+
+let
+ version = "1.7.2";
+
+ dbusService = fetchurl {
+ url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in";
+ sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s";
+ };
+in
+stdenv.mkDerivation rec {
+ inherit version;
+ pname = "deadd-notification-center";
+
+ src = fetchurl {
+ url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}";
+ sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm";
+ };
+
+ dontUnpack = true;
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+
+ buildInputs = [
+ gtk3
+ gobject-introspection
+ libxml2
+ ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/dbus-1/services
+ cp $src $out/bin/deadd-notification-center
+ chmod +x $out/bin/deadd-notification-center
+
+ sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A haskell-written notification center for users that like a desktop with style";
+ homepage = "https://github.com/phuhl/linux_notification_center";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.pacman99 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
index 17dfd08f90..bce224f21b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
@@ -34,7 +34,6 @@ mkDerivation rec {
install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
- install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
cat > $out/share/applications/diffpdf.desktop </dev/null
'';
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
index a93ebb12ed..906c458fba 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.15.4";
+ version = "1.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111";
+ sha256 = "35df7605a21a05c3290f4324289fd6f584029f4135a8220dec7d490c4e742a1c";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
index 1f2c275b13..707a7adb8a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "geoipupdate";
- version = "4.5.0";
+ version = "4.6.0";
src = fetchFromGitHub {
owner = "maxmind";
repo = "geoipupdate";
rev = "v${version}";
- sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr";
+ sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq";
};
vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
index 57a40f8d18..65848fac95 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "goldendict";
- version = "2020-05-27";
+ version = "2020-12-09";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
- rev = "ec40c1dcfde6df1dc7950443b46ae22c283b1e52";
- sha256 = "1zmnwwnpnrqfyf7vmmh38r95q2fl4cqzbkp69bcwkr0xc80wgyz7";
+ rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";
+ sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix
index 1915b2dae1..70862bb61e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.gpsbabel.org/";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
index 421d02e97b..c58f87d1ab 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "Shell history suggest box - easily view, navigate, search and use your command history";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
- platforms = with stdenv.lib.platforms; linux; # Cannot test others
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
index 851022899d..f0e2b70d93 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix
@@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "IPMIView";
- version = "2.17.0";
- buildVersion = "200505";
+ version = "2.18.0";
+ buildVersion = "201007";
src = fetchurl {
url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
- sha256 = "0ba0694krj2q77zwdn22v2qzjdy52a7ryhgc3m51s7p17ahigz97";
+ sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8";
};
nativeBuildInputs = [ patchelf makeWrapper ];
@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
- patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
- patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM_v11_64.so
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
'';
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
# WORK_DIR: unfortunately the ikvm related binaries are loaded from
# and user configuration is written to files in the CWD
makeWrapper $out/jre/bin/java $out/bin/IPMIView \
- --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \
+ --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \
--prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
--add-flags "-jar $out/IPMIView20.jar" \
--run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index ffc7c0e2ae..65c747c40a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,17 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.3.2)
+ activesupport (6.1.0)
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)
colorator (1.1.0)
concurrent-ruby (1.1.7)
- em-websocket (0.5.1)
+ em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
@@ -24,21 +24,21 @@ GEM
http_parser.rb (0.6.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
- jekyll (4.1.1)
+ jekyll (4.2.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
- kramdown (~> 2.1)
+ kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
pathutil (~> 0.9)
rouge (~> 3.0)
safe_yaml (~> 1.0)
- terminal-table (~> 1.8)
+ terminal-table (~> 2.0)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-mentions (1.6.0)
@@ -46,8 +46,8 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
- jekyll-seo-tag (2.6.1)
- jekyll (>= 3.3, < 5.0)
+ jekyll-seo-tag (2.7.1)
+ jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
@@ -61,32 +61,31 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
- listen (3.2.1)
+ listen (3.3.3)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.4.0)
- minitest (5.14.1)
+ minitest (5.14.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (4.0.5)
+ public_suffix (4.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
- rouge (3.22.0)
+ rouge (3.26.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
- terminal-table (1.8.0)
+ terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- thread_safe (0.3.6)
- tzinfo (1.2.7)
- thread_safe (~> 0.1)
+ tzinfo (2.0.3)
+ concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
- zeitwerk (2.4.0)
+ zeitwerk (2.4.2)
PLATFORMS
ruby
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
index b14b27f375..9f33cdc53e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
+ sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
type = "gem";
};
- version = "6.0.3.2";
+ version = "6.1.0";
};
addressable = {
dependencies = ["public_suffix"];
@@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+ sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb";
type = "gem";
};
- version = "0.5.1";
+ version = "0.5.2";
};
eventmachine = {
groups = ["default"];
@@ -130,10 +130,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
+ sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq";
type = "gem";
};
- version = "4.1.1";
+ version = "4.2.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -174,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
+ sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3";
type = "gem";
};
- version = "2.6.1";
+ version = "2.7.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -250,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
+ sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.3";
};
mercenary = {
groups = ["default"];
@@ -280,10 +280,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+ sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
type = "gem";
};
- version = "5.14.1";
+ version = "5.14.2";
};
nokogiri = {
dependencies = ["mini_portile2"];
@@ -312,10 +312,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
- version = "4.0.5";
+ version = "4.0.6";
};
rb-fsevent = {
groups = ["default"];
@@ -353,10 +353,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.22.0";
+ version = "3.26.0";
};
safe_yaml = {
groups = ["default"];
@@ -385,31 +385,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh";
type = "gem";
};
- version = "1.8.0";
- };
- thread_safe = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
- type = "gem";
- };
- version = "0.3.6";
+ version = "2.0.0";
};
tzinfo = {
- dependencies = ["thread_safe"];
+ dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
type = "gem";
};
- version = "1.2.7";
+ version = "2.0.3";
};
unicode-display_width = {
groups = ["default"];
@@ -426,9 +416,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
+ sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
- version = "2.4.0";
+ version = "2.4.2";
};
}
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
index d795507206..c4e759289d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.3.2)
+ activesupport (6.1.0)
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)
classifier-reborn (2.2.0)
@@ -18,13 +18,14 @@ GEM
coffee-script-source (1.12.2)
colorator (1.1.0)
concurrent-ruby (1.1.7)
- em-websocket (0.5.1)
+ em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
- faraday (1.0.1)
+ faraday (1.1.0)
multipart-post (>= 1.2, < 3)
+ ruby2_keywords
fast-stemmer (1.0.2)
ffi (1.13.1)
forwardable-extended (2.6.0)
@@ -35,27 +36,27 @@ GEM
http_parser.rb (0.6.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
- jekyll (4.1.1)
+ jekyll (4.2.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
- kramdown (~> 2.1)
+ kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
pathutil (~> 0.9)
rouge (~> 3.0)
safe_yaml (~> 1.0)
- terminal-table (~> 1.8)
+ terminal-table (~> 2.0)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
- jekyll-feed (0.15.0)
+ jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
@@ -67,8 +68,8 @@ GEM
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
- jekyll-seo-tag (2.6.1)
- jekyll (>= 3.3, < 5.0)
+ jekyll-seo-tag (2.7.1)
+ jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
@@ -87,45 +88,45 @@ GEM
liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
- listen (3.2.1)
+ listen (3.3.3)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2020.0512)
+ mime-types-data (3.2020.1104)
mini_portile2 (2.4.0)
- minitest (5.14.1)
+ minitest (5.14.2)
multipart-post (2.1.1)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
- octokit (4.18.0)
+ octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (4.0.5)
+ public_suffix (4.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.2.1)
rexml (3.2.4)
- rouge (3.22.0)
+ rouge (3.26.0)
+ ruby2_keywords (0.0.2)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
- terminal-table (1.8.0)
+ terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- thread_safe (0.3.6)
tomlrb (1.3.0)
- tzinfo (1.2.7)
- thread_safe (~> 0.1)
+ tzinfo (2.0.3)
+ concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
yajl-ruby (1.4.1)
- zeitwerk (2.4.0)
+ zeitwerk (2.4.2)
PLATFORMS
ruby
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
index aa0bc9bcdc..c21d705fd2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
+ sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
type = "gem";
};
- version = "6.0.3.2";
+ version = "6.1.0";
};
addressable = {
dependencies = ["public_suffix"];
@@ -101,10 +101,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+ sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb";
type = "gem";
};
- version = "0.5.1";
+ version = "0.5.2";
};
eventmachine = {
groups = ["default"];
@@ -127,15 +127,15 @@
version = "2.7.0";
};
faraday = {
- dependencies = ["multipart-post"];
+ dependencies = ["multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
+ sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
type = "gem";
};
- version = "1.0.1";
+ version = "1.1.0";
};
fast-stemmer = {
groups = ["default"];
@@ -227,10 +227,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
+ sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq";
type = "gem";
};
- version = "4.1.1";
+ version = "4.2.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -260,10 +260,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mgc1ik2cq2g8g7z9ql2i6ydzy771m2i4qrd1q77x8cf2sprlb0z";
+ sha256 = "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9";
type = "gem";
};
- version = "0.15.0";
+ version = "0.15.1";
};
jekyll-gist = {
dependencies = ["octokit"];
@@ -325,10 +325,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
+ sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3";
type = "gem";
};
- version = "2.6.1";
+ version = "2.7.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -447,10 +447,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
+ sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.3";
};
mercenary = {
groups = ["default"];
@@ -478,10 +478,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+ sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
- version = "3.2020.0512";
+ version = "3.2020.1104";
};
mini_portile2 = {
groups = ["default"];
@@ -498,10 +498,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+ sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
type = "gem";
};
- version = "5.14.1";
+ version = "5.14.2";
};
multipart-post = {
groups = ["default"];
@@ -530,10 +530,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
+ sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
type = "gem";
};
- version = "4.18.0";
+ version = "4.19.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -551,10 +551,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
- version = "4.0.5";
+ version = "4.0.6";
};
rb-fsevent = {
groups = ["default"];
@@ -602,10 +602,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.22.0";
+ version = "3.26.0";
+ };
+ ruby2_keywords = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+ type = "gem";
+ };
+ version = "0.0.2";
};
safe_yaml = {
groups = ["default"];
@@ -645,20 +655,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh";
type = "gem";
};
- version = "1.8.0";
- };
- thread_safe = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
- type = "gem";
- };
- version = "0.3.6";
+ version = "2.0.0";
};
tomlrb = {
groups = ["default"];
@@ -671,15 +671,15 @@
version = "1.3.0";
};
tzinfo = {
- dependencies = ["thread_safe"];
+ dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
type = "gem";
};
- version = "1.2.7";
+ version = "2.0.3";
};
unicode-display_width = {
groups = ["default"];
@@ -718,9 +718,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
+ sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
- version = "2.4.0";
+ version = "2.4.2";
};
}
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix
new file mode 100644
index 0000000000..613b96d173
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix
@@ -0,0 +1,40 @@
+{ fetchzip, stdenv, jdk8, runtimeShell }:
+
+stdenv.mkDerivation rec {
+ version = "5.4.4";
+ pname = "keystore-explorer";
+ src = fetchzip {
+ url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip";
+ sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mkdir -p $out/share/keystore-explorer
+ cp -R icons licenses lib kse.jar $out/share/keystore-explorer/
+
+ # keystore-explorer's kse.sh tries to detect the path of Java by using
+ # Python on Darwin; just write our own start script to avoid unnecessary dependencies
+ cat > $out/bin/keystore-explorer < ! i3Support && jsoncpp != null && i3-gaps != null;
stdenv.mkDerivation rec {
pname = "polybar";
- version = "3.5.0";
+ version = "3.5.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji";
+ sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix
index a450b2e3eb..4d0c168962 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix
@@ -10,7 +10,7 @@
, withGeolocation ? true
, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
-, withAppIndicator ? true, libappindicator
+, withAppIndicator ? true, libappindicator, libayatana-appindicator
}:
let
@@ -41,6 +41,9 @@ let
"--enable-drm=${if withDrm then "yes" else "no"}"
"--enable-quartz=${if withQuartz then "yes" else "no"}"
"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+ ] ++ stdenv.lib.optionals (pname == "gammastep") [
+ "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/"
+ "--enable-apparmor"
];
buildInputs = [
@@ -52,7 +55,9 @@ let
++ stdenv.lib.optional withDrm libdrm
++ stdenv.lib.optional withQuartz ApplicationServices
++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
- ++ stdenv.lib.optional withAppIndicator libappindicator
+ ++ stdenv.lib.optional withAppIndicator (if (pname != "gammastep")
+ then libappindicator
+ else libayatana-appindicator)
;
pythonPath = [ pygobject3 pyxdg ];
@@ -127,13 +132,13 @@ rec {
gammastep = mkRedshift rec {
pname = "gammastep";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchFromGitLab {
owner = "chinstrap";
repo = pname;
rev = "v${version}";
- sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7";
+ sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya";
};
meta = redshift.meta // {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix
index f159cd852e..5ccf930e62 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rmapi";
- version = "0.0.12";
+ version = "0.0.13";
src = fetchFromGitHub {
owner = "juruen";
repo = "rmapi";
rev = "v${version}";
- sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45";
+ sha256 = "0qq8x37p7yxhcp5d5xss3pv5186xgg0hd6lbkqivhy5yjsd54c7b";
};
- vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is";
+ vendorSha256 = "1pa75rjns1kknl2gmfprdzc3f2z8dk44jkz6dmf8f3prj0z7x88c";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
index b76b1d6d21..ed97c17bfd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
@@ -33,7 +33,10 @@ buildPythonApplication rec {
# The 'extractors' sub-module is used for development
# and has additional dependencies.
- postPatch = "rm -rf extractors";
+ postPatch = ''
+ rm -rf extractors
+ substituteInPlace setup.py --replace 'pyxdg==0.26' 'pyxdg'
+ '';
meta = with lib; {
description = "A simple emoji and character picker for rofi";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix
index 46378aec33..9080bec753 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tasknc/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }:
stdenv.mkDerivation rec {
- version = "2017-05-15";
+ version = "2020-12-17";
pname = "tasknc";
src = fetchFromGitHub {
owner = "lharding";
repo = "tasknc";
- rev = "c41d0240e9b848e432f01de735f28de93b934ae7";
- sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr";
+ rev = "a182661fbcc097a933d5e8cce3922eb1734a563e";
+ sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix
new file mode 100644
index 0000000000..a9fcb969f6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+# Upstream has a `./vendor` directory with all deps which we rely upon.
+buildGoPackage rec {
+ pname = "tty-share";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "elisescu";
+ repo = "tty-share";
+ rev = "v${version}";
+ sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5";
+ };
+
+ goPackagePath = "github.com/elisescu/tty-share";
+
+ meta = with stdenv.lib; {
+ homepage = "https://tty-share.com";
+ description = "Share terminal via browser for remote work or shared sessions";
+ platforms = platforms.linux;
+ license = licenses.mit;
+ maintainers = with maintainers; [ andys8 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
index 81e273dd39..d2522360a7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix
@@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "ulauncher";
- version = "5.8.0";
+ version = "5.9.0";
disabled = python3Packages.isPy27;
src = fetchurl {
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
- sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp";
+ sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U=";
};
nativeBuildInputs = with python3Packages; [
@@ -66,7 +66,6 @@ python3Packages.buildPythonApplication rec {
mock
pytest
pytest-mock
- pytestpep8
xvfb_run
];
@@ -95,7 +94,7 @@ python3Packages.buildPythonApplication rec {
# skip tests in invocation that handle paths that
# aren't nix friendly (i think)
xvfb-run -s '-screen 0 1024x768x16' \
- pytest -k 'not TestPath and not test_handle_key_press_event' --pep8 tests
+ pytest -k 'not TestPath and not test_handle_key_press_event' tests
runHook postCheck
'';
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix
new file mode 100644
index 0000000000..257b15387b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoconf
+, automake
+, gettext
+, libtool
+, perl
+, pkg-config
+, glib
+, xorg
+}:
+stdenv.mkDerivation rec {
+ pname = "xdg-launch";
+ version = "1.10";
+
+ postPatch = ''
+ # fix gettext configuration
+ echo 'AM_GNU_GETTEXT_VERSION' >> configure.ac
+ echo 'AM_GNU_GETTEXT([external])' >> configure.ac
+
+ sed -i data/*.desktop \
+ -e "s,/usr/bin,/$out/bin,g"
+ '';
+
+ src = fetchFromGitHub {
+ owner = "bbidulock";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-WY1TAPnXAn5GOaP9aMHar761m1MkKm4vavLlWELWUu8=";
+ };
+
+ preConfigure = "./autogen.sh";
+
+ buildInputs = [
+ xorg.libX11
+ xorg.libXrandr
+ glib # can be optional
+ ];
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gettext
+ libtool
+ perl # pod2man
+ pkg-config
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/bbidulock/xdg-launch";
+ description = "A command line XDG compliant launcher and tools";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.ck3d ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index d76dd8b9da..c1926820ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -70,7 +70,6 @@ rpath = lib.makeLibraryPath [
libXext
libXfixes
libXi
- libxkbcommon
libXrandr
libXrender
libXtst
@@ -89,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.17.73";
+ version = "1.18.75";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy";
+ sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index d3953da71d..b9a42e825f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkChromiumDerivation, channel, enableWideVine }:
+{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
with stdenv.lib;
@@ -69,18 +69,25 @@ mkChromiumDerivation (base: rec {
requiredSystemFeatures = [ "big-parallel" ];
meta = {
- description = "An open source web browser from Google";
+ description = "An open source web browser from Google"
+ + optionalString ungoogled ", with dependencies on Google web services removed";
longDescription = ''
Chromium is an open source web browser from Google that aims to build a
safer, faster, and more stable way for all Internet users to experience
the web. It has a minimalist user interface and provides the vast majority
of source code for Google Chrome (which has some additional features).
'';
- homepage = "https://www.chromium.org/";
- maintainers = with maintainers; [ primeos thefloweringash bendlas ]; # See README.md
+ homepage = if ungoogled
+ then "https://github.com/Eloston/ungoogled-chromium"
+ else "https://www.chromium.org/";
+ maintainers = with maintainers; if ungoogled
+ then [ squalus primeos ]
+ else [ primeos thefloweringash bendlas ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
- hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
+ hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
+ then ["aarch64-linux" "x86_64-linux"]
+ else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 0c16d0c9ec..d7b1a017d3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -13,7 +13,7 @@
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
-, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
+, libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, jre8
@@ -31,6 +31,7 @@
, proprietaryCodecs ? true
, cupsSupport ? true
, pulseSupport ? false, libpulseaudio ? null
+, ungoogled ? false, ungoogled-chromium
, channel
, upstream-info
@@ -109,6 +110,10 @@ let
result
else result;
+ ungoogler = ungoogled-chromium {
+ inherit (upstream-info.deps.ungoogled-patches) rev sha256;
+ };
+
base = rec {
name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) version;
@@ -131,7 +136,7 @@ let
util-linux alsaLib
bison gperf kerberos
glib gtk3 dbus-glib
- libXScrnSaver libXcursor libXtst libGLU libGL
+ libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
jre
pipewire_0_2
@@ -208,6 +213,10 @@ let
'' + optionalString stdenv.isAarch64 ''
substituteInPlace build/toolchain/linux/BUILD.gn \
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
+ '' + optionalString ungoogled ''
+ ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
+ ${ungoogler}/utils/patches.py . ${ungoogler}/patches
+ ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
'';
gnFlags = mkGnFlags ({
@@ -260,6 +269,24 @@ let
use_system_minigbm = true;
use_system_libdrm = true;
system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
+ } // optionalAttrs ungoogled {
+ chrome_pgo_phase = 0;
+ enable_hangout_services_extension = false;
+ enable_js_type_check = false;
+ enable_mdns = false;
+ enable_nacl_nonsfi = false;
+ enable_one_click_signin = false;
+ enable_reading_list = false;
+ enable_remoting = false;
+ enable_reporting = false;
+ enable_service_discovery = false;
+ exclude_unwind_tables = true;
+ google_api_key = "";
+ google_default_client_id = "";
+ google_default_client_secret = "";
+ safe_browsing_mode = 0;
+ use_official_google_api_keys = false;
+ use_unofficial_version_number = false;
} // (extraAttrs.gnFlags or {}));
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
index e35e4d945d..fd89f31600 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@@ -15,6 +15,7 @@
, enablePepperFlash ? false
, enableWideVine ? false
, enableVaapi ? false # Disabled by default due to unofficial support
+, ungoogled ? false # Whether to build chromium or ungoogled-chromium
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? ""
@@ -33,7 +34,7 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
- cupsSupport pulseSupport;
+ cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
src = fetchgit {
@@ -42,14 +43,17 @@ let
});
});
- browser = callPackage ./browser.nix { inherit channel enableWideVine; };
+ browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };
plugins = callPackage ./plugins.nix {
inherit enablePepperFlash;
};
+
+ ungoogled-chromium = callPackage ./ungoogled.nix {};
};
- pkgSuffix = if channel == "dev" then "unstable" else channel;
+ pkgSuffix = if channel == "dev" then "unstable" else
+ (if channel == "ungoogled-chromium" then "stable" else channel);
pkgName = "google-chrome-${pkgSuffix}";
chromeSrc = fetchurl {
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
@@ -71,7 +75,7 @@ let
unpackCmd = let
widevineCdmPath =
- if channel == "stable" then
+ if (channel == "stable" || channel == "ungoogled-chromium") then
"./opt/google/chrome/WidevineCdm"
else if channel == "beta" then
"./opt/google/chrome-beta/WidevineCdm"
@@ -113,7 +117,9 @@ let
};
};
- suffix = if channel != "stable" then "-" + channel else "";
+ suffix = if (channel == "stable" || channel == "ungoogled-chromium")
+ then ""
+ else "-" + channel;
sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
@@ -133,7 +139,8 @@ let
else browser;
in stdenv.mkDerivation {
- name = "chromium${suffix}-${version}";
+ name = lib.optionalString ungoogled "ungoogled-"
+ + "chromium${suffix}-${version}";
inherit version;
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
index 54e1284aa6..eef1c5ef38 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.453";
+ version = "32.0.0.465";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1d0hxn6snvx15clhcwncw40z0mf5p1pw68wrp7w1l3jkkw4brsgj";
+ sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1";
stripRoot = false;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix
similarity index 99%
rename from third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix
rename to third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix
index 17418c90af..299b19f2f4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix
@@ -4,6 +4,7 @@
, makeWrapper
, patch
}:
+
{ rev
, sha256
}:
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
index 9e1f0aec59..2b9f9232c2 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
@@ -1,6 +1,9 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python -p python3 nix nix-prefetch-git
+"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium
+via upstream-info.json."""
+
import csv
import json
import re
@@ -19,41 +22,54 @@ BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official
JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
+
def load_json(path):
+ """Loads the given JSON file."""
with open(path, 'r') as f:
return json.load(f)
+
def nix_prefetch_url(url, algo='sha256'):
+ """Prefetches the content of the given URL."""
print(f'nix-prefetch-url {url}')
out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
return out.decode('utf-8').rstrip()
+
def nix_prefetch_git(url, rev):
+ """Prefetches the requested Git revision of the given repository URL."""
print(f'nix-prefetch-git {url} {rev}')
out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])
return json.loads(out)
+
def get_file_revision(revision, file_path):
+ """Fetches the requested Git revision of the given Chromium file."""
url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'
with urlopen(url) as http_response:
return http_response.read()
+
def get_matching_chromedriver(version):
+ """Gets the matching chromedriver version for the given Chromium version."""
# See https://chromedriver.chromium.org/downloads/version-selection
build = re.sub('.[0-9]+$', '', version)
chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}'
with urlopen(chromedriver_version_url) as http_response:
chromedriver_version = http_response.read().decode()
def get_chromedriver_url(system):
- return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip'
+ return ('https://chromedriver.storage.googleapis.com/' +
+ f'{chromedriver_version}/chromedriver_{system}.zip')
return {
'version': chromedriver_version,
'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64'))
}
-def get_channel_dependencies(channel):
- deps = get_file_revision(channel['version'], 'DEPS')
+
+def get_channel_dependencies(version):
+ """Gets all dependencies for the given Chromium version."""
+ deps = get_file_revision(version, 'DEPS')
gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
gn_commit = re.search(gn_pattern, deps).group(1).decode()
gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)
@@ -66,12 +82,35 @@ def get_channel_dependencies(channel):
}
}
+
+def get_latest_ungoogled_chromium_tag():
+ """Returns the latest ungoogled-chromium tag using the GitHub API."""
+ api_tag_url = 'https://api.github.com/repos/Eloston/ungoogled-chromium/tags?per_page=1'
+ with urlopen(api_tag_url) as http_response:
+ tag_data = json.load(http_response)
+ return tag_data[0]['name']
+
+
+def get_latest_ungoogled_chromium_build():
+ """Returns a dictionary for the latest ungoogled-chromium build."""
+ tag = get_latest_ungoogled_chromium_tag()
+ version = tag.split('-')[0]
+ return {
+ 'channel': 'ungoogled-chromium',
+ 'version': version,
+ 'ungoogled_tag': tag
+ }
+
+
channels = {}
last_channels = load_json(JSON_PATH)
+
print(f'GET {HISTORY_URL}', file=sys.stderr)
with urlopen(HISTORY_URL) as resp:
builds = csv.DictReader(iterdecode(resp, 'utf-8'))
+ builds = list(builds)
+ builds.append(get_latest_ungoogled_chromium_build())
for build in builds:
channel_name = build['channel']
@@ -88,34 +127,50 @@ with urlopen(HISTORY_URL) as resp:
continue
channel = {'version': build['version']}
- suffix = 'unstable' if channel_name == 'dev' else channel_name
+ if channel_name == 'dev':
+ google_chrome_suffix = 'unstable'
+ elif channel_name == 'ungoogled-chromium':
+ google_chrome_suffix = 'stable'
+ else:
+ google_chrome_suffix = channel_name
try:
channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz')
- channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb')
+ channel['sha256bin64'] = nix_prefetch_url(
+ f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' +
+ f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb')
except subprocess.CalledProcessError:
# This build isn't actually available yet. Continue to
# the next one.
continue
- channel['deps'] = get_channel_dependencies(channel)
+ channel['deps'] = get_channel_dependencies(channel['version'])
if channel_name == 'stable':
channel['chromedriver'] = get_matching_chromedriver(channel['version'])
+ elif channel_name == 'ungoogled-chromium':
+ ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git'
+ channel['deps']['ungoogled-patches'] = {
+ 'rev': build['ungoogled_tag'],
+ 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256']
+ }
channels[channel_name] = channel
+
with open(JSON_PATH, 'w') as out:
def get_channel_key(item):
+ """Orders Chromium channels by their name."""
channel_name = item[0]
if channel_name == 'stable':
return 0
- elif channel_name == 'beta':
+ if channel_name == 'beta':
return 1
- elif channel_name == 'dev':
+ if channel_name == 'dev':
return 2
- else:
- print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
- sys.exit(1)
+ if channel_name == 'ungoogled-chromium':
+ return 3
+ print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
+ sys.exit(1)
sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
json.dump(sorted_channels, out, indent=2)
out.write('\n')
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 15899d31e7..5be89852b3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "88.0.4324.27",
- "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
- "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx",
+ "version": "88.0.4324.50",
+ "sha256": "17v0qp05785xc4whsbw6fmf0x5ccjx2mk6n4qy6z2mx2yjjjfv8q",
+ "sha256bin64": "01cphbd56l7g3cdmrvwynkzrpx9h3v7pz6ac76sxlp6irjzhbnva",
"deps": {
"gn": {
"version": "2020-11-05",
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "89.0.4343.0",
- "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa",
- "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d",
+ "version": "89.0.4356.6",
+ "sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr",
+ "sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl",
"deps": {
"gn": {
"version": "2020-11-05",
@@ -42,5 +42,22 @@
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}
}
+ },
+ "ungoogled-chromium": {
+ "version": "87.0.4280.88",
+ "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
+ "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb",
+ "deps": {
+ "gn": {
+ "version": "2020-09-09",
+ "url": "https://gn.googlesource.com/gn",
+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+ },
+ "ungoogled-patches": {
+ "rev": "87.0.4280.88-1",
+ "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"
+ }
+ }
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 98cf28ec3e..7115b68282 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "84.0b4";
+ version = "85.0b2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ach/firefox-85.0b2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "da9290899d245d86b3d2d378072af403106596ae1e02a36d40a93deea9e57000";
+ sha256 = "628cf83823cf28f48b9c69b9c1d5c966b3525802f8883759c66872b6a851aa05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/af/firefox-85.0b2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "28810946bde4c2335714c0f8b0dffad1a1650c167370e38c6eb5e2ee5d2e54be";
+ sha256 = "1206089088cc4cf88dba63b50b71c365db44fc7a9052868e4c7900222a3df6a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/an/firefox-85.0b2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "d32e9e13b2c1f484686d9394f20a87e2c1d833703e0115de1f9c8c552d1e9d8a";
+ sha256 = "7b11406db06ef3c77ae06dff1d911a797bda7bc348e141e2e9f7e3a1cea75d81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ar/firefox-85.0b2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "de8348caf98ca0551f3f080eb32ef94c00706676bc8df1723377d98f10221e56";
+ sha256 = "9222a3eec3abab949c96d9e32073f32148da9069670a6577fc06aed7c64fe1a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ast/firefox-85.0b2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "104cc96b0e14c030848be4bc07a1b2b836a241e9ddba581b9ca24018c54356ee";
+ sha256 = "6dd5f9ae82d04e139eeddac7d938e78d1409ebc781fb4e27a399bf41939a21b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/az/firefox-85.0b2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "e96087b52f1dc18c8bd29d486faa00ad06a2165d1e14cbd47e37cafb40602a87";
+ sha256 = "490d98a746c45446e237f84af894768fd0c78ed6d4937eec086e1fce8101890c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/be/firefox-85.0b2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "d67c2c1556b6859e0acae5b69b3b7eeac77b3bb1594b48682a97a72742c79d05";
+ sha256 = "ce25d9eeba02850693bb8df813af694c00192abd64b9420bb422ef1b704cf26c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bg/firefox-85.0b2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "b3bad1b330a5d4c515b37cddb3e89e538c5cd66ffce68dbf8d1e9adaf4881431";
+ sha256 = "027021477cda6f203500d725146db27b3ff3ca4ea38991b74be65a68659163a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bn/firefox-85.0b2.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "9c50c4e12061279133177ade4b22b7e2bb7e14dcc1875464f57efb7c7e360bf7";
+ sha256 = "38465864ae3694fd810bfeb8077d90fc2dde1a1b6a97fea9ef413b48bbe4b6e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/br/firefox-85.0b2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "79eb76af707b26fa4d46acf11d0be25ccd144abda6c853373c9ec0cc872c2a8f";
+ sha256 = "d42480e934cf4ea14ab8f1cba15c95749efae727c52908a77f5f076865a40024";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bs/firefox-85.0b2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "2cbf15a604f90c4a6212f5da251372d09e2247f5ed338193ff93a94695bca308";
+ sha256 = "36e50b4abad8d9cdd6b281135467f639268670d857cd0f86bb827fdba70d5ab4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ca-valencia/firefox-85.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "a9b6cacf6ee8a6a1f733f3ff3741c1bb12eff823664279205906e8e59b646679";
+ sha256 = "45433be09e4b01efe768c9178d26d68cd7fbab0505d7f6ccce230718fee5ea7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ca/firefox-85.0b2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "1ea49a5d59129c820f359fbad2253e051adbb260cedd4b62bb20122562466bfd";
+ sha256 = "147993df562fbaec1a07ab634b8db112883d0d37c7c021804b8c000dc2549454";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cak/firefox-85.0b2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "b18651df9ae2e16ea9855c30fa393dd34103cf338a515d41d3c1802e52fb92a1";
+ sha256 = "126b7154f9e943b922a5a5284e9eb51b2569f5494431f6273b7c32a8d1c6a9f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cs/firefox-85.0b2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "4dca051e5349372d6caf5a7f6e8e6e12fe42bf96110a1c6e2f7f6e408f365b80";
+ sha256 = "152bb5937e5baab421f60bdaa27c948f37c0a55da0d05175c7689e8fa50ed6e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cy/firefox-85.0b2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "3117d47bcec1cf0f5a547a33c62ca5ecfee34435c13a478f23d1d9f0ac187f4f";
+ sha256 = "d294f03b0791b42bb944e3338a6d5d488005524e192ed36ba9e6306af72d084e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/da/firefox-85.0b2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "34a38c76997bdd41e6b12cebf08345e7cd19838bd92f5a8d082ba3087cb063c7";
+ sha256 = "baa162dbe4bd9830f06225d247fd771e328a3a50b6583accd407d06a757fbe1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/de/firefox-85.0b2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "65e417603cf383d92058b8976c1f6499dc5804d02a22bb639e416c4e730b4a62";
+ sha256 = "c9f7d9e2af245b63e88ae36bf095495fbd6cb3c852d79a8ca41db2159c243c01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/dsb/firefox-85.0b2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "08dacb91773d7b49eb8f08668627badae2967193c441ff2fb6b9d88063c5ffb9";
+ sha256 = "a474a5404b8142bface3eee5008a87c4015c9762a76bc9a1a8caa0f26a5b7ba7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/el/firefox-85.0b2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "78e870b673c204e4d9fca2a3fbab06031c724a8b0696a3b6e2dea5ac07a5bb88";
+ sha256 = "19a60bc3baecbe1ba2d4e0d6fc60a60ad6b792a3024ab6226729983dc530c1a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-CA/firefox-85.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "4c862eb5c53e65af1ddc212a093eb23e33653341fa7db53d935ed8482637aed8";
+ sha256 = "d35de987f9e686679e7feed27fd99b73478f19f000a3004ea40d67e6598ce5f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-GB/firefox-85.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "f505cf16328603d0164e330fcef60fcfeccdad186d1f91e0b4cee1b8cc7c740d";
+ sha256 = "120926431e18449e1b422037d491245792e4f62e8a9d0b38df25e16b485dbaa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-US/firefox-85.0b2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "f0561469f04ab83dd52ae4e3a8ca451d6569845e37d9e04c5a91085654661f8a";
+ sha256 = "f1b26bf2d9e62f86c36b7de154f014e5ea893e1674986f1cb59f2711cf6663f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/eo/firefox-85.0b2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "c64d227d6b21876ea48182795d6fd8ec3ca486e5328629a0bbfb936e8463b0a8";
+ sha256 = "3eca3b6ac4b952c508445bd0783804d5dc76a8f6d7492ae9d65bad0060f242a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-AR/firefox-85.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "73b45f6b8d1e53bef003b3e77cc1217b8a85dde49cb0900b4fa2991895e5c184";
+ sha256 = "3c67f7e3572a97262ff4b37fb165b474a4f91429f59ff2b568910f4d3f8dab38";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-CL/firefox-85.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "e7025e4c5fc311aae2798da99ec5e5863bca5ad8b8460981cef86e29ae37d74a";
+ sha256 = "e5b2167a4ec5f7eede57c394bfb7ee01ffd1b0d81d36a586a6d562dffe2f50a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-ES/firefox-85.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "e819644eb6337255004fda8286e1f2ed898423c4b97694c8355c28f4d449da61";
+ sha256 = "dbd7505430897e38ba8f46b0081027c276184ff4085f801accac976cea68281b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-MX/firefox-85.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "07de091ca3b06b94e35b84add7fbc5c8fa6ea84ddfe548e5f55b3bc7980a9bd3";
+ sha256 = "1a82057ebd73698db2d3f8753733f52fed2c5f853470a553c05d7c85dce7d3d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/et/firefox-85.0b2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "d6af9ab39f1a13efc772cbb63dd731dcf988c10f13649f348d7ddb3f6ab6ca60";
+ sha256 = "da22407a7c9505cc876ca3473cee8ef1f894f84d8ffea8c10425340a8b6358f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/eu/firefox-85.0b2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "110e667568429dd2b0c752962e1148884c44aaef9939926c6b0f49ba5bdb1182";
+ sha256 = "6facb92bcb4f03ac2e9b1f0288ad94b43e395b9113d38f924c372c8e78ddd749";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fa/firefox-85.0b2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "f7a783f12bb08ccb06074f903bb2eaaab13b348c6a2950a9699beee28ad97b5e";
+ sha256 = "b982f5211f262c9c5091d65ac941fa9f900707f1212a84df434f62e1d5c9a059";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ff/firefox-85.0b2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "b2e47bc8ae8d1e54a1b5799a87b4742d049696edd9913f0cc6beb52a89cc261d";
+ sha256 = "eb35a619db24de04f30dabdab45a3c53358c36706b3c6018de9798c3a79afb1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fi/firefox-85.0b2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "f5ee09f1b9d41506ad1023ad05dbdee95ac049eb4bfd38dd99c06cf682e111a8";
+ sha256 = "b39e892c9084a34a608b9385f7b8c6d25f1f9cda8c9891ea92e8fdc49e4ed63c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fr/firefox-85.0b2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "f8c33819a6ceab041bed80f1663d94a80ee3bdb6e859eab1eb8ec9d0b67f4222";
+ sha256 = "9de9f9342fa3d3bc721bbcb72b4b5ec42b8500e179222e229e7a45d724ec878f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fy-NL/firefox-85.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "6ed233042e570e9a04ecc1e25f6211deb7685c117db75f32a541076d95d1cebf";
+ sha256 = "1f1511fb51c1ba7ad3602da39a3b4c95c86096edf155a652f0033a2d7cd173df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ga-IE/firefox-85.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "b28337429a0c1d26653fda1d93b59ea0383061a253be5b763442166fdb21bbca";
+ sha256 = "295a46724cd89639feae42dda983bc5a48a78996d6c3fd1022bb81400e11567c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gd/firefox-85.0b2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "546bf2f1a4a8a643b161554bc92e771644ff9ae46c6b10fb2a60b920a2454f44";
+ sha256 = "2926449119034ac81ecffb0a366ee521e29437c64b6bd37a7254ad392bc90061";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gl/firefox-85.0b2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "cfc32d3e7e3ba5379895a8b348d9399bd3962a819d0677f14a365f6e0c314676";
+ sha256 = "2df55d15357b45e643c4b8a020c7ad235fa2579c16f05f5dc84be8d52b6b0066";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gn/firefox-85.0b2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "b2b5e826540d3f9b52d67e092fa755b26a34ea9acd0cb1c69eb6f0bc332354d0";
+ sha256 = "3a7686ad5d4f4b3adb96c6ea05844f890aeb456983af43827ff787e373733456";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gu-IN/firefox-85.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "497b8a954ed2c9fa13e207462730dd39d2d0de10a38e3762dac3ef1fbd36282c";
+ sha256 = "b64c32a495d72f7c710e9a0168d4967743067f0f85ebf7109aed5b53db919cc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/he/firefox-85.0b2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "8cdac2e9d2cf10171f2744727ddd80e21a4d46e2082947e49f4a255f174db968";
+ sha256 = "8c1a1b96eca7d84123c602543f1ac8f54ecb0111e195495e8a3265b2537b31cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hi-IN/firefox-85.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "d37c55e60329220de3d792894d7b801adf7dc7ab8ff4ab39bd2e24b59443b973";
+ sha256 = "bc561d6399a1dfd9aa1f7afcfb4b7ee1c600985dd45a9a195cd89256cd2493c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hr/firefox-85.0b2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "bebb6709dd3be119be45d9fdb0bac41b81514d78a384a221e2ffbb51b46dbea8";
+ sha256 = "071ce5aeac01ef79ae210595305fd014d5a893594bbf2b547d15a6126a784848";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hsb/firefox-85.0b2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "c43aea7fdd8a57653d6d9af4aa7c0be6e860f5292366ddd91c5860dfde2ee1bf";
+ sha256 = "7ffe23f37f8908a31a3f0b29b361ef3c49917753300c6a492955237ca188fd6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hu/firefox-85.0b2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "71e6b509dd3a6937d9851c262fc7a1bc9e551cbe0515089586fc22098bc51151";
+ sha256 = "60101a07d1ae5c50b44bb55bf52b5b962f0f0912e574f1a58ba6021951fcedf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hy-AM/firefox-85.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "c92eaf9f6bfa97651075d2342e45b988ae89c1a4cb55559dad71bfae5912ee83";
+ sha256 = "89bffc83a11fd8ff4b8ee143173c6d4d37124f63d476f130d7931efbf5a723aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ia/firefox-85.0b2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "3c71aafb7dddcd3f9bcc8e169281614ac1087400d1d0ba02afb18c68b1914128";
+ sha256 = "f317ebb0622f0286d648803dab6a917bacd6471214388b201558c9ec23e8e431";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/id/firefox-85.0b2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "8075ef0b1d7eb2fc6141262cbb0d3831c3d8508eb43d3e9e142d96946ed2036d";
+ sha256 = "cdfd0cc0bd1b10bb96ca044f18aa2bfb857b18d83ae15a46533a8657eabbb168";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/is/firefox-85.0b2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "5ef96d77bea5c94e7147a5657d76eb5c7f206208a0464245242cca3fc7fb79f0";
+ sha256 = "0834e007713da632917bb546b6be21117dcbfc3ecdf8062ecb1819611df62ee5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/it/firefox-85.0b2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "eb76a1f3bd1ac065772d4ea4a435c53b5f7b1d5b643c7b62b7ccfee205ea4e81";
+ sha256 = "57a071d56cbdb3fd754e91dbe9930ab90ff87ae9cb10e2e1bcb0f2a62165a62c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ja/firefox-85.0b2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "80b644648b9e40ed592ab9ea2b9d7f1e2abcf8d6b0f925aa57cd6cf28d53dcf0";
+ sha256 = "d9fd58cb8ba9a30821c717c9047ce149efb7b1f06c2ab820208684d13436ad19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ka/firefox-85.0b2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "03c34e7b08a8b6140e612739118c35b05dcdef1257b4857d2fda87a1cf8852ff";
+ sha256 = "7a6071fa1daa7875308c26073b0f690ef5e408e18c9d1063a321468ff3d92015";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kab/firefox-85.0b2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "419a4758cf2e2e24968f4da384dbfb03ef8398713c6070ab29ce379772168f18";
+ sha256 = "b25e902a6819cc252b23f9eb0019643deed468f65615fca808c55cf7a6c6a5ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kk/firefox-85.0b2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "cfe96420e125dd12c9a9e79e45a8d7ee260d1957abddab5ed887afd1a1e3f499";
+ sha256 = "0767c4cd2b99ef045135ae278c79466333ac1808c7503eda37d82a2941b0004f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/km/firefox-85.0b2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "4b3599a9b30132b6105e4bbda7de370e54e21d8e498bb3c4c3d9807282fbf246";
+ sha256 = "d6006640aacb18dcc8c8df330d60f831c12bdc214210c257bd6ace8763d88eed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kn/firefox-85.0b2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "5da3ddc9d9824e3ba59e1cdc89ee3fb8900c661faec1f539c829d0917be5d4d1";
+ sha256 = "37e8b5177ed9fd2341a39164769384c233da4378100617edc19060604002480d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ko/firefox-85.0b2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "2db9a494693091832e578959144d172d5135b82bbf44c041949da8ffec2de9dc";
+ sha256 = "9fc2ddd0a9dffeb327ff33c24454a189e552c840ffcc916abe37b49836891cc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lij/firefox-85.0b2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "2219d5235f0ed9d2015ead5782976727d2b7103afd987eb445f3f274856e6af6";
+ sha256 = "925a665aa1cc6ceb8cc0a70b5eaca499a82b59577770c006af73423c637f7d74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lt/firefox-85.0b2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "a335e0d835bcc7ae9563bb3efe6b926ad71e08f3ccbd164aa2b9f257acd1341d";
+ sha256 = "7669ece40b4269062d50191f46d41d65511f4b6553280bf2e22990592c584cee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lv/firefox-85.0b2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "1f89f8f2715254ef335af9b01ca1503caecb1c93b1a900ee1643c3f9e00c6821";
+ sha256 = "d6c86314f58044c30b03e176db1273861f0d1c47a6ea168fb5ac6a4cc047ac24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/mk/firefox-85.0b2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "86eb9f1e8189ce45c03925337a90f1b204dbdc902c1c4a817a924410a26b0048";
+ sha256 = "87cf9485d579da404bd2ef47c39785232eed16f31eb7cd2108cc9698378c5358";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/mr/firefox-85.0b2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "d5214647403f85c5f7a95871e8d6fb4d4c448af92e6475841fd8474857f21067";
+ sha256 = "5179a1d37c6c9504b5bd0c41ef91f9f9dfa1e0458cbe2b0dba36829de04d4a6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ms/firefox-85.0b2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "23af07562748448a35242a6cd77bce25a5576d2b71177fb682da58adb21671e3";
+ sha256 = "4722459468f6507be8aa111efdbcb17356970c8b4b2a355a27036b154356d341";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/my/firefox-85.0b2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "bfec2f3ad0853fb36ec4aac9ad97ba14d30a275eff2582c2e9df600b5940c004";
+ sha256 = "d398c8395ebbdfa5f799dd08e33935156f5bc99631f782e6e5c637b35e2a98f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nb-NO/firefox-85.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "32be6fe8aa661f6098b4600d824846738664f254ecd4ab0d0a1e705b28a94e74";
+ sha256 = "b58379bf0b1da5a85ccbae9b88081f384762ceef1ca2fe95700867f4416a5342";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ne-NP/firefox-85.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "dfa3e6b9f31fa716a2c80fda07c24717a526ef96033b5b1861fcdad43c99b29e";
+ sha256 = "66047291e50429e9d0e50eb4959ab0b321c920d65fd3ec612cd0d136ebe86dc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nl/firefox-85.0b2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "e253d963b66855c44f41c43baba1b5c952b37dd1b83aac8243c60581ca674a49";
+ sha256 = "b57675671a91478b60cd0c8a2b697c8d7f574f84eca1695f9eb20d5eb27e64cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nn-NO/firefox-85.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "5d9b90cdee03a544a78f44d4f0566b5b59ae802af4fa60367a1a4836c01197f1";
+ sha256 = "c9b56bce646f09a0f2ff9990dbafec12f07aa1c92e5d6ceb419a450378662252";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/oc/firefox-85.0b2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "b37f9a283d9dd2ff9e8998d83e0c147bfbb75e4b64b3936cb344243e1277c370";
+ sha256 = "2be07d5d2a582ad3d9d40a54243c97c4c4ca45d7691e19d5263440abd510d37f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pa-IN/firefox-85.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "68f6bae2e6f064e22503145b5fd57d027899f23fcf109010a98397dd8c0d7cf6";
+ sha256 = "2febc1c6a6369236467d440b44bb15682dd975e8d5f399364c76518f869b37fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pl/firefox-85.0b2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "789d6925c3b17f96bb92eef54c05fc8787f32ce2c9846931e185dc5a1de9f303";
+ sha256 = "2d107f89149db4be89a73f1c1fc825bcb73e7f3266f33bffce7ad75d02869d13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pt-BR/firefox-85.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "329eecf74dc8d9d1d8f4578389553d92a368c972fcb2468e0b936f21508bd1bc";
+ sha256 = "c443b3d55413dff75de4a88f726b0c80df6a687ce0fcd10a10fa41e8c42a021a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pt-PT/firefox-85.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "b30ba75dbd5f5ff3ff709722acdf36acf4de9993d230eb27996e81406779dd0a";
+ sha256 = "dc63f909e2f59a08cabc37fddd03fa6f42a20d5708329d1d660ae9dcc3c1ffa4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/rm/firefox-85.0b2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "ad90ce4fbcd094bebf77b36a63e38326c613bffb580743c9a4c19df845907dfb";
+ sha256 = "6f7458b0f03034867f370d449e0ab0f33a8c154faedea3347c89be681cb24105";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ro/firefox-85.0b2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "8f7864bc6577724f20829ad79901d92775200860dd8c43bb2443c7bf22d7a435";
+ sha256 = "cde050b50475442e8d9c8f1228a84da4bdacc4202e387dd9c3d6b639f3a70b2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ru/firefox-85.0b2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "8b52d5eaee53805422bb2fd6dd8b2e0c7a5b01feccbc6fb6c77e4fb8678d30a9";
+ sha256 = "fb99e81c93dfaac97468061dec682fb5da1f0b3c1c6b22b4b98a5c1f23b6694a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/si/firefox-85.0b2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "a71df756e97f58271715f3d79a86c0407487dd5820500127cbd9373361bd016f";
+ sha256 = "e4786b5b9adb260000cf7e1b49006c86b2ac4d5d50329e925adf82594213302b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sk/firefox-85.0b2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "71eefff1538a2978d9e4e65fdd5a2322ad81ddfee33464c0d70b95eda1649fda";
+ sha256 = "b386c895de5d07ddb4caf734014a2fbc47d9acd6ee364e59004511a817fd8144";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sl/firefox-85.0b2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "91b2938be8230b6301fe3d15c6d9ba3f031c1e5fca886da228f47a2e0a2cd144";
+ sha256 = "058f2047df24199bae7a7b30a913929035a996dac65988665818d900ebbd3e3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/son/firefox-85.0b2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "57e456cd14418c41c2e5f8eb0ec6b0807459f41e15207f6997c7742fd3dc8a1a";
+ sha256 = "c48206706c8c3170d40d5718704d35532cbc03ecf3b84b241ecca5142011d8f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sq/firefox-85.0b2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "0f343e2442523f0e422309cc36518484a242db4116f0e6b7dcfe251cdfea76cf";
+ sha256 = "2dbf91ea3c6714b1dc0a36661edf8d30ee05ecc3cd87f9446d9806958cd68cf1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sr/firefox-85.0b2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "cf8fb723611506fff356cabd91a0ca3fdd9cc5d806167df6dd385438d467eeff";
+ sha256 = "ef21f1c5ae483dea2e522f8575573d2c43b706938572c682eea1fb69dc66284e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sv-SE/firefox-85.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "258020bbc7a75139fee340e50d41676d234be19c931f0228485f06fcab2eef81";
+ sha256 = "a285c9e3274ea0e97997bb177e521d5c671c322e7a00a11367176ff9e5e3fb2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ta/firefox-85.0b2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "7783166c0f9ceed0f7d037c1e92b988818a70522945af2c96db958966eed8b66";
+ sha256 = "df18247c65c74b7f84e5c18ba2948224e960df4fb3abb4057e291c0e0ec12f35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/te/firefox-85.0b2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "02662946b3506da6432c48eb1c7e0f522ffaed2abcfcc474332a799ef3be2b92";
+ sha256 = "7a134e7398eaff92a9e6b10b26e4ef26c8406aad91e22ad9c4e4cb8de55a96cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/th/firefox-85.0b2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "1592b372b8e767e5b7369f356fb733a2daf51b4f45c8c4c94041845d63b3c604";
+ sha256 = "91b3a69c2b660005050abd47fe50903aca9390da44bb074850e9440875aa378d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/tl/firefox-85.0b2.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "2b831feaae729c674e8a9ee207dea007df100bbbd8cf7553791aee3eede37224";
+ sha256 = "b1813765c4a9292995bb529df922137f92ce4a39bdec97378dd71ce4225759d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/tr/firefox-85.0b2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "aedf8b7684f204109e42a3797ba00bd7a8c5bd3f827c31ea3fd4eea1679d8af5";
+ sha256 = "0c2a166cff9a3731bc378552b3baf36fbd53e0d9a37a3caa939a17829dd008e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/trs/firefox-85.0b2.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "232cae54f6120a47455fdd7e0d88dde1f64d5a1931bcd7d54f6bf8bd376583e8";
+ sha256 = "69bc6b9532bf040d5311a864baa5ff88b182553ea9b0110c172a12f6f27f8eae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/uk/firefox-85.0b2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "e00de7cbe1f00aa082f9a448857cc19f011bb1d5b579e79457bb0dfc72b7a12d";
+ sha256 = "2653f28322a4adb50ecf00d9fe12f4ffa679a68616516c84af3eecacac692b9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ur/firefox-85.0b2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "7ece4d8af476eef174c0c175b65841da8d826702fb255587c2e1d259bb9ef3ba";
+ sha256 = "637acba1c21f19f6414e864b2142b05c530c2b06d5acea907bc4a423774d0d04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/uz/firefox-85.0b2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "09c7e7d641f703404aa7927860f2924e6be376b2e39b1f0fe012dc87469edb62";
+ sha256 = "4a3e1155821b870d8d84de11c4c3e53100cf88e043bcd024493f5d196f1fb6bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/vi/firefox-85.0b2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "18121867e6b8c2a52c5324f653f82afbae97481b5ac3df811e881ec39bbb3b0e";
+ sha256 = "bad32bc9d6dccdf87e1a5f36f359d379411837bbb55e109d088820bf0461ae2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/xh/firefox-85.0b2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "04f5bb96ef9002eeb0869236f70168e7cbd7842b8e12b66dd6d5d67db9acd28a";
+ sha256 = "2b92d825d913068f4707848df34fea54b2bee3da088cdb8b6dc99bc2a23a7d2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/zh-CN/firefox-85.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "142286cf9136bcb9b6af7ea1df3cf77821c0793ab7b9fe533a2963c453f45a7d";
+ sha256 = "6018f1350df63cf15317b6b60c1968d365c6f19a643b24fc359515b12d6d21a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/zh-TW/firefox-85.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "fef32e5817140bbcb6d1b614a72a29523235606192078eb04420ff7a2453cb9a";
+ sha256 = "4df049ce4e35a66db2fa6e6e32045d89e3d3d6c89cda7cc07d3e843a26543065";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ach/firefox-85.0b2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "40e9b7a738e06cec731c69b659b14ca48b119ae20016e0214e1160edf03919b0";
+ sha256 = "71423d13d132c50df51a1aff2884280716ed865abe658cda2957a86816cc3f35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/af/firefox-85.0b2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "9bb05361a51f836b2de5614127f8df768e504f4d5bc136e3f169741098f0bcbd";
+ sha256 = "5fbe29f38605f08f65ebf3222ce12ae46168e96c107dc743b56d865d3daa8647";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/an/firefox-85.0b2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "ee62418444c76b709204962ed47af8ef3d61b80e628600201b5a12293651c70d";
+ sha256 = "a66e2d52b2af65f4bfd624dfe7883e8231b7f511e551f486a2b78c3ec164c57b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ar/firefox-85.0b2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "10b5d4f1616e078bf83ab5ff942dabe89a8eaca63f24e96b53726dfb2bc9e36b";
+ sha256 = "fa8c2083030e26c8d61f213e66b2bf5e1e9fdbdffc570216e7c97cee0e067b8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ast/firefox-85.0b2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "a4e5ccae125edaa0696b696a5342320707f0c39c8985437b6aed60faede71de0";
+ sha256 = "5a5b01eca7665b91f8fb11b34c7eb1c0e681cf130cc5f1443686913a8d9e662e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/az/firefox-85.0b2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "c13d9ed183c7b9256801708014f38405749cdfcead9f243e80eef78d06a9b78e";
+ sha256 = "a0b1d6c634b38a72403ca48de6c527d9bf966a905f03ae6699df014595b3bba4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/be/firefox-85.0b2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "57d8eafc3d45784dbad71eb49d5a4c0483d939719b43b0f16e4db1d5a96ff4a8";
+ sha256 = "76d6e8286c947513951ea977d205d8cdeff87e142b1664a5a01cca4f187a1623";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bg/firefox-85.0b2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "0a65ad71cc9d97277535f07a8dbc7ca248508c24dea8520f92fecbb806f87a31";
+ sha256 = "153249e545295ff4e8adecc5ea0dda230645fd0f4afa06f24a7e551d87e0d7fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bn/firefox-85.0b2.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "3cead08f4d746def6cfb909107f4739400498c970f10fbd542259c04b84b5852";
+ sha256 = "14f439c1b3acbde375fc1c4cfbf8f20a274e8d04b32cfdd6bdde389a6ad6b19c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/br/firefox-85.0b2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "40c6e963e8e52ef51cd4d4e63d501f2a6cecec1800541941458b896ad90e5b93";
+ sha256 = "9dd2fbc10b2515691c47fb0496b0fb78d1602ff9a6cffa11cc0a83d43d809e46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bs/firefox-85.0b2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "1e9df53642c442ead4318b0cc886653fdfcecf5275d6e7218acb390bb13e0021";
+ sha256 = "4223186d487b4d43ae08450bc896161b5060ea96da8cec63f19d2ba5d6f9c6b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ca-valencia/firefox-85.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "3b5699dad93291921979fc6da21d16f94ef471e9a8ef3d877001400ba4abe316";
+ sha256 = "2dcdd7c1172375c5358ea5957822f3cefaf77edce286a9e9abcb7cf4f2b09396";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ca/firefox-85.0b2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "c52b9cc25dc72eeb6ef3e7c3add4066c005399afdba2cd0964e695a891a1d314";
+ sha256 = "6d9c112fcfc56a39212a31ecef8b36f78c7d0130899a2630e8de53870f64276d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cak/firefox-85.0b2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "355df19615fddd85c51b033a413a3de524f19fb2d97a2ba77f3b8001b231338f";
+ sha256 = "c7cef2e121d960328aeaf43a933aa9b18911dae0c73b21edb483b1c036f7525e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cs/firefox-85.0b2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "e10f35795f19ea10c4de34687eacad6f9bd863002e9d66b87cbace01b97c8628";
+ sha256 = "9edc6df70bef140abe8b43d60369cfc17a10d2c20f9e06e4182035e1a33f48fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cy/firefox-85.0b2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "f2fd90b19e8c4ac98bd6ee262084ef7842e52a304abe10cfcda2fc14ccb5ce30";
+ sha256 = "789bc341344eaafbaeee8e9db4128d12e1cc54490d544168ddbc3c88b2374630";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/da/firefox-85.0b2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "01e468f3a445276aea85425b4b8a58e44a2e4cf8552a02aa3d4d31775bff9575";
+ sha256 = "678f6a6931f0c733b5836d994875f1c133a0f865a2eb496d0e30cbe3ce5faf5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/de/firefox-85.0b2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "9dd3d806a4ff60c9cfd5b81cdf212f72c281f75ce554555cfd443f0696f700d5";
+ sha256 = "e5721e408165ddf927e7810e6a940c50d2b2fe30ad5e2ccdb6811074ca0c4287";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/dsb/firefox-85.0b2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "eb26cbad496bc1c4f97e6027a1f2cd9166d479a503a3f0ac566a766c86bdf8b5";
+ sha256 = "b4aeb111e1124ead137bf3497e95bdced3f1a158f48585b644a73d50432a7d6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/el/firefox-85.0b2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "e173622f06f64156d749d0f56d98be72f067077c3e41090aa16a3b0c6d7a5e43";
+ sha256 = "66ce828c90be502cdb820bd69f4216450db60a16a40ca038f75eecea3fd0d640";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-CA/firefox-85.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "c1c6aa503e1565cb0c0239d562f11322265a7bce4005211b8007579f8f56c318";
+ sha256 = "ab7c8f8626ac88afec096210d75ac972308ae75cb3ebb315b30ab21b51e0b064";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-GB/firefox-85.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "57b2670f515e2a17c10df602d93a6960e5c4710462098d89568efd446e4480e5";
+ sha256 = "38cdf3449f82c51d6d1bdf3b6fd00a3f8bb057255ba2418a9547e48804744bef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-US/firefox-85.0b2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "81cf4a4fe610de3342bdea340d450ff67c594e7e4924a08b6b69de75510da698";
+ sha256 = "b044f5e64dfd2bd5dba00f8530abb3f49b82d600aca6d3165dd1ea7504975483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/eo/firefox-85.0b2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "dd61c4bacfe39f7887c6d21d139df6a2df17f263c4be5689f5f9dd6bb4ee6e63";
+ sha256 = "8ded13c7dc12d539efc5a3ed8a9d7fce556b7f012a184a1d1b96e8e2ec10a1c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-AR/firefox-85.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "3ae8695c57befa3552033bcb867b48f9ba491a08e31168ba22901fcb3276a3af";
+ sha256 = "f3dbe9b5f621bdfd1a19489a749db8bf452f4b5079ea4f79bfc9378056caa54a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-CL/firefox-85.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "5ae14208cdbf0dd50edecb8a56bfe7dba0e7520f2ef135abb092761acc8630ae";
+ sha256 = "9c8f486cce81c331588271cb6a82624cf4bc4daf480150e66f24237e42e9389a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-ES/firefox-85.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "d786cf3b623a05e5156b020a436897525e80117ab7fa9f25ca42fca9fb4c0eba";
+ sha256 = "0f04e9217d3981dae74a534bea8c5085e0a147e2e8ebf34090932cc4e5ee1bc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-MX/firefox-85.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "c2ec749bb5befffd81189503d87a57bda462897bba858904924ae999923a4e42";
+ sha256 = "7b696644fdb7c270a08155ee1a6896172966de078b9e172ca24b128b2e869651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/et/firefox-85.0b2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "7a2e1078ff1a3bb975baa5488f89e8161e20354d7f55b98c964efa5bfce6f696";
+ sha256 = "579bc62b32ea7805fdf5ca456c9343a40e0fbb1a2a040b8cbad7e70a54ab0172";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/eu/firefox-85.0b2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "c635006a367f68bfabad7a3874f3333ac3f486f0001ca9641ac8ce12dd9bd01e";
+ sha256 = "6c3049d47d9c35f96eee579b5d790a2b651f4f126fcea41b2fb05eca1fe686ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fa/firefox-85.0b2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "f897a5d316c436fc20d8c2737902e29dfd0ece3c9ffdb90fda2fa454ad398257";
+ sha256 = "33cca96a63f1f4a1598ab3c2daf4f758633d8be5316b8d1c194eca404f38d6f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ff/firefox-85.0b2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "3a31d43cb5242a0aec516d8fe99dc916144e8b7250b81c7de0b1361b19f067fa";
+ sha256 = "2c2151136438802148d7cf22253e9681b5076f6831271a149f76fecc3c5d1a18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fi/firefox-85.0b2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "50261499bd4725f08684c9042056c9da2029f55b0dee4a856a9de661412c06e8";
+ sha256 = "ff96c7c1efea803822524ea5d47a25147d03547eb9e662bdeec42d30513f8a92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fr/firefox-85.0b2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "7b793590a975a64b6fcfcccb4e6c07cd5346ec457af1ae31b5fb1032d4217c64";
+ sha256 = "e5679dc6f70a9d56604431e25954da2eb6592fefa6d6a99436b761ffc17dfc4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fy-NL/firefox-85.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "468c7463503a34de44a74ff6a751e8614abbe6bd23f39f50308f23000614331e";
+ sha256 = "c1be73adad9145d881228cc0567d677f94380489dc6aae9b4ff707207eb3a24e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ga-IE/firefox-85.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "92b49316d122c8c91995766e28387d5587955e022f844c7a85fe491ca602e222";
+ sha256 = "40a2f2e6eade53f32c9fea90e0945376e5f06a0b220815c124630f419f319ede";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gd/firefox-85.0b2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "4bd2901b705f99bd1889b21f4af9ba7dd022f608960807f96f115a110c96a80a";
+ sha256 = "7fa079c7e79971914f425db4877489e8aeda145af2968d51adfed235036d4576";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gl/firefox-85.0b2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "391d62de840d53d531130fef0018c71add0ef7134fbc758eb869da7c1cc3b5f3";
+ sha256 = "84d2b44fec8d9276b787eec99311384d83b626b3b9f75da2a725eeb50202ff81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gn/firefox-85.0b2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "d51f75a7718e78bfb1e9d0974db0a404294e577e186794d3480778c7facce418";
+ sha256 = "b9b528eaccb7f081b9ff7c0bad618d96faa5dbca0f200d197b760f1185f8cb53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gu-IN/firefox-85.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "7cbbf4846153f79fc72e217872fd64b92ed8968aaf618eeededa375ac268a12e";
+ sha256 = "5ffeb05e20bf3b4c2f89c4b81bc40656a943bd56687946ea10ca85308a8482d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/he/firefox-85.0b2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "44c0bfad535a4e3c225d948d87935e08e5d77ea22638e971cc833877462edc32";
+ sha256 = "62d8b9327c77aea9b0b3070c0b5f5c9e48ec90f9f95b7d001a8efdfbea2656d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hi-IN/firefox-85.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "fc64673429972967238b5bb101beb2117cfdb0360e405d4d3b53f013791c0b8c";
+ sha256 = "497c96a2b69e2890725ba8b8a464970bab77988a0ba8b2b88cab068c13a69cd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hr/firefox-85.0b2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "f256eb4e655a14b1a084af7f72ef4673d33b42d1c23ffc1ff3b4ede42d966246";
+ sha256 = "714e557e682e7a2a4bae5d457cb35c2e19273d613871b678bd2a8373f1e4a9b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hsb/firefox-85.0b2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "9e1e478e501875ac259e22287aece77f1bbc1f898355ab1c29fa26543b38acbb";
+ sha256 = "94f4d2e8017fba63c8376e2d5daeceecf2bcfe0da1cbe5cf2422552faf6512b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hu/firefox-85.0b2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "e8605e1b9d2c92c2eafa35cbe647bdda6af22eb030d8656262473b0b17650de9";
+ sha256 = "b7e0e33363de83462ebf94a9490f95ef7f088aa6dd665707e416772cbeed7de1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hy-AM/firefox-85.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "be21fea69e27ce54498b6b003c1db20b42d7d52702ac56d1a1fc2c6fc24558f1";
+ sha256 = "7e7fb17fccca63b9614c5077e1c8e2c82ea778efaad332375d38ecff602db9fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ia/firefox-85.0b2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "039f50fc10d95bdef4468174a8486f45bbf9313e1b9b6cecb0d094bb3766ca9c";
+ sha256 = "baee0674ebb53768a13b889976bb6dcc9fe76b799873f9c3064279a3231bbe6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/id/firefox-85.0b2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ecd6f3e031529e1fed8fb7ae77bf6e0497c9ad0e4996e31a86c4b79489ba9811";
+ sha256 = "d3c1e1e0bd774e1af092cc40c2b912a7d510e3c99944dd0810d6314d865d69cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/is/firefox-85.0b2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "1f6fbf55f1384141826a4b6a39ec617cc798b0c0a0e1ee02d6cd65a79d6784a9";
+ sha256 = "4d8260ea95a026246dfd3da112fa1911ff52456656ec5f2896e8f6a5bdc510ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/it/firefox-85.0b2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "73eebb1d351b5d746d3447c7a68d7a906c4db6df8cd257c6a048ea16cf908e64";
+ sha256 = "7f922294874c4a5876d8131572a93a9669b0f20b4381e7f6b82d5413b6fe6f5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ja/firefox-85.0b2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "ff1c630c6c41cd31c8ecab5fc48e8879dbc4aa295492368cae93061de6558b64";
+ sha256 = "8a92ecb5b8f62ecc4c64ca566071a3ca42cf9338f5ada718f196f63d0972cc79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ka/firefox-85.0b2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "b6976def40cfd05543b70597347ea7c632c591660a2dd08332f81411a6ce6723";
+ sha256 = "35c4b28506f026a2c3beaff67db693aff09fa197e5c158056ac9419804b05aee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kab/firefox-85.0b2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "403bd985ff7ab44324d12c8c7f1386eec9fbae97ac9a0597d12d09d387686db4";
+ sha256 = "34db7140b10611dafa089ff930215eff8ff521b14542d742edb5af6ff710bafe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kk/firefox-85.0b2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "3860b0e8d53655669afcb4bece7637e9a1c0daa66d453e9548b2336eb45d94ad";
+ sha256 = "67ebfa76f660e6beeba6d4190f20503f88397e8e5730736f2416b5a91639d69d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/km/firefox-85.0b2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "5753474371c7b8663d45f7f9591958afb9e9e2777df3e89840f6f34894ddf491";
+ sha256 = "3d0c6a8a3387454f1d0fd0d99c19176085088a413ba11be59660ff2622bf957d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kn/firefox-85.0b2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "d0dbeceacf93c3a581cc581e09507e401636350b763c8c9f5342b33a0640bd8e";
+ sha256 = "73e01f0f6e28b29d49c1b2025af3ef188252afd7bfc5b38ae3bb4c29dc1f5158";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ko/firefox-85.0b2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "095930063eae8e3d6a78a6d9adb3d28cff0bb0c9ccdec977c8c80765a4c60560";
+ sha256 = "471ffd1d4950a1b2dfceaf91ff538f6582b3c21be89b5bce4f7605cc3102cc42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lij/firefox-85.0b2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "587bced8e4480eba25e8597ab6b838a4f18553dd44b4f0ff48f245406f78e896";
+ sha256 = "11785be018c86839b225b9028d4cb9aad4bc86dd1dbeef0b26834e50bdb40797";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lt/firefox-85.0b2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "e214c23914e05152973428f5ed1df20054df054848d99ff23e5eb09e19b4557c";
+ sha256 = "868bdf38c6e26286db62df32475ec8a521574899ea23eb8f12d543ab1d74df6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lv/firefox-85.0b2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "67657d4abb394ef76d37c321625d99dcf228ee00cc109e6d1c80cb3659db9879";
+ sha256 = "83b2e75858d984ea450c3b8867da0d7bd4321a139fe7cdd7fe968e83c3567588";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/mk/firefox-85.0b2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "bac0e98b7a68dda441195cbebcdbea583f104188112449b14723c1086c3c4f19";
+ sha256 = "4b09567527422259087d69d78d55cf1310daaf6000fa6303b9dc0f1ad8f504df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/mr/firefox-85.0b2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "125a63c875f4be6e246fa01289386295172d999e0e523c1171578adea24b022e";
+ sha256 = "68cf8cbec32be8571efb0bf8b9eec9e33f08e78985a68328748af6ca46f3b1a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ms/firefox-85.0b2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "6dc44f34449c915e93bf9c012ce7286b16d6418ca8f576d8a008b7ceb90bcb13";
+ sha256 = "729642b22529b9b6caed5089fa6fdcfe7a05f0e50c898b816a01ee358012b2f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/my/firefox-85.0b2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "af5e2f1f9dcca84f41d3701035a00fc6b581aee2bf00f9f926928b99ab42d06e";
+ sha256 = "2de61bfd5e438099f5a263eb8c5d22d675562843ee000cf023fc602ef8f6d623";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nb-NO/firefox-85.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "d168631cc1518e17cc9cd85f481f1047f6ae7df593d9197de5710fca0d87965b";
+ sha256 = "4f96948cd2b2887a413b0ce1ed7815e502db1b26499ea6ad6f2d8a05db803b25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ne-NP/firefox-85.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "4b6065882ddd9e02441eff830808b31e6104d076cefed8386cff4ec7cb12330a";
+ sha256 = "47b9c401d432002b457d9bd55f6558383870b8d976fe0a2e885610b9cb03a7f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nl/firefox-85.0b2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "96298283a2dbd9e3242c27551ee29829b21c8b9a32ca33b85da3142c47084dd5";
+ sha256 = "d8cf656041406c15f54da4df8989b956c92837a3b17df08c071f43d8183e0cb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nn-NO/firefox-85.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "19475301d3d93a633a1555b4436d63546a71160a992daa760a8c76a808791b89";
+ sha256 = "81e4789c887a07fc00428d9af00b3552c5fbf22beeec31f7839e72c96f0aa60c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/oc/firefox-85.0b2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "48af4af195173b541d76bb623acc357c3a2a8d03227406a21de89ab2d6c8c757";
+ sha256 = "4650fe41db72f2fd6317cb35980356149610180e00ad8c79e6f7203852a42649";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pa-IN/firefox-85.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "582ec12fbe2f8b07f8f4ae11ddf05c62db2d84508ee63ad6bfead9493a1424cc";
+ sha256 = "a50c61b670b011651f61c0d36f87180ddc75686f7a125e7a6a4da05208801bb4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pl/firefox-85.0b2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "df8fcb5fe32325d45fbc1c9349065cd2d7f283e6a33d944282f3ed948c1174ee";
+ sha256 = "b808e322fc60b7efaea73728e5f58292e3764f1ef22f47298b7dab2e2b2fe689";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pt-BR/firefox-85.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "fa48bc301c9b7dac4802b50980c573039648eb41bf0c0fb3ef75d0ba1dce9b67";
+ sha256 = "323f5083225046500a368f86dad5581eb1d08078db5f0cbcf789da7fde2ea872";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pt-PT/firefox-85.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "b0075346738d9a5f61fe4c3265c3a50f639f017551d3bdb2479e622d9561bd33";
+ sha256 = "0e59076c66d290d98b315451a3170a9d7ee9cda1285ae5bf2a59f9300be5749f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/rm/firefox-85.0b2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "c9ad20ff328c8c0693cab58fbfb1d6c1f85bb63fdd20eb8d371e82d4df5c2e50";
+ sha256 = "1b01c79a9c7601816dbeca84e7eb66d2d9240e883e4379d132efff2adc71eec5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ro/firefox-85.0b2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "7816302b6f70c0e24b848d3d396876ee0d870d90561c37e440bb8b7722f54ff2";
+ sha256 = "92e49c4dc22795b8f71a74e673f9c1713c182cb80c3811898c132c532d600a6b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ru/firefox-85.0b2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "8f4969a16f4e70b59dd2da78b73532ff39589c984512d16fcd7106d2cf503342";
+ sha256 = "82826401517e04b61ce8728496dafe2314560736cd5737202edf20353fa443fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/si/firefox-85.0b2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "0dfc4c1c797366ac9e65489b07de756a1b03b5498c9e4a6a10ac0d3a60345471";
+ sha256 = "dc7fdcf680ab7aa71a9f06681ca35d521118cb9a9b07897ee28086f399bd5ef1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sk/firefox-85.0b2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "5e16b451058d64ea0cb61fa92e17fd72e591009803170b0b220237cac7180167";
+ sha256 = "f4af1988166e39ecb93b0a2b2b2ca8473764d33217ec976f60a320277ec950c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sl/firefox-85.0b2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "36216a3b474d3fd1d27886495f92eca83d24a465690efe7356ca9e7e4c08163d";
+ sha256 = "22b192c317d9cdf7744f04636cf1534f940244d8db491ccc127f0486ce254868";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/son/firefox-85.0b2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "1116bbb70b7ff8538d3ce4e7df190bd152c98889d1612fa8485cb0197a83868c";
+ sha256 = "73ca06a27c14ca81b2c102503fe4e4a00b39b41800d774387f64a4e29d82e709";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sq/firefox-85.0b2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "006948f771f4964f5f4f078615cbb85aee23051e371ff7b871caee7c4659fe64";
+ sha256 = "61783c5a14d81ac3aee9d354a8259347d5dcf2f14306a23cf6a89d852527c7d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sr/firefox-85.0b2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "20b0b9d605603e525d046424d290e6b2a0c963c0eae2a9a6c6ccdb72a9803e9e";
+ sha256 = "2972079539e598fa558bb52237e7ccea45d7faba5e64dc26747e5e100f69a833";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sv-SE/firefox-85.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "a132b97019c75aa8929830f873974e1ab36b69ca7e3c9ab44dd2a5b11bbe4f7f";
+ sha256 = "4ccf2fe7e32204184b2a643a780444bd60419b39f6611466dae2572ecd34b4b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ta/firefox-85.0b2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "3f24d965ee5c89edd447e8a52a0241a5d1cedb0aae6ed1ad1c212ba4dbed210a";
+ sha256 = "3cb1bc787c91a8fb583472429151c7f5eb1bf53c9614f44632a69a06e75dd3f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/te/firefox-85.0b2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "2b65c7bb7df93b2bdffa687bd4309352f0d73ecdd66767db0db860f33f17c6a6";
+ sha256 = "e197f97e88c40955e422cde9cf86109b3030ac2c826495e110b925636c9df59f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/th/firefox-85.0b2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "21e2dca4e194a38de97b9b717150441bdd32466ee43e721f41afde004bc8e3e2";
+ sha256 = "b9ad4d253cb8f4169acdf25eb1a1178441c7d0f8df20294fa256fe37d7abf29f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/tl/firefox-85.0b2.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "9f4dc351f5244b0837a95d4afbfa0af373fe056e5eb106a2b177a57ba4c85ee7";
+ sha256 = "b4ffaff8a4bd5dde81adc027935b5ea85877c997085d4f64635d1f657f294d69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/tr/firefox-85.0b2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "50cabe6fea43e2212d0b0a9a5a382e085fdabc3ff6b6b0694b8f9d3d327c3ffc";
+ sha256 = "0fa4e91de70badb0dceef368bea48c2ed7a0ff201e4abcc74597a220bb29b481";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/trs/firefox-85.0b2.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "c4db90a9a0677430fa591cc387bf1255f260208a4907cb760649cd7a6db03808";
+ sha256 = "e1f46d6ac7beff9048c3844379b3b375b3f1cd78f4464e70822194d6febb9ebe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/uk/firefox-85.0b2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7c92d619dd827a9f7ef9297f784cff582aba44684dca91c3b9873337b4318fb3";
+ sha256 = "84bfa5825e4cd047d577ec5ec73c9c21ba356f10254b64cdd30259946744f184";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ur/firefox-85.0b2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "ef46130577072c6fe6b14aa0710c75344dea46124093f483db47cbc8c9cb4ec6";
+ sha256 = "bd254f994c6fb977154dfcabe6038d851cd00903ed12b376bc33e858e1aa4d8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/uz/firefox-85.0b2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "34c28440a7772a7fcf7f920be760f92057d813648372fe7cb8ae9f2c3fb3a846";
+ sha256 = "54cf0f273950124152ec3e980e1d0a0fb84d2a4fab0660677636d1e46868c714";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/vi/firefox-85.0b2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "c02c1737b56e1ae4f20ffa9abd392fb69f19d68348341977d0f39bfefab465b6";
+ sha256 = "1af267979115d152f8282495de9e9280aae4d85ce1148a287b45c390bcc25bd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/xh/firefox-85.0b2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "6be6defb443480c536639d99d124d8c636d70f049f126a793d627c131035c9c2";
+ sha256 = "0dd914e24a2e42dfc424ce1d2257e6439e676f9f6a658c4e87b24c48c6fc4bc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/zh-CN/firefox-85.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "454af78f3ea4aa00676c4b97dff278dd404116e1da7993b5a2593167d11db885";
+ sha256 = "9e6b05b2897011b6e9c5c93c3f1117c4ef4955042ee05d40533809a20e5843de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/zh-TW/firefox-85.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "7e6b1b0ad56916759b01df06b23bb6a23b0c59815538cb1edb3e95edf7b772d7";
+ sha256 = "112263f15ebc4f6a7f8a79113f2f43c61ef402f6037700112143f1b3bf6a3516";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 431ed105f0..8c16b5f8b9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "83.0";
+ version = "84.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ach/firefox-84.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6";
+ sha256 = "12a2a0c416d491a867c3c68d2dec4efde37d1e21b50512971527d491dd173d21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/af/firefox-84.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513";
+ sha256 = "73ac394e073b3964befef66a3a82a09f9904ed36b4de2d12d21600feba5ac1ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/an/firefox-84.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80";
+ sha256 = "5b8208b477ae3590311bef51cdbb8c5b786e3d943316760cc4ece3d27ebbc4a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ar/firefox-84.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69";
+ sha256 = "d53c3899a160d0381339d2e30bff8060961cc2db64cdfdc90af091c4d375cdba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ast/firefox-84.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd";
+ sha256 = "78d159ee9c969c2b7acd9a42695695477fcd2ef958a3a4397e03662fe7422150";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/az/firefox-84.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3";
+ sha256 = "2c625c4b1ed1413f9ffa399d84a73fbd99bd1c4650d786429f6b9ca9fb38cd81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/be/firefox-84.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8";
+ sha256 = "c6cf89add52fccb933fcb9544b286b31a42d6af4f556a84bc81de721053f024d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bg/firefox-84.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600";
+ sha256 = "eb0a8986c13e375cd834800686a94d52548df451d81d774377890a5b1e286411";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bn/firefox-84.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4";
+ sha256 = "8f2baed5e81aeb9ecc579e9f4450a71c7dca13c869c8c39064bb900049884308";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/br/firefox-84.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972";
+ sha256 = "cfdab10e0f57bdcd37d7749ee379cc9a2f31552c67312cf63858fcde31b39b42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bs/firefox-84.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee";
+ sha256 = "1739b138e23fe56eb6ba8748f89adbc24673552ab0916250441af8e2a613fff6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ca-valencia/firefox-84.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1";
+ sha256 = "7cc19e90635c1cfb723be27b9917f35b64136afcdc1ef1d9359565af4bbb19d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ca/firefox-84.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f";
+ sha256 = "833334e585193387b45f087ecb7b034ca81ebebb649539db13e39b4276b3e65f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cak/firefox-84.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa";
+ sha256 = "d4fdda0de3a95d7f4b7774da21af960b40b49c2dc5a85e1b234f7efec8f942de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cs/firefox-84.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1";
+ sha256 = "0a1887ed3fe2e325836c4592f830a95e11d6022f4156b0af6b525000847394d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cy/firefox-84.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2";
+ sha256 = "fb6ba5719cf4a3405b75b58331d07d00c309fd88a5a54df77da006c6724d06fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/da/firefox-84.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0";
+ sha256 = "e2eed6ac1be7a1b21027325439e59459780fe549075051f83b27e418a0c52264";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/de/firefox-84.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94";
+ sha256 = "5789b1e6ba14a36c8c08247d123d062e5e6bb448b54d786089a7f5bed5e96eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/dsb/firefox-84.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80";
+ sha256 = "c70c169c917a3d910e824430cc1cbc0316a0f474f6f77aea873213a6d810a806";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/el/firefox-84.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1";
+ sha256 = "d64d5b2ec25e4b5901a195c45dcbe6c979e50fdaac1121af2b309f8942ed5603";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-CA/firefox-84.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52";
+ sha256 = "dddfc08d2e2966adb9a613d48fe505052e326402055c09372b73cf4cf91482f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-GB/firefox-84.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4";
+ sha256 = "74db586969ebad002996154ad983f58d38918089a89c370aa8822e4657fcac75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-US/firefox-84.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412";
+ sha256 = "601e5a9a12ce680ecd82177c7887dae008d8f33690da43be1a690b76563cd992";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/eo/firefox-84.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d";
+ sha256 = "b67ef713a518415e7e03f5b11162ef8e950604aa0d6741be41d6bf4580111311";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-AR/firefox-84.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574";
+ sha256 = "a52880fea1c8c2364c680c1e09bdd355600c3468d61089ba7908cd5cb6dd9fd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-CL/firefox-84.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15";
+ sha256 = "ef31a73e08e53fa5d257d9243e2b3bec36df93bdcc6a6776e531a36cde7fd2d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-ES/firefox-84.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696";
+ sha256 = "e5303528ea8d84dbf805db38a337a76fbfc50aae454f54272ba87539dc81511b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-MX/firefox-84.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111";
+ sha256 = "64e93de2fb59f95f0eea6f5a85ea4bd78a5a150c26b9c513b8c20318900419de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/et/firefox-84.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2";
+ sha256 = "02aab2612552c42f584fa627a2d739729cf1f599c3383970130205253c499047";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/eu/firefox-84.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e";
+ sha256 = "e7f14e47edd2c7b6b712f0dc35454d42760f1f4e8b8994416d3d2a75a7ade6ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fa/firefox-84.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42";
+ sha256 = "b9b9ecdcec2ba0ae689541a8f568356c0026859058e4bbe93dff74b1ddde1a3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ff/firefox-84.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c";
+ sha256 = "59e158fd6fb66de985bc956538116e00c15b2044ec7d2f7a74477d5fa1771e3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fi/firefox-84.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c";
+ sha256 = "fa3ca0125e271798bec62c213485a6b84ee3a0e0f072c39b04002b9d44c2337c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fr/firefox-84.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b";
+ sha256 = "e85a694d66eff7679f0e19593508f6e273f8bdbe7491df78deececff2368ec21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fy-NL/firefox-84.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397";
+ sha256 = "e38f39ca5b60e3569d63377c9b416323e03a79245b722e3ca42e8d817e9a51fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ga-IE/firefox-84.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695";
+ sha256 = "4dfcaedece96eb802c83cc23801bf3999fa9e42bc1ad2d5dd1a180386cc79823";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gd/firefox-84.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414";
+ sha256 = "0249ff8660779e95ae356d0cce85067ead2160701d3a1ba4660651ed5f9524f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gl/firefox-84.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd";
+ sha256 = "0aca9ad329c4a748cf9e093d5b931b228b003f09aa53cd041430afc1ada7ecad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gn/firefox-84.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee";
+ sha256 = "cb911f23f0e805537ce71f657b1f086d833bb2055152fed15b2975034b5209b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gu-IN/firefox-84.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17";
+ sha256 = "d611bbec579ae153b65c6c5c371aadea7c97a5c814576f59853e8fa0aee05075";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/he/firefox-84.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c";
+ sha256 = "cb52716e4c1ae8c35e054b6475bd33eabc9b6672073f751b57f1ad38d546522a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hi-IN/firefox-84.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a";
+ sha256 = "1cbc946e6d0073768fa066f985bf8eda377121714c8cfa09c9dff1f2a02a3b77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hr/firefox-84.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd";
+ sha256 = "dc08dfe6ea67009d12347512e9fe398b86bc699621f1c55d352ea3fca00a81af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hsb/firefox-84.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529";
+ sha256 = "cfa4a0905b61efe3ff4a808c994e1e062620bee907ed6af7489114d4a1cdb80f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hu/firefox-84.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721";
+ sha256 = "81da1cba517a80cfd4ebf6bee95f88801192cfaee864a420af03c8bc96a882cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hy-AM/firefox-84.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d";
+ sha256 = "1a2b4703b2b186c24c82a6264a95d7555fb0e33d4f057fdcf7664b7f8f386f88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ia/firefox-84.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e";
+ sha256 = "67b1effbe9ad34e4e41bc42bcc6745ef4bcf40410913603e687e7ab97d093150";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/id/firefox-84.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1";
+ sha256 = "718ed11d1ecd4d04ba53fbba85ba77c06156e4d2db29d53a1e6724139d72643a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/is/firefox-84.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee";
+ sha256 = "21cb12e80c51180741a97f1dddefcd8d2568fc820841ff79d47946c6a89d4968";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/it/firefox-84.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a";
+ sha256 = "7717b32c7cb4528a205748f239dc0a14a53cb88562978ccfe38b4aac8eab4187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ja/firefox-84.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88";
+ sha256 = "9523b9e9738c62a7088eddd4424c9a2a435bd57ed96913713460e413c2291e14";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ka/firefox-84.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c";
+ sha256 = "a9cfa1ff040471ebec43962486482bd103697a37cd73589dd3447501f22ba24c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kab/firefox-84.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284";
+ sha256 = "43bc7f3395d69df38b302eb4536333f913160b479bef4e44dc5419de58621107";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kk/firefox-84.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd";
+ sha256 = "6c440f99e31ec9e62a51f44387e6a37316e1f9a89bbfe7d172aa9ba063db0d8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/km/firefox-84.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c";
+ sha256 = "f1ade955303019e8bdccdfc8066a0490b76ce72c94cf5a587eb7ebc799a8aa1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kn/firefox-84.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638";
+ sha256 = "09c4819813e8b343e5abee96623c3da4cc932263a9ce58dab072a26282dcd70b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ko/firefox-84.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09";
+ sha256 = "7d4681545929bbc3d8946d554475d2a90a3ec1a96a6eba94996aacc3e04e03fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lij/firefox-84.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94";
+ sha256 = "a7f7e4aa713c295f7e7e5d4e42e5c5b65d497a1d2dfc5726b0b6e8286033fd9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lt/firefox-84.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d";
+ sha256 = "9816a62da4f983b45402ec4ea0acef040559aa13d3118356f907356046cd67b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lv/firefox-84.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322";
+ sha256 = "5084574d7d1d4b20b35ef239da626cb2d0468fbeb8bb137f66d473c225f73e89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/mk/firefox-84.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20";
+ sha256 = "f7aaa2c2d36e10f052ad0b39d4a436af312ba3d148588d53221c09e6516c041f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/mr/firefox-84.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f";
+ sha256 = "4244dca771907b6ab91ac86cc30913dd255b1f4b0d71fc5c3e91ffdf4daa2e51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ms/firefox-84.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200";
+ sha256 = "7707153b7e841979d77953442fb4d08ff9c7a2f654657747c1353aded880c4c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/my/firefox-84.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908";
+ sha256 = "4efd86100aebfe964d9425f8b58930da8779c58849e4c6590c8f3d03df45ac9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nb-NO/firefox-84.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f";
+ sha256 = "b94bd5e53679f1fdff9ef8445bc5fcb94733c6986ad96f22d79ea2d8203caf0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ne-NP/firefox-84.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3";
+ sha256 = "331d3f46f36eb3c26eb8023dae89306e5148d0c14b3bca74d201e29a0099f3ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nl/firefox-84.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66";
+ sha256 = "3ff0b28ceb0ddf2bb3af0c89da193728fa765f6b23429b77f8bc7b02f34092f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nn-NO/firefox-84.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649";
+ sha256 = "8f55248fbf565462e69116884237f242c3dd09c6a15627d8081720b85492f5de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/oc/firefox-84.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35";
+ sha256 = "9d6eae0d5097a5bcbb1c00345ff0420f269c54b2941dfb6c39d31ac690f2b88f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pa-IN/firefox-84.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa";
+ sha256 = "9a8bcf68808292eb8af5948be605e430d4891dcbb31b4bbfaaa4ed9e554b1766";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pl/firefox-84.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf";
+ sha256 = "fa065ac8620b29ae362f9def816662fb7dd350a0c77a65acedfe82ec2ffd35c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pt-BR/firefox-84.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05";
+ sha256 = "0f671b31c2a2696dcd0673c65740b57032c1bdc2d2d28269453b015a546e724b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pt-PT/firefox-84.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53";
+ sha256 = "12918be45174c8224458cc46e4e8a2a0ba8ba67b971359378a9f93ddd2b025f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/rm/firefox-84.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549";
+ sha256 = "ca71913a9f69ac64fd3a1b9409b631e3497ef26b6e153408466ca9a808405a0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ro/firefox-84.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86";
+ sha256 = "c33e39f5ddb653ef70b1db606f18bd8f8af101a41d7cb175af856075cd1d558b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ru/firefox-84.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075";
+ sha256 = "c5bd750a3c882edc312d7fe653c96e99d51184d3434fe188c305e8914bdd6219";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/si/firefox-84.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead";
+ sha256 = "ef4218b55b49877fa432641fdfbbfacacbd90820e4ed67e084b5e5e53b2bda13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sk/firefox-84.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d";
+ sha256 = "f4985f1d41a1a7577ebd804f10183c7e63e6db08eaa9971e91f5944a942f14b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sl/firefox-84.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965";
+ sha256 = "66c1436489bb92900d8e93750ca876753cd663de141acedfbb00bdfef4a09e6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/son/firefox-84.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5";
+ sha256 = "fbcd98f61bd42e7ce8f73680efb4cac59062133f1242a0fff1e3bbf1335a7279";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sq/firefox-84.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b";
+ sha256 = "5078f10233331aa3ab0a0a79a68b62c4a3059c863620a854341debf477739ea0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sr/firefox-84.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a";
+ sha256 = "22d31d3d7e0a97f8cbbab543aea767214fb135f6212e6c1d4dcf430e3c24dfc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sv-SE/firefox-84.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432";
+ sha256 = "f1f7f281b99ab9db28315e4c99c8e7c6c1d0832abf48b555c1076aa39ad3af15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ta/firefox-84.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276";
+ sha256 = "0244fb189fd965bf5dd83c22cf8589f26f20b11e4eddd2c2bad9e419ae0d303d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/te/firefox-84.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5";
+ sha256 = "1dc3959508233378ac2924ff4ec313569b1b5f6532bda09fe7d57164735a9bfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/th/firefox-84.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458";
+ sha256 = "544eeca7272347865ad794f23308e475bfe73b1fcabdbcdbdbc82aa15fa73a44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/tl/firefox-84.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def";
+ sha256 = "cd10d90a650536f1469d86b8f1047d616846e415288f4d4c32c6273edbb7a327";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/tr/firefox-84.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b";
+ sha256 = "5cbad19746a07d2ce404d9a98a615a709827818de11f30ba7e3e6a29d1d22cd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/trs/firefox-84.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b";
+ sha256 = "c3067c7639dc6b054f7529e19a33d4de1e5384372d33a546b2a1f6c4d4d4858a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/uk/firefox-84.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b";
+ sha256 = "0486b6d307fc90245b7a4329ed4180f242930ab2383471e4281fee6778f8e60b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ur/firefox-84.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5";
+ sha256 = "501c1f1c917198d481f37987073562194adba665a4454743955db182db9f321f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/uz/firefox-84.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc";
+ sha256 = "04bef2a9b6762a04925b031c1821730ce14a34f36ccc50a2e16d1704910ff58c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/vi/firefox-84.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256";
+ sha256 = "fc53827a4b14180bfb81d0ab59d6f89019b3b9decba5871aebcfba6b2efb031f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xh/firefox-84.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5";
+ sha256 = "fb3a892bdb72a8542f24671d384b53e75c7fae7b96dddc368907c7c3df2f60f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/zh-CN/firefox-84.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d";
+ sha256 = "9b45c70bdfce252ca018511d39f3f2c9fa45d75cc4e064c118523ab1d3b0f3b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/zh-TW/firefox-84.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645";
+ sha256 = "dabfb6ec2f8b55fbfdd86487d32ca7c0d207f1d403126bf1aef636b840347b13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ach/firefox-84.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152";
+ sha256 = "1451c261dac71047e39228744b132993fc70d65b9753f5b4d4ffbc9f944a2a22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/af/firefox-84.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6";
+ sha256 = "a5cf4473eeb289781d7c7a29085109b6a4235b6e48bb1e1308d05288d9683453";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/an/firefox-84.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146";
+ sha256 = "97147495e41f79afed553ca8f3e39405fc917e2ad73219a3e75f26995208f114";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ar/firefox-84.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3";
+ sha256 = "b50211de0a0e051828e38c2f4cd617029c5109534d3096a2aea6b2836fe47a02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ast/firefox-84.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1";
+ sha256 = "a36089aa9e4684cb473067a86f517f557525d5502c2943b0d77592b2f33cb8fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/az/firefox-84.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc";
+ sha256 = "4166d192bfbf8293c14b65edae460a7c6037a6bed335e2966e3d565c0f0b0c2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/be/firefox-84.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444";
+ sha256 = "5aec2961ff8b57ed09d4923da199ba2486ffc5e7b5f0ba7a2c7dcfd639e19c1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bg/firefox-84.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027";
+ sha256 = "fbbd60cbb4975a61f9e0d501490b3354afe5f4e65b1a550c441b11d2500f6bb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bn/firefox-84.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940";
+ sha256 = "2ec9330098ce5645443e8730425c9a913e45191d6ae496ab0cb19e6d5a172f15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/br/firefox-84.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821";
+ sha256 = "c847065e169dc3900105e681dc53c705caef8e182f1fd5d469964ba6dff57894";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bs/firefox-84.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34";
+ sha256 = "e4ed084ecc7f3d106b9757fff691fdec4c9469f06ed10d54ce7eb3c00437076e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ca-valencia/firefox-84.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8";
+ sha256 = "30eb8aed4ac3923df65eea78136237df12a9375ed92a6a2c3699059136730f11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ca/firefox-84.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda";
+ sha256 = "edf2a0e3ec9165a1c77488f516c46a93663d15a5cb7100b43f0d2f4845453734";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cak/firefox-84.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3";
+ sha256 = "769dc346360e41ed800981002fe85ee82fc11ddedc4ae6a578a3a45ffff38a11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cs/firefox-84.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7";
+ sha256 = "ad4b4bf00b730ce5c5a1cb5075ab4e3f83fca92bf1dc1bcd1c11823cbc3315f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cy/firefox-84.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef";
+ sha256 = "7653f67150699878208ef741ca7d6698e474760330f5f483d1328f92d9feccdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/da/firefox-84.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38";
+ sha256 = "885d0e55a2d827e75b6bb49bc8e073dd1c954ff2d4cb22246bb3babff728f039";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/de/firefox-84.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526";
+ sha256 = "6c12e40e26c13d55d1495da3f83eca9a83c800a0e71df96e9a99553c132c0a6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/dsb/firefox-84.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66";
+ sha256 = "bb6ab0d953ce4c9adf584373b6a04639b5e5fd027cdfcca1ad914b390dbf3993";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/el/firefox-84.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060";
+ sha256 = "6c51226b866cc905c74c88b0414ca8143a5832935c1c931e0c3513ad979fd7db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-CA/firefox-84.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90";
+ sha256 = "900738c62147b8abe5974ed5b7ba04e079dfd8504b6a1ad60d8c560ec2191608";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-GB/firefox-84.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6";
+ sha256 = "7a5de0be8c0a2697e0cb277af09575efd72fc86632527bdc45ddc2404b8728bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-US/firefox-84.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8";
+ sha256 = "011598d4ccaccf87b9dd655ca266805378d5fcfd87fd9213ae4d5be9dee56278";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/eo/firefox-84.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b";
+ sha256 = "acf6bf1cf7aa5635a07e6b58a4c70318cf4f915f8146afc928ca00e471c2cd61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-AR/firefox-84.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc";
+ sha256 = "cd3f40e85c558b247dce4c34c6cae58b92f37e1d77d8dbabb59a433d22e690d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-CL/firefox-84.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132";
+ sha256 = "35e78b21ec7137b78a394fbb3d49f5ff0dec784aa19315459c7e5ecc6e7d3db0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-ES/firefox-84.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d";
+ sha256 = "d13572cc97f21bfc447951def9a5be7df77ed55bd7d414cd16d5f5f5c605f67b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-MX/firefox-84.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120";
+ sha256 = "d0e2cdb77cec5565e2f9f68046eeb237c1fd85e73187e10995cc317c1e9aaefd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/et/firefox-84.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214";
+ sha256 = "4f074c663de7a0bd4883b600985d96da0191d387263332f8cf3282cd09ae47aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/eu/firefox-84.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00";
+ sha256 = "dbd39da7c58abf53ad8545eaf5ea2b49f9ef6e372818e2bbb1d0403f78b9b31a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fa/firefox-84.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf";
+ sha256 = "bf951d5a0dacccc4ca785ac665e979b44e4ae4909d26c5952710156cc7dd61df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ff/firefox-84.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d";
+ sha256 = "7b2910636e68419041989e196841820cdfd49cca79d39165f693be68a2000450";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fi/firefox-84.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3";
+ sha256 = "b4effa12c09d22d9dcab2c988eaeadec0336f0cc4c2d501899717bcd458f33a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fr/firefox-84.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52";
+ sha256 = "8080503687cead7ec1e54a8cea9bfa5785725f5cdad694864374b942c16b5b6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fy-NL/firefox-84.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189";
+ sha256 = "c7bff7755f08df3d5b4f824710e69fd4823500f3bc9a58b536be7f86d518efd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ga-IE/firefox-84.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263";
+ sha256 = "4c5937b345de4e2461821c38d19cf719a65b9d801591f5e54278b7aa817af6ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gd/firefox-84.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5";
+ sha256 = "297e0a412f3ed31115533f523ceb23c0d856b4612654882ee44cb1a70d057165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gl/firefox-84.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0";
+ sha256 = "bc6efc2884cc4af00bfc90261f8b05afd55ce755479c36aabc870ce427a0cff1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gn/firefox-84.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373";
+ sha256 = "a2942241c8d78ee123abda87a663868185f5b6bbe550f51807af3acee3c0c5fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gu-IN/firefox-84.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036";
+ sha256 = "de8ad6a7b9907f163f405dc07ab6a288348ce8a0a1d51c9882b7ee4fb8d916ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/he/firefox-84.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c";
+ sha256 = "a202905c4b0a02beeecb4a6430c4f806c92d79cb07b143f3e56e043809f116e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hi-IN/firefox-84.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916";
+ sha256 = "d722f0afc8fc92876ddd98f680c14d6cb1ad10ab44c0d5c4b643eee5ca2db853";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hr/firefox-84.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27";
+ sha256 = "3df6bfce880a925b29580626a9ba7f33e2186517055aa00d5b2e3a610845a36a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hsb/firefox-84.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b";
+ sha256 = "ca27b4d54ebf03df0c4a28ab6abf44d585e9ea9041a2d794c0f519cbce8d69bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hu/firefox-84.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656";
+ sha256 = "2b85490e099c161752400aa87006c7166bd1b959502110e6c76adf6af2288b0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hy-AM/firefox-84.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405";
+ sha256 = "459f6488de6c740b9bed48ea4f8f99804be0616e30993cd39e92b77f0eec6b18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ia/firefox-84.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d";
+ sha256 = "5cb034cf8835cf9d02e6b853b1fb81be587ebff8b6872fedcabd4d6a4ee19f82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/id/firefox-84.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2";
+ sha256 = "993d0893a1b429d9ce9203df35eb5d542396861b17e363525cd9c4f43f5168a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/is/firefox-84.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a";
+ sha256 = "f9db0f82c1caf4d6d00c00bf9c78cb546d32aea95f1807a12c7ce6d623df7b0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/it/firefox-84.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b";
+ sha256 = "7f26ab3fa8f5972db64f03dfcde69477f73bf708f98a642347a56cb49c500cf3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ja/firefox-84.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9";
+ sha256 = "651a21c91413603c6d20d042f9cf196cb868ac491931f6910543b3dd02434d56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ka/firefox-84.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8";
+ sha256 = "0328acc0fd12640bd8005bd0ef6c5db41907703b19429fe11d2e250406d019ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kab/firefox-84.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f";
+ sha256 = "708502d90ed114f9abd8d79170a6c803a14d13cb023f414f6cfd05c75bd41ffe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kk/firefox-84.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378";
+ sha256 = "de2be2de243e74b8b76957e31f15f0e918f88f9b675ebcd6df29456c353451ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/km/firefox-84.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860";
+ sha256 = "47ce408cfd299b0cb29a59eed50f5fdfb3183f2e997c48a901e30a89560aa8d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kn/firefox-84.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408";
+ sha256 = "8bfc11f38e69f1c59f02f79946e845a26a706ade17923b316bdee6aa55e807b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ko/firefox-84.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7";
+ sha256 = "35443f1184b83a5d6801c1c6694ae6ee45d7ccab2b3bd1385339c3c25c991f9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lij/firefox-84.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052";
+ sha256 = "275e09a16c19cfa9aaf4b3edbde22ae22b374fec881163f6f656470d626c4e15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lt/firefox-84.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079";
+ sha256 = "e2eebd6411a3d5ea722356e0589e084e92bb9c6de6ef857c59f5073d1cf45faa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lv/firefox-84.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4";
+ sha256 = "2fa8dae6d41e45ff180aaacc351a5e649e97c7b19d07185b71d128c7c1107b09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/mk/firefox-84.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03";
+ sha256 = "ed515998a2a59368012613f29ae328df232f8b53c84cbb0a76d0bc28d790de87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/mr/firefox-84.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc";
+ sha256 = "1f1f39175dc1ed91417fae9cd4508152e0f34c483a972469059cda2484d8c4d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ms/firefox-84.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e";
+ sha256 = "7c4129ca5630473536d11ccb9ee818739e68deb618a230371d7cda448a686e1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/my/firefox-84.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b";
+ sha256 = "0608c452c89b1dc71aa99d540baa7a301f9c7974ff0f92e3bd567a577d6a8801";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nb-NO/firefox-84.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe";
+ sha256 = "b480530a21a49b00e8c3666c6856ad281c060e0bf2471c5363b1af5fe842ca1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ne-NP/firefox-84.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf";
+ sha256 = "7874273d946dea1821e594eae22b5c9efca48c429c922a181b5033ed834a19d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nl/firefox-84.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d";
+ sha256 = "f54431c579a32aa9c822d834facdd56dc22f319f56b3d8849beb2dba2cd92f3c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nn-NO/firefox-84.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7";
+ sha256 = "52d56abf19671927427755a91d34f97e8ea3beeeb4f855c43e5c17198c8a0033";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/oc/firefox-84.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42";
+ sha256 = "adb1fe2efc7c422ff032a7786ff4681964cbec3764d1a4cf0408db34f84c2af8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pa-IN/firefox-84.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060";
+ sha256 = "92c62a054d5755fd6aaf7527812bf2080e94a0b99bbadd8101b120e5a97a834b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pl/firefox-84.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3";
+ sha256 = "ced027c3eed4912bf52a0e0fd87c3bb3e8fdb495310d54fa3e27202ceef6b181";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pt-BR/firefox-84.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd";
+ sha256 = "407b4bb3ff178be28dd475e8e8265a6db0728362011f155c58126af0ec3418e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pt-PT/firefox-84.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d";
+ sha256 = "4d5a1246694c849fc5f9dacff55a8d77b15cfdf9fad1c13dcc3379aaba08aca7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/rm/firefox-84.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4";
+ sha256 = "020268365761b5e1667e62d9668b3ec72802f970335424eb0facc1d861010e1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ro/firefox-84.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c";
+ sha256 = "890c046200b68226cd4efe1170c95582456fda0df1004ddc5a96ab4544bbbf80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ru/firefox-84.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15";
+ sha256 = "7a502fd6c96506809bfaf6c5784a49f4219fd859628938c4a536bc82ed2d1d5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/si/firefox-84.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88";
+ sha256 = "d4432722999b424c3d2b1f6aad41632db9051a33e40dea317acf933159630c20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sk/firefox-84.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad";
+ sha256 = "68f7b7769bcba9eec44bde88a7c0579c07d2501af8b1494271eeda207d8d256b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sl/firefox-84.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0";
+ sha256 = "aa33d8fd7bcfbd340dd4251aedae9f1e5671715bebd2db7f4d4e40e1288dd875";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/son/firefox-84.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042";
+ sha256 = "c22bfd8925e30ac477e554d8e17939969d5479425d44180a6b409113f2be961f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sq/firefox-84.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94";
+ sha256 = "ecb182d80021e37933c8e34671fff744b24bfb66fd7b11382a921315664547fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sr/firefox-84.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a";
+ sha256 = "d0d2121473dd5ff2ff16029abcdde740e9d4b56470c56c8d0e26f062c0972e1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sv-SE/firefox-84.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea";
+ sha256 = "dfc1c0c89fd89b6d3ef450d16b489b57d6324b27ca2da628ce136091fb46e19b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ta/firefox-84.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a";
+ sha256 = "ad117c4e87e7623eb46d9ec23448cf6c9dd0efc950f04359dfbfcb25d88a78bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/te/firefox-84.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef";
+ sha256 = "1906a1dc8c981f4a3ff631cbe5451b5b3ffd2d66a6868bcb0c075e7cc53fb1b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/th/firefox-84.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc";
+ sha256 = "953b0a336557f91e3d1831e0c77ba1da61e63fd6b76a9383dbf7703781a9ffc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/tl/firefox-84.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00";
+ sha256 = "09edec56fa57de6fc29be4e3848059d6e975a44fe49edff426f4cd8c17c0d76e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/tr/firefox-84.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f";
+ sha256 = "d93f502786328023bde8f025345acb835fc5b46ecf545d42fa5ef0ab7bee9dab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/trs/firefox-84.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef";
+ sha256 = "2c1ccaa3879d25fa8c63eba446a5ad2c4668e32210b5927e4c5280cf2c46f3a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/uk/firefox-84.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755";
+ sha256 = "050645f728c545f8febd5a2f3b886cfd0cdd9f3873d1f2c8248b625b16b1958b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ur/firefox-84.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc";
+ sha256 = "96a1f37238376b3e2321945a92e6663d9a8a78956d6e37c227b597cb9cd312ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/uz/firefox-84.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c";
+ sha256 = "3d51cb2280b706c7ab944ad612d8b7cdd5d175563f470a96c1f8540fc97dfa53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/vi/firefox-84.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164";
+ sha256 = "4052e4a9edef39e7a5ab7167e284c9f5ba1bec85d3774cf6a79943df7d68fc0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/xh/firefox-84.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015";
+ sha256 = "0f55bc55fa4674a6736bdf11cf3265747ece6acc2b644ad555f40c3825736026";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/zh-CN/firefox-84.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06";
+ sha256 = "a0dd3688a1a4da9d3b6de14758c4cd68508852b23dfebc1050ab8bbbaec13a21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/zh-TW/firefox-84.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009";
+ sha256 = "236f2a5014478e0a722f9d0b42b509585f2fdc289e56149fd867f88914c1c11d";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index 1fbfdc2a7d..3e1bd2fbc0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -118,8 +118,9 @@ buildStdenv.mkDerivation ({
patches = [
./env_var_for_system_dir.patch
- ./no-buildconfig-ffx76.patch
] ++
+ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
+ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
# there are two flavors of pipewire support
# The patches for the ESR release and the patches for the current stable
@@ -141,13 +142,7 @@ buildStdenv.mkDerivation ({
url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}";
};
in map mkPWPatch [
- { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; }
- { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; }
- { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; }
- { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; }
- { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; }
{ name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; }
- { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; }
])
++ patches;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch
new file mode 100644
index 0000000000..c4187fcda3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch
@@ -0,0 +1,25 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index 10ac77b..0125d9b 100644
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = {
+ {"about", "chrome://global/content/aboutAbout.html", 0},
+ {"addons", "chrome://mozapps/content/extensions/extensions.xhtml",
+ nsIAboutModule::ALLOW_SCRIPT},
+- {"buildconfig", "chrome://global/content/buildconfig.html",
+- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
+ {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+ nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index c83b3e2..d543140 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -40,7 +40,6 @@ toolkit.jar:
+ content/global/plugins.css
+ content/global/plugins.js
+ content/global/browser-child.js
+-* content/global/buildconfig.html
+ content/global/buildconfig.css
+ content/global/contentAreaUtils.js
+ content/global/datepicker.xhtml
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 7f1d9763e4..a0f0a1a28e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,23 +7,12 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "83.0";
+ ffversion = "84.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a";
+ sha512 = "37d5hc2wv1b6il4flgsw5g7ihw2jx3qrrmgm4cjg3lmk91q8k7908sy79z24na6529y7jxpj4m05l6yb850wnnwjhyc4c3vxqbldnba";
};
- patches = [
- # Fix compilation on aarch64 with newer rust version
- # See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690
- # and https://bugzilla.redhat.com/show_bug.cgi?id=1897675
- (fetchpatch {
- name = "aarch64-simd-bgz-1677690.patch";
- url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch";
- sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin";
- })
- ];
-
meta = {
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 7f0b826f90..88fb6af4b0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
-, replace, fetchurl, zip, unzip, jq
+, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText
## various stuff that can be plugged in
, flashplayer, hal-flash
@@ -97,12 +97,17 @@ let
# EXTRA PREF CHANGES #
# #
#########################
- policiesJson = builtins.toFile "policies.json"
- (builtins.toJSON enterprisePolicies);
+ policiesJson = writeText "policies.json" (builtins.toJSON enterprisePolicies);
usesNixExtensions = nixExtensions != null;
- extensions = builtins.map (a:
+ nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []);
+
+ # Check that every extension has a unqiue .name attribute
+ # and an extid attribute
+ extensions = if nameArray != (lib.unique nameArray) then
+ throw "Firefox addon name needs to be unique"
+ else builtins.map (a:
if ! (builtins.hasAttr "extid" a) then
throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"
else
@@ -128,12 +133,19 @@ let
};
}
) {} extensions;
- }
+ } //
+ {
+ Extensions = {
+ Install = lib.foldr (e: ret:
+ ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
+ ) [] extensions;
+ };
+ }
// extraPolicies;
};
- mozillaCfg = builtins.toFile "mozilla.cfg" ''
-// First line must be a comment
+ mozillaCfg = writeText "mozilla.cfg" ''
+ // First line must be a comment
// Disables addon signature checking
// to be able to install addons that do not have an extid
@@ -251,6 +263,7 @@ let
--suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
+ --prefix PATH ':' "${xdg_utils}/bin" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
@@ -319,18 +332,13 @@ let
# preparing for autoconfig
mkdir -p "$out/lib/${firefoxLibName}/defaults/pref"
- cat > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" < "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js"
+ echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js"
cat > "$out/lib/${firefoxLibName}/mozilla.cfg" < ${mozillaCfg}
mkdir -p $out/lib/${firefoxLibName}/distribution/extensions
- for i in ${toString extensions}; do
- ln -s -t $out/lib/${firefoxLibName}/distribution/extensions $i/*
- done
#############################
# #
# END EXTRA PREF CHANGES #
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 82015b6f13..cd9898e420 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
- version = "32.0.0.453";
+ version = "32.0.0.465";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0jjzx7jpaz2a4p5x5535v8286pakhfymrq6zi16skv4cfixc0q99"
+ "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y"
else
- "1ikgxl33g503bm7v1209bmwppx0j40dnlm01hddx5i2qzv7dwh2v"
+ "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw"
else
if arch == "x86_64" then
- "0dryf849xjr767zlpvg8wsy4fh4dl8gbca4l7a1yc47lgq1ffzsq"
+ "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9"
else
- "1y0xawsm9qsk0js6p6n5g5yy24kh2kn1kbmsla59g204l6xwsla1";
+ "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 7d54cfe401..09839b4c3c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
- version = "32.0.0.453";
+ version = "32.0.0.465";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "1qnmr8y9rzb8f9j4pn0cr7nxrdfn1pqkwfrzq8rf3nw9np4lxyfv"
+ "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs"
else
- "0s0xcbha72y0wybnmalgsx7nv3b9jcwv7p3rakj6ij9l1wf73b7g";
+ "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 222b1b5b76..ab8a21c5b7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -91,19 +91,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "10.0.5";
+ version = "10.0.7";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "1cxh39x69m4lgqin5k5p67gs9g26w7cnlbdpjqi8dw47y0bpr9xw";
+ sha256 = "1phqsdf9lav0s111chlgyh4xiq2rm5zcxbx676i9711lkmc5l053";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "1cyg5ic7mrj6x1gxw5w609933d9ripa5b5gxyqnvnxfa23dkh608";
+ sha256 = "1nkppwdcjbrx8nh3d6qvvkgd5by6ja5ckjgpbkhavyy2pqlxyqk8";
};
};
in
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
deleted file mode 100644
index c5cbee1965..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ stdenv, mkChromiumDerivation, channel, enableWideVine }:
-
-with stdenv.lib;
-
-mkChromiumDerivation (base: rec {
- name = "chromium-browser";
- packageName = "chromium";
- buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
-
- outputs = ["out" "sandbox"];
-
- sandboxExecutableName = "__chromium-suid-sandbox";
-
- installPhase = ''
- mkdir -p "$libExecPath"
- cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
- cp -v "$buildPath/icudtl.dat" "$libExecPath/"
- cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
- cp -v "$buildPath/chrome" "$libExecPath/$packageName"
-
- # Swiftshader
- # See https://stackoverflow.com/a/4264351/263061 for the find invocation.
- if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then
- echo "Swiftshader files found; installing"
- mkdir -p "$libExecPath/swiftshader"
- cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
- else
- echo "Swiftshader files not found"
- fi
-
- mkdir -p "$sandbox/bin"
- cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
-
- mkdir -vp "$out/share/man/man1"
- cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1"
-
- for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
- num_and_suffix="''${icon_file##*logo_}"
- icon_size="''${num_and_suffix%.*}"
- expr "$icon_size" : "^[0-9][0-9]*$" || continue
- logo_output_prefix="$out/share/icons/hicolor"
- logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
- mkdir -vp "$logo_output_path"
- cp -v "$icon_file" "$logo_output_path/$packageName.png"
- done
-
- # Install Desktop Entry
- install -D chrome/installer/linux/common/desktop.template \
- $out/share/applications/chromium-browser.desktop
-
- substituteInPlace $out/share/applications/chromium-browser.desktop \
- --replace "@@MENUNAME@@" "Chromium" \
- --replace "@@PACKAGE@@" "chromium" \
- --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium"
-
- # Append more mime types to the end
- sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \
- $out/share/applications/chromium-browser.desktop
-
- # See https://github.com/NixOS/nixpkgs/issues/12433
- sed -i \
- -e '/\[Desktop Entry\]/a\' \
- -e 'StartupWMClass=chromium-browser' \
- $out/share/applications/chromium-browser.desktop
- '';
-
- passthru = { inherit sandboxExecutableName; };
-
- requiredSystemFeatures = [ "big-parallel" ];
-
- meta = {
- description = "An open source web browser from Google, with dependencies on Google web services removed";
- longDescription = ''
- Chromium is an open source web browser from Google that aims to build a
- safer, faster, and more stable way for all Internet users to experience
- the web. It has a minimalist user interface and provides the vast majority
- of source code for Google Chrome (which has some additional features).
- '';
- homepage = "https://github.com/Eloston/ungoogled-chromium";
- maintainers = with maintainers; [ squalus ];
- license = if enableWideVine then licenses.unfree else licenses.bsd3;
- platforms = platforms.linux;
- hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
- timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
- broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896
- };
-})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
deleted file mode 100644
index 2accb1a7ab..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ /dev/null
@@ -1,358 +0,0 @@
-{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl
-
-# default dependencies
-, gnutar, bzip2, flac, speex, libopus
-, libevent, expat, libjpeg, snappy
-, libpng, libcap
-, xdg_utils, yasm, nasm, minizip, libwebp
-, libusb1, pciutils, nss, re2
-
-, python2Packages, perl, pkgconfig
-, nspr, systemd, kerberos
-, util-linux, alsaLib
-, bison, gperf
-, glib, gtk3, dbus-glib
-, glibc
-, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
-, protobuf, speechd, libXdamage, cups
-, ffmpeg, libxslt, libxml2, at-spi2-core
-, jre8
-, pipewire_0_2
-
-# optional dependencies
-, libgcrypt ? null # gnomeSupport || cupsSupport
-, libva ? null # useVaapi
-, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
-
-# package customization
-, useOzone ? false
-, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper
-# VA-API TODOs:
-# - Ozone: M81 fails to build due to "ozone_platform_gbm = false"
-# - Possible solutions: Write a patch to fix the build (wrong gn dependencies)
-# or build with minigbm
-# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879)
-, gnomeSupport ? false, gnome ? null
-, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
-, proprietaryCodecs ? true
-, cupsSupport ? true
-, pulseSupport ? false, libpulseaudio ? null
-, ungoogled-chromium
-, ungoogled ? false
-
-, channel
-, upstream-info
-}:
-
-buildFun:
-
-with stdenv.lib;
-
-let
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-
- # The additional attributes for creating derivations based on the chromium
- # source tree.
- extraAttrs = buildFun base;
-
- githubPatch = commit: sha256: fetchpatch {
- url = "https://github.com/chromium/chromium/commit/${commit}.patch";
- inherit sha256;
- };
-
- mkGnFlags =
- let
- # Serialize Nix types into GN types according to this document:
- # https://source.chromium.org/gn/gn/+/master:docs/language.md
- mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\"";
- sanitize = value:
- if value == true then "true"
- else if value == false then "false"
- else if isList value then "[${concatMapStringsSep ", " sanitize value}]"
- else if isInt value then toString value
- else if isString value then mkGnString value
- else throw "Unsupported type for GN value `${value}'.";
- toFlag = key: value: "${key}=${sanitize value}";
- in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
-
- # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
- gnSystemLibraries = [
- "ffmpeg"
- "flac"
- "libjpeg"
- "libpng"
- "libwebp"
- "libxslt"
- "opus"
- "snappy"
- "zlib"
- ];
-
- opusWithCustomModes = libopus.override {
- withCustomModes = true;
- };
-
- defaultDependencies = [
- bzip2 flac speex opusWithCustomModes
- libevent expat libjpeg snappy
- libpng libcap
- xdg_utils minizip libwebp
- libusb1 re2
- ffmpeg libxslt libxml2
- nasm
- ];
-
- # build paths and release info
- packageName = extraAttrs.packageName or extraAttrs.name;
- buildType = "Release";
- buildPath = "out/${buildType}";
- libExecPath = "$out/libexec/${packageName}";
-
- versionRange = min-version: upto-version:
- let inherit (upstream-info) version;
- result = versionAtLeast version min-version && versionOlder version upto-version;
- stable-version = (importJSON ./upstream-info.json).stable.version;
- in if versionAtLeast stable-version upto-version
- then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
- result
- else result;
-
- ungoogler =
- let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}";
- in ungoogled-chromium {
- inherit (versionEntry) rev sha256;
- };
- base = rec {
- name = "${packageName}-unwrapped-${version}";
- inherit (upstream-info) version;
- inherit channel packageName buildType buildPath;
-
- src = fetchurl {
- url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- inherit (upstream-info) sha256;
- };
-
- nativeBuildInputs = [
- llvmPackages.lldClang.bintools
- ninja which python2Packages.python perl pkgconfig
- python2Packages.ply python2Packages.jinja2 nodejs
- gnutar python2Packages.setuptools
- ];
-
- buildInputs = defaultDependencies ++ [
- nspr nss systemd
- util-linux alsaLib
- bison gperf kerberos
- glib gtk3 dbus-glib
- libXScrnSaver libXcursor libXtst libGLU libGL
- pciutils protobuf speechd libXdamage at-spi2-core
- jre
- pipewire_0_2
- ] ++ optional useVaapi libva
- ++ optional gnomeKeyringSupport libgnome-keyring3
- ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
- ++ optionals cupsSupport [ libgcrypt cups ]
- ++ optional pulseSupport libpulseaudio
- ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
-
- patches = [
- ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
- ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
- # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
- ] ++ optionals (useVaapi && versionRange "86" "87") [
- # Check for enable-accelerated-video-decode on Linux:
- (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
- ];
-
- postPatch = ''
- # remove unused third-party
- for lib in ${toString gnSystemLibraries}; do
- if [ -d "third_party/$lib" ]; then
- find "third_party/$lib" -type f \
- \! -path "third_party/$lib/chromium/*" \
- \! -path "third_party/$lib/google/*" \
- \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
- \! -regex '.*\.\(gn\|gni\|isolate\)' \
- -delete
- fi
- done
-
- # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
- substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" ""
- if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then
- substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
- --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
- fi
-
- # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
- substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
- --replace \
- 'return sandbox_binary;' \
- 'return base::FilePath(GetDevelSandboxPath());'
-
- substituteInPlace services/audio/audio_sandbox_hook_linux.cc \
- --replace \
- '/usr/share/alsa/' \
- '${alsaLib}/share/alsa/' \
- --replace \
- '/usr/lib/x86_64-linux-gnu/gconv/' \
- '${glibc}/lib/gconv/' \
- --replace \
- '/usr/share/locale/' \
- '${glibc}/share/locale/'
-
- sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
- chrome/browser/shell_integration_linux.cc
-
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
- device/udev_linux/udev?_loader.cc
-
- sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
- gpu/config/gpu_info_collector_linux.cc
-
- # Allow to put extensions into the system-path.
- sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
-
- patchShebangs .
- # use our own nodejs
- mkdir -p third_party/node/linux/node-linux-x64/bin
- ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
-
- # Allow building against system libraries in official builds
- sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
-
- '' + optionalString stdenv.isAarch64 ''
- substituteInPlace build/toolchain/linux/BUILD.gn \
- --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
- '' + optionalString ungoogled ''
- ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
- ${ungoogler}/utils/patches.py . ${ungoogler}/patches
- ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
- '';
-
- gnFlags = mkGnFlags ({
- custom_toolchain = "//build/toolchain/linux/unbundle:default";
- host_toolchain = "//build/toolchain/linux/unbundle:default";
- is_official_build = true;
- is_debug = false;
-
- proprietary_codecs = false;
- use_sysroot = false;
- use_gnome_keyring = gnomeKeyringSupport;
- use_gio = gnomeSupport;
- # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy',
- # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it
- enable_nacl = false;
- # Enabling the Widevine component here doesn't affect whether we can
- # redistribute the chromium package; the Widevine component is either
- # added later in the wrapped -wv build or downloaded from Google.
- enable_widevine = true;
- use_cups = cupsSupport;
- # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture.
- rtc_use_pipewire = true;
-
- treat_warnings_as_errors = false;
- is_clang = stdenv.cc.isClang;
- clang_use_chrome_plugins = false;
- blink_symbol_level = 0;
- symbol_level = 0;
- fieldtrial_testing_like_official_build = true;
-
- # Google API keys, see:
- # http://www.chromium.org/developers/how-tos/api-keys
- # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
- # please get your own set of keys.
- google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
- google_default_client_id = "404761575300.apps.googleusercontent.com";
- google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
- } // optionalAttrs proprietaryCodecs {
- # enable support for the H.264 codec
- proprietary_codecs = true;
- enable_hangout_services_extension = true;
- ffmpeg_branding = "Chrome";
- } // optionalAttrs useVaapi {
- use_vaapi = true;
- } // optionalAttrs pulseSupport {
- use_pulseaudio = true;
- link_pulseaudio = true;
- } // optionalAttrs useOzone {
- use_ozone = true;
- ozone_platform_gbm = false;
- use_xkbcommon = true;
- use_glib = true;
- use_gtk = true;
- use_system_libwayland = true;
- use_system_minigbm = true;
- use_system_libdrm = true;
- system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
- } // optionalAttrs ungoogled {
- enable_hangout_services_extension = false;
- enable_js_type_check = false;
- enable_mdns = false;
- enable_nacl_nonsfi = false;
- enable_one_click_signin = false;
- enable_reading_list = false;
- enable_remoting = false;
- enable_reporting = false;
- enable_service_discovery = false;
- exclude_unwind_tables = true;
- google_api_key = "";
- google_default_client_id = "";
- google_default_client_secret = "";
- safe_browsing_mode = 0;
- use_official_google_api_keys = false;
- use_unofficial_version_number = false;
- } // (extraAttrs.gnFlags or {}));
-
- configurePhase = ''
- runHook preConfigure
-
- # This is to ensure expansion of $out.
- libExecPath="${libExecPath}"
- python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
- ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
-
- # Fail if `gn gen` contains a WARNING.
- grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
-
- runHook postConfigure
- '';
-
- # Don't spam warnings about unknown warning options. This is useful because
- # our Clang is always older than Chromium's and the build logs have a size
- # of approx. 25 MB without this option (and this saves e.g. 66 %).
- NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
-
- buildPhase = let
- buildCommand = target: ''
- ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
- (
- source chrome/installer/linux/common/installer.include
- PACKAGE=$packageName
- MENUNAME="Chromium"
- process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
- )
- '';
- targets = extraAttrs.buildTargets or [];
- commands = map buildCommand targets;
- in concatStringsSep "\n" commands;
-
- postFixup = ''
- # Make sure that libGLESv2 is found by dlopen (if using EGL).
- chromiumBinary="$libExecPath/$packageName"
- origRpath="$(patchelf --print-rpath "$chromiumBinary")"
- patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
- '';
-
- passthru = {
- updateScript = ./update.py;
- chromiumDeps = {
- gn = gnChromium;
- };
- };
- };
-
-# Remove some extraAttrs we supplied to the base attributes already.
-in stdenv.mkDerivation (base // removeAttrs extraAttrs [
- "name" "gnFlags" "buildTargets"
-] // { passthru = base.passthru // (extraAttrs.passthru or {}); })
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
deleted file mode 100644
index b02c91c6e2..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
+++ /dev/null
@@ -1,218 +0,0 @@
-{ newScope, config, stdenv, fetchurl, makeWrapper
-, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
-, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
-, libva ? null
-, pipewire_0_2
-, gcc, nspr, nss, runCommand
-, lib
-
-# package customization
-# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
-, channel ? "stable"
-, gnomeSupport ? false, gnome ? null
-, gnomeKeyringSupport ? false
-, proprietaryCodecs ? true
-, enablePepperFlash ? false
-, enableWideVine ? false
-, enableVaapi ? false # Disabled by default due to unofficial support
-, ungoogled ? true
-, useOzone ? false
-, cupsSupport ? true
-, pulseSupport ? config.pulseaudio or stdenv.isLinux
-, commandLineArgs ? ""
-}:
-
-let
- llvmPackages = llvmPackages_11;
- stdenv = llvmPackages.stdenv;
-
- callPackage = newScope chromium;
-
- chromium = rec {
- inherit stdenv llvmPackages;
-
- upstream-info = (lib.importJSON ./upstream-info.json).${channel};
-
- mkChromiumDerivation = callPackage ./common.nix ({
- inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
- cupsSupport pulseSupport useOzone;
- inherit ungoogled;
- gnChromium = gn.overrideAttrs (oldAttrs: {
- inherit (upstream-info.deps.gn) version;
- src = fetchgit {
- inherit (upstream-info.deps.gn) url rev sha256;
- };
- });
- } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
- useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
- useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
- });
-
- browser = callPackage ./browser.nix { inherit channel enableWideVine; };
-
- plugins = callPackage ./plugins.nix {
- inherit enablePepperFlash;
- };
-
- ungoogled-chromium = callPackage ./ungoogled.nix {};
- };
-
- pkgSuffix = if channel == "dev" then "unstable" else channel;
- pkgName = "google-chrome-${pkgSuffix}";
- chromeSrc = fetchurl {
- urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
- "https://dl.google.com/linux/chrome/deb/pool/main/g"
- "http://95.31.35.30/chrome/pool/main/g"
- "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
- "http://repo.fdzh.org/chrome/deb/pool/main/g"
- ];
- sha256 = chromium.upstream-info.sha256bin64;
- };
-
- mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
- widevineCdm = stdenv.mkDerivation {
- name = "chrome-widevine-cdm";
-
- src = chromeSrc;
-
- phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
-
- unpackCmd = let
- widevineCdmPath =
- if channel == "stable" then
- "./opt/google/chrome/WidevineCdm"
- else if channel == "beta" then
- "./opt/google/chrome-beta/WidevineCdm"
- else if channel == "dev" then
- "./opt/google/chrome-unstable/WidevineCdm"
- else
- throw "Unknown chromium channel.";
- in ''
- # Extract just WidevineCdm from upstream's .deb file
- ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}"
-
- # Move things around so that we don't have to reference a particular
- # chrome-* directory later.
- mv "${widevineCdmPath}" ./
-
- # unpackCmd wants a single output directory; let it take WidevineCdm/
- rm -rf opt
- '';
-
- doCheck = true;
- checkPhase = ''
- ! find -iname '*.so' -exec ldd {} + | grep 'not found'
- '';
-
- PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
-
- patchPhase = ''
- patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so
- '';
-
- installPhase = ''
- mkdir -p $out/WidevineCdm
- cp -a * $out/WidevineCdm/
- '';
-
- meta = {
- platforms = [ "x86_64-linux" ];
- license = lib.licenses.unfree;
- };
- };
-
- suffix = if channel != "stable" then "-" + channel else "";
-
- sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
-
- version = chromium.browser.version;
-
- # We want users to be able to enableWideVine without rebuilding all of
- # chromium, so we have a separate derivation here that copies chromium
- # and adds the unfree WidevineCdm.
- chromiumWV = let browser = chromium.browser; in if enableWideVine then
- runCommand (browser.name + "-wv") { version = browser.version; }
- ''
- mkdir -p $out
- cp -a ${browser}/* $out/
- chmod u+w $out/libexec/chromium
- cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
- ''
- else browser;
-
-in stdenv.mkDerivation {
- name = "ungoogled-chromium${suffix}-${version}";
- inherit version;
-
- buildInputs = [
- makeWrapper ed
-
- # needed for GSETTINGS_SCHEMAS_PATH
- gsettings-desktop-schemas glib gtk3
-
- # needed for XDG_ICON_DIRS
- gnome3.adwaita-icon-theme
- ];
-
- outputs = ["out" "sandbox"];
-
- buildCommand = let
- browserBinary = "${chromiumWV}/libexec/chromium/chromium";
- getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
- libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ];
-
- in with stdenv.lib; ''
- mkdir -p "$out/bin"
-
- eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
- --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
- ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \
- ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
-
- ed -v -s "$out/bin/chromium" << EOF
- 2i
-
- if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ]
- then
- export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}"
- else
- export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
- fi
-
- '' + lib.optionalString (libPath != "") ''
- # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not
- # contain an empty section before or after a colon.
- export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}"
- '' + ''
-
- # libredirect causes chromium to deadlock on startup
- export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')"
-
- export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
-
- # Mainly for xdg-open but also other xdg-* tools:
- export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH"
-
- .
- w
- EOF
-
- ln -sv "${chromium.browser.sandbox}" "$sandbox"
-
- ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
-
- mkdir -p "$out/share"
- for f in '${chromium.browser}'/share/*; do # hello emacs */
- ln -s -t "$out/share/" "$f"
- done
- '';
-
- inherit (chromium.browser) packageName;
- meta = chromium.browser.meta;
- passthru = {
- inherit (chromium) upstream-info browser;
- mkDerivation = chromium.mkChromiumDerivation;
- inherit chromeSrc sandboxExecutableName;
- updateScript = ./update.py;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch
deleted file mode 100644
index 6b788f43d2..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200
-+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200
-@@ -94,6 +94,14 @@
- 'build_type', help='The type of build', choices=('official', 'default'))
- args = argument_parser.parse_args()
-
-+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
-+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
-+ if SOURCE_DATE_EPOCH is not None:
-+ print(SOURCE_DATE_EPOCH)
-+ return 0
-+ else:
-+ raise RuntimeError("SOURCE_DATE_EPOCH not set")
-+
- # The mtime of the revision in build/util/LASTCHANGE is stored in a file
- # next to it. Read it, to get a deterministic time close to "now".
- # That date is then modified as described at the top of the file so that
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch
deleted file mode 100644
index 32f0ae2fb5..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
-index ed0e2f5208b..5b431a030d5 100644
---- a/third_party/widevine/cdm/BUILD.gn
-+++ b/third_party/widevine/cdm/BUILD.gn
-@@ -14,7 +14,7 @@ buildflag_header("buildflags") {
-
- flags = [
- "ENABLE_WIDEVINE=$enable_widevine",
-- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
-+ "BUNDLE_WIDEVINE_CDM=true",
- "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
- ]
- }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
deleted file mode 100644
index 54e1284aa6..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ stdenv, gcc
-, jshon
-, glib
-, nspr
-, nss
-, fetchzip
-, enablePepperFlash ? false
-
-, upstream-info
-}:
-
-with stdenv.lib;
-
-let
- mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
-
- # Generate a shell fragment that emits flags appended to the
- # final makeWrapper call for wrapping the browser's main binary.
- #
- # Note that this is shell-escaped so that only the variable specified
- # by the "output" attribute is substituted.
- mkPluginInfo = { output ? "out", allowedVars ? [ output ]
- , flags ? [], envVars ? {}
- }: let
- shSearch = ["'"] ++ map (var: "@${var}@") allowedVars;
- shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
- # We need to triple-escape "val":
- # * First because makeWrapper doesn't do any quoting of its arguments by
- # itself.
- # * Second because it's passed to the makeWrapper call separated by IFS but
- # not by the _real_ arguments, for example the Widevine plugin flags
- # contain spaces, so they would end up as separate arguments.
- # * Third in order to be correctly quoted for the "echo" call below.
- shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
- mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
- mkFlag = flag: ["--add-flags" (shEsc flag)];
- mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
- envList = mapAttrsToList mkEnvVar envVars;
- quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
- in ''
- mkdir -p "''$${output}/nix-support"
- echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
- '';
-
- flash = stdenv.mkDerivation rec {
- pname = "flashplayer-ppapi";
- version = "32.0.0.453";
-
- src = fetchzip {
- url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1d0hxn6snvx15clhcwncw40z0mf5p1pw68wrp7w1l3jkkw4brsgj";
- stripRoot = false;
- };
-
- patchPhase = ''
- chmod +x libpepflashplayer.so
- patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so
- '';
-
- doCheck = true;
- checkPhase = ''
- ! find -iname '*.so' -exec ldd {} + | grep 'not found'
- '';
-
- installPhase = ''
- flashVersion="$(
- "${jshon}/bin/jshon" -F manifest.json -e version -u
- )"
-
- install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so"
-
- ${mkPluginInfo {
- allowedVars = [ "out" "flashVersion" ];
- flags = [
- "--ppapi-flash-path=@out@/lib/libpepflashplayer.so"
- "--ppapi-flash-version=@flashVersion@"
- ];
- }}
- '';
-
- dontStrip = true;
-
- meta = {
- license = stdenv.lib.licenses.unfree;
- maintainers = with stdenv.lib.maintainers; [ taku0 ];
- platforms = platforms.x86_64;
- };
- };
-
-in {
- enabled = optional enablePepperFlash flash;
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
deleted file mode 100644
index 73c9796aaa..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "86.0.4240.183" = {
- rev = "86.0.4240.183-1";
- sha256 = "0528l2wr5bpl1cwsxzl5zxz1gw91kffkh5j1kzmc5n7m4mscqxyc";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py
deleted file mode 100755
index b404ca555b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3 nix nix-prefetch-git
-
-import csv
-import json
-import re
-import subprocess
-import sys
-
-from codecs import iterdecode
-from collections import OrderedDict
-from datetime import datetime
-from os.path import abspath, dirname
-from urllib.request import urlopen
-
-HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux'
-DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
-BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
-
-JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
-
-def load_json(path):
- with open(path, 'r') as f:
- return json.load(f)
-
-def nix_prefetch_url(url, algo='sha256'):
- print(f'nix-prefetch-url {url}')
- out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
- return out.decode('utf-8').rstrip()
-
-def nix_prefetch_git(url, rev):
- print(f'nix-prefetch-git {url} {rev}')
- out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])
- return json.loads(out)
-
-def get_file_revision(revision, file_path):
- url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'
- with urlopen(url) as http_response:
- return http_response.read()
-
-def get_channel_dependencies(channel):
- deps = get_file_revision(channel['version'], 'DEPS')
- gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
- gn_commit = re.search(gn_pattern, deps).group(1).decode()
- gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)
- return {
- 'gn': {
- 'version': datetime.fromisoformat(gn['date']).date().isoformat(),
- 'url': gn['url'],
- 'rev': gn['rev'],
- 'sha256': gn['sha256']
- }
- }
-
-channels = {}
-last_channels = load_json(JSON_PATH)
-
-print(f'GET {HISTORY_URL}', file=sys.stderr)
-with urlopen(HISTORY_URL) as resp:
- builds = csv.DictReader(iterdecode(resp, 'utf-8'))
- for build in builds:
- channel_name = build['channel']
-
- # If we've already found a newer build for this channel, we're
- # no longer interested in it.
- if channel_name in channels:
- continue
-
- # If we're back at the last build we used, we don't need to
- # keep going -- there's no new version available, and we can
- # just reuse the info from last time.
- if build['version'] == last_channels[channel_name]['version']:
- channels[channel_name] = last_channels[channel_name]
- continue
-
- channel = {'version': build['version']}
- suffix = 'unstable' if channel_name == 'dev' else channel_name
-
- try:
- channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz')
- channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb')
- except subprocess.CalledProcessError:
- # This build isn't actually available yet. Continue to
- # the next one.
- continue
-
- channel['deps'] = get_channel_dependencies(channel)
-
- channels[channel_name] = channel
-
-with open(JSON_PATH, 'w') as out:
- def get_channel_key(item):
- channel_name = item[0]
- if channel_name == 'stable':
- return 0
- elif channel_name == 'beta':
- return 1
- elif channel_name == 'dev':
- return 2
- else:
- print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
- sys.exit(1)
- sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
- json.dump(sorted_channels, out, indent=2)
- out.write('\n')
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
deleted file mode 100644
index 565f884c51..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "stable": {
- "version": "86.0.4240.183",
- "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",
- "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",
- "deps": {
- "gn": {
- "version": "2020-08-07",
- "url": "https://gn.googlesource.com/gn",
- "rev": "e327ffdc503815916db2543ec000226a8df45163",
- "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"
- }
- }
- },
- "beta": {
- "version": "87.0.4280.40",
- "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",
- "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",
- "deps": {
- "gn": {
- "version": "2020-09-09",
- "url": "https://gn.googlesource.com/gn",
- "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
- "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
- }
- }
- },
- "dev": {
- "version": "88.0.4300.0",
- "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",
- "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",
- "deps": {
- "gn": {
- "version": "2020-09-09",
- "url": "https://gn.googlesource.com/gn",
- "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
- "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
- }
- }
- }
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix
new file mode 100644
index 0000000000..ab894e7b7f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix
@@ -0,0 +1,58 @@
+{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }:
+
+mkYarnPackage rec {
+ pname = "vieb";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jelmerro";
+ repo = pname;
+ rev = version;
+ sha256 = "10l36q75nmqv0azxhmwms6hjicbgyvpk8k6ljrh9d7zxryd3xwz0";
+ };
+
+ packageJSON = ./package.json;
+ yarnLock = ./yarn.lock;
+ yarnNix = ./yarn.nix;
+ yarnFlags = [ "--production" "--offline" ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ desktopItem = makeDesktopItem {
+ name = "vieb";
+ exec = "vieb %U";
+ icon = "vieb";
+ desktopName = "Web Browser";
+ genericName = "Web Browser";
+ categories = "Network;WebBrowser;";
+ mimeType = lib.concatStringsSep ";" [
+ "text/html"
+ "application/xhtml+xml"
+ "x-scheme-handler/http"
+ "x-scheme-handler/https"
+ ];
+ };
+
+ postInstall = ''
+ install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop
+
+ pushd $out/libexec/vieb/node_modules/vieb/app/img/icons
+ for file in *.png; do
+ install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png
+ done
+ popd
+
+ makeWrapper ${electron}/bin/electron $out/bin/vieb \
+ --add-flags $out/libexec/vieb/node_modules/vieb/app
+ '';
+
+ distPhase = ":"; # disable useless $out/tarballs directory
+
+ meta = with lib; {
+ homepage = "https://vieb.dev/";
+ description = "Vim Inspired Electron Browser";
+ maintainers = with maintainers; [ gebner ];
+ platforms = platforms.unix;
+ license = licenses.gpl3;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json
new file mode 100644
index 0000000000..a03478bcd8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json
@@ -0,0 +1,45 @@
+{
+ "name": "vieb",
+ "productName": "Vieb",
+ "version": "3.1.0",
+ "description": "Vim Inspired Electron Browser",
+ "main": "app/index.js",
+ "babel": {
+ "plugins": [
+ "@babel/plugin-proposal-optional-chaining"
+ ]
+ },
+ "scripts": {
+ "test": "jest -u && eslint .",
+ "start": "electron app",
+ "build": "node build.js",
+ "buildall": "node build.js --linux --win --mac",
+ "buildlinux": "node build.js --linux",
+ "buildwin": "node build.js --win",
+ "buildmac": "node build.js --mac"
+ },
+ "repository": "https://github.com/Jelmerro/Vieb",
+ "homepage": "https://vieb.dev",
+ "keywords": [
+ "Electron",
+ "Browser",
+ "Internet"
+ ],
+ "author": "Jelmer van Arnhem",
+ "email": "Jelmerro@users.noreply.github.com",
+ "license": "GPL-3.0+",
+ "devDependencies": {
+ "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+ "archiver": "^5.0.2",
+ "electron": "^11.0.3",
+ "electron-builder": "^22.9.1",
+ "eslint": "^7.15.0",
+ "jest": "^26.6.3"
+ },
+ "dependencies": {
+ "@cliqz/adblocker-electron": "^1.18.8",
+ "darkreader": "^4.9.26",
+ "is-svg": "^4.2.1",
+ "rimraf": "^3.0.2"
+ }
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock
new file mode 100644
index 0000000000..a9266f1051
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock
@@ -0,0 +1,5236 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"7zip-bin@~5.0.3":
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
+ integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+ integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+ dependencies:
+ "@babel/highlight" "^7.10.4"
+
+"@babel/core@^7.1.0", "@babel/core@^7.7.5":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+ integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
+ dependencies:
+ "@babel/code-frame" "^7.10.4"
+ "@babel/generator" "^7.12.10"
+ "@babel/helper-module-transforms" "^7.12.1"
+ "@babel/helpers" "^7.12.5"
+ "@babel/parser" "^7.12.10"
+ "@babel/template" "^7.12.7"
+ "@babel/traverse" "^7.12.10"
+ "@babel/types" "^7.12.10"
+ convert-source-map "^1.7.0"
+ debug "^4.1.0"
+ gensync "^1.0.0-beta.1"
+ json5 "^2.1.2"
+ lodash "^4.17.19"
+ semver "^5.4.1"
+ source-map "^0.5.0"
+
+"@babel/generator@^7.12.10":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460"
+ integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==
+ dependencies:
+ "@babel/types" "^7.12.10"
+ jsesc "^2.5.1"
+ source-map "^0.5.0"
+
+"@babel/helper-function-name@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+ integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+ dependencies:
+ "@babel/helper-get-function-arity" "^7.10.4"
+ "@babel/template" "^7.10.4"
+ "@babel/types" "^7.10.4"
+
+"@babel/helper-get-function-arity@^7.10.4":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+ integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
+ dependencies:
+ "@babel/types" "^7.12.10"
+
+"@babel/helper-member-expression-to-functions@^7.12.1":
+ version "7.12.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
+ integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
+ dependencies:
+ "@babel/types" "^7.12.7"
+
+"@babel/helper-module-imports@^7.12.1":
+ version "7.12.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+ integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+ dependencies:
+ "@babel/types" "^7.12.5"
+
+"@babel/helper-module-transforms@^7.12.1":
+ version "7.12.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+ integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
+ dependencies:
+ "@babel/helper-module-imports" "^7.12.1"
+ "@babel/helper-replace-supers" "^7.12.1"
+ "@babel/helper-simple-access" "^7.12.1"
+ "@babel/helper-split-export-declaration" "^7.11.0"
+ "@babel/helper-validator-identifier" "^7.10.4"
+ "@babel/template" "^7.10.4"
+ "@babel/traverse" "^7.12.1"
+ "@babel/types" "^7.12.1"
+ lodash "^4.17.19"
+
+"@babel/helper-optimise-call-expression@^7.10.4":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+ integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
+ dependencies:
+ "@babel/types" "^7.12.10"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+ integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
+"@babel/helper-replace-supers@^7.12.1":
+ version "7.12.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
+ integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.12.1"
+ "@babel/helper-optimise-call-expression" "^7.10.4"
+ "@babel/traverse" "^7.12.5"
+ "@babel/types" "^7.12.5"
+
+"@babel/helper-simple-access@^7.12.1":
+ version "7.12.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+ integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
+ dependencies:
+ "@babel/types" "^7.12.1"
+
+"@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.11.0":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+ integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+ dependencies:
+ "@babel/types" "^7.11.0"
+
+"@babel/helper-validator-identifier@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+ integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
+"@babel/helpers@^7.12.5":
+ version "7.12.5"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+ integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
+ dependencies:
+ "@babel/template" "^7.10.4"
+ "@babel/traverse" "^7.12.5"
+ "@babel/types" "^7.12.5"
+
+"@babel/highlight@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+ integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.10.4"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
+ integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
+
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+ version "7.12.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+ integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+ "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
+"@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-bigint@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+ integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
+ version "7.12.1"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+ integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-import-meta@^7.8.3":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+ integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+
+"@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-logical-assignment-operators@^7.8.3":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+ integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+ 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.8.3":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+ integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+ 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.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-top-level-await@^7.8.3":
+ version "7.12.1"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+ integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
+ version "7.12.7"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+ integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
+ dependencies:
+ "@babel/code-frame" "^7.10.4"
+ "@babel/parser" "^7.12.7"
+ "@babel/types" "^7.12.7"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+ integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
+ dependencies:
+ "@babel/code-frame" "^7.10.4"
+ "@babel/generator" "^7.12.10"
+ "@babel/helper-function-name" "^7.10.4"
+ "@babel/helper-split-export-declaration" "^7.11.0"
+ "@babel/parser" "^7.12.10"
+ "@babel/types" "^7.12.10"
+ debug "^4.1.0"
+ globals "^11.1.0"
+ lodash "^4.17.19"
+
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+ version "7.12.10"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+ integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.10.4"
+ lodash "^4.17.19"
+ to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
+"@cliqz/adblocker-content@^1.18.8":
+ version "1.18.8"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz#96473f14c098a20091298d34a6addcd430aceebd"
+ integrity sha512-YZ1xYBVG3LmxsdTYvTs/Bc7pzCw/Dy4HFo6N+oIuGP+Le/0aGSkACUl3ue5I2+Cx0WmL0Z8I4QonTKDc06HR+A==
+
+"@cliqz/adblocker-electron-preload@^1.18.8":
+ version "1.18.8"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz#c2058647e015b6f61c222e7d58040347324c63b0"
+ integrity sha512-/FAzyhNUj+8fwqSGth7ndaC+8huEANvVquYkDVmjM38uryxFgcJJI6Bij1l1zABIbskAaSN4G4RI3oERyd9/KQ==
+ dependencies:
+ "@cliqz/adblocker-content" "^1.18.8"
+
+"@cliqz/adblocker-electron@^1.18.8":
+ version "1.18.8"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz#5f697c5dc65cd936b3908078a6e4516ec995567a"
+ integrity sha512-CrsFjSwenWQogsAg4sHFaXZbu7hzs9dMdsZM5wxb+5QfZ3MSH3PBYAeAUnsmP3UOTZ423+6ErOUE1vzj3UrK9w==
+ dependencies:
+ "@cliqz/adblocker" "^1.18.8"
+ "@cliqz/adblocker-electron-preload" "^1.18.8"
+ tldts-experimental "^5.6.21"
+
+"@cliqz/adblocker@^1.18.8":
+ version "1.18.8"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz#f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9"
+ integrity sha512-19m0GhlOcdSvQ/BqVuaMgbYkgQ4ys8koBRW4K7Ua4V5fFWL0t8ckdcZ/gBOqwECS2m8agXSpEbbyJjNmHBHpMQ==
+ dependencies:
+ "@remusao/guess-url-type" "^1.1.2"
+ "@remusao/small" "^1.1.2"
+ "@remusao/smaz" "^1.7.1"
+ "@types/chrome" "^0.0.126"
+ "@types/firefox-webext-browser" "^82.0.0"
+ tldts-experimental "^5.6.21"
+
+"@cnakazawa/watch@^1.0.3":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+ integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+ dependencies:
+ exec-sh "^0.3.2"
+ minimist "^1.2.0"
+
+"@develar/schema-utils@~2.6.5":
+ version "2.6.5"
+ resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
+ integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==
+ dependencies:
+ ajv "^6.12.0"
+ ajv-keywords "^3.4.1"
+
+"@electron/get@^1.0.1":
+ version "1.12.2"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
+ integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+ dependencies:
+ debug "^4.1.1"
+ env-paths "^2.2.0"
+ fs-extra "^8.1.0"
+ got "^9.6.0"
+ progress "^2.0.3"
+ sanitize-filename "^1.6.2"
+ sumchecker "^3.0.1"
+ optionalDependencies:
+ global-agent "^2.0.2"
+ global-tunnel-ng "^2.7.1"
+
+"@eslint/eslintrc@^0.2.2":
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+ integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
+ 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"
+ lodash "^4.17.19"
+ minimatch "^3.0.4"
+ strip-json-comments "^3.1.1"
+
+"@istanbuljs/load-nyc-config@^1.0.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+ integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
+ dependencies:
+ camelcase "^5.3.1"
+ find-up "^4.1.0"
+ get-package-type "^0.1.0"
+ js-yaml "^3.13.1"
+ resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+ integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
+"@jest/console@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+ integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ chalk "^4.0.0"
+ jest-message-util "^26.6.2"
+ jest-util "^26.6.2"
+ slash "^3.0.0"
+
+"@jest/core@^26.6.3":
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+ integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+ dependencies:
+ "@jest/console" "^26.6.2"
+ "@jest/reporters" "^26.6.2"
+ "@jest/test-result" "^26.6.2"
+ "@jest/transform" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ ansi-escapes "^4.2.1"
+ chalk "^4.0.0"
+ exit "^0.1.2"
+ graceful-fs "^4.2.4"
+ jest-changed-files "^26.6.2"
+ jest-config "^26.6.3"
+ jest-haste-map "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-regex-util "^26.0.0"
+ jest-resolve "^26.6.2"
+ jest-resolve-dependencies "^26.6.3"
+ jest-runner "^26.6.3"
+ jest-runtime "^26.6.3"
+ jest-snapshot "^26.6.2"
+ jest-util "^26.6.2"
+ jest-validate "^26.6.2"
+ jest-watcher "^26.6.2"
+ micromatch "^4.0.2"
+ p-each-series "^2.1.0"
+ rimraf "^3.0.0"
+ slash "^3.0.0"
+ strip-ansi "^6.0.0"
+
+"@jest/environment@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+ integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+ dependencies:
+ "@jest/fake-timers" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ jest-mock "^26.6.2"
+
+"@jest/fake-timers@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+ integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ "@sinonjs/fake-timers" "^6.0.1"
+ "@types/node" "*"
+ jest-message-util "^26.6.2"
+ jest-mock "^26.6.2"
+ jest-util "^26.6.2"
+
+"@jest/globals@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+ integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+ dependencies:
+ "@jest/environment" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ expect "^26.6.2"
+
+"@jest/reporters@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+ integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+ dependencies:
+ "@bcoe/v8-coverage" "^0.2.3"
+ "@jest/console" "^26.6.2"
+ "@jest/test-result" "^26.6.2"
+ "@jest/transform" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ chalk "^4.0.0"
+ collect-v8-coverage "^1.0.0"
+ exit "^0.1.2"
+ glob "^7.1.2"
+ graceful-fs "^4.2.4"
+ istanbul-lib-coverage "^3.0.0"
+ istanbul-lib-instrument "^4.0.3"
+ istanbul-lib-report "^3.0.0"
+ istanbul-lib-source-maps "^4.0.0"
+ istanbul-reports "^3.0.2"
+ jest-haste-map "^26.6.2"
+ jest-resolve "^26.6.2"
+ jest-util "^26.6.2"
+ jest-worker "^26.6.2"
+ slash "^3.0.0"
+ source-map "^0.6.0"
+ string-length "^4.0.1"
+ terminal-link "^2.0.0"
+ v8-to-istanbul "^7.0.0"
+ optionalDependencies:
+ node-notifier "^8.0.0"
+
+"@jest/source-map@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+ integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
+ dependencies:
+ callsites "^3.0.0"
+ graceful-fs "^4.2.4"
+ source-map "^0.6.0"
+
+"@jest/test-result@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+ integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
+ dependencies:
+ "@jest/console" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/istanbul-lib-coverage" "^2.0.0"
+ collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^26.6.3":
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+ integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
+ dependencies:
+ "@jest/test-result" "^26.6.2"
+ graceful-fs "^4.2.4"
+ jest-haste-map "^26.6.2"
+ jest-runner "^26.6.3"
+ jest-runtime "^26.6.3"
+
+"@jest/transform@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+ integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
+ dependencies:
+ "@babel/core" "^7.1.0"
+ "@jest/types" "^26.6.2"
+ babel-plugin-istanbul "^6.0.0"
+ chalk "^4.0.0"
+ convert-source-map "^1.4.0"
+ fast-json-stable-stringify "^2.0.0"
+ graceful-fs "^4.2.4"
+ jest-haste-map "^26.6.2"
+ jest-regex-util "^26.0.0"
+ jest-util "^26.6.2"
+ micromatch "^4.0.2"
+ pirates "^4.0.1"
+ slash "^3.0.0"
+ source-map "^0.6.1"
+ write-file-atomic "^3.0.0"
+
+"@jest/types@^26.6.2":
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+ integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+ dependencies:
+ "@types/istanbul-lib-coverage" "^2.0.0"
+ "@types/istanbul-reports" "^3.0.0"
+ "@types/node" "*"
+ "@types/yargs" "^15.0.0"
+ chalk "^4.0.0"
+
+"@remusao/guess-url-type@^1.1.2":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz#fb1402b4c47266161501704d74427b8d49e4b3e4"
+ integrity sha512-alnTonifD/Ii/0pI9EA5nVgdk/eOihU4OOYMIXq4U4cS0NocnaYCozqV4OVkmArPPnz9s4ap4GM1ODftBpBW0w==
+
+"@remusao/small@^1.1.2":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz#1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9"
+ integrity sha512-18Bwa/EjqQ5WfdERqmG3YgOohO7J2sS8+v31JgmYnEg3wAtcAOPVBRkD24IzVS0eJOQk1P2Yd++aP0ldirk7MQ==
+
+"@remusao/smaz-compress@^1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz#ec79c87f5780865da616cd214b3b8978807d1e9a"
+ integrity sha512-PAze3aYCcUfX+a6E6sVMoxVtUkeQgX+oiY6DqbiRkNtUqzjtcl9JVyEAWGbBEgOuv2jdEATAlyIf0W18NKDEnw==
+ dependencies:
+ "@remusao/trie" "^1.4.0"
+
+"@remusao/smaz-decompress@^1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz#9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf"
+ integrity sha512-7uXEX8cSMWy+ai7j8sJpVQuY+CHj2e5D+PjxY//4wbAJlw1a/X+CYPt7BuxLBzpVoioB5Y7++1USjCkrw0pl8g==
+
+"@remusao/smaz@^1.7.1":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz#d02c2fb007483d4b4d050fb2fdaf523fcef08d40"
+ integrity sha512-HMMPam5jLhP0ymtMUQ8sm2p9zwDJwHD09krORXN/l/TR+NlSCdU2gSAoVNr9idD9OmMGfeXPFQYCofEUZfjbTQ==
+ dependencies:
+ "@remusao/smaz-compress" "^1.9.0"
+ "@remusao/smaz-decompress" "^1.9.0"
+
+"@remusao/trie@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz#b439210445339f0ca95ff200d98b898d431a4ce1"
+ integrity sha512-mIr0m4/xj6qxHtJjAFb4I8tXXmjTniUYTB2Hv+xK5hXf/YWocEPlJ+V31bv5HJwo6ly64DUnZDBeBxolT3WE7w==
+
+"@sindresorhus/is@^0.14.0":
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@sinonjs/commons@^1.7.0":
+ version "1.8.1"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
+ integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==
+ dependencies:
+ type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+ integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+ dependencies:
+ "@sinonjs/commons" "^1.7.0"
+
+"@szmarczak/http-timer@^1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+ integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+ dependencies:
+ defer-to-connect "^1.0.1"
+
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+ version "7.1.12"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
+ integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
+ dependencies:
+ "@babel/parser" "^7.1.0"
+ "@babel/types" "^7.0.0"
+ "@types/babel__generator" "*"
+ "@types/babel__template" "*"
+ "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+ version "7.6.2"
+ resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
+ integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+ dependencies:
+ "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
+ integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+ dependencies:
+ "@babel/parser" "^7.1.0"
+ "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+ integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
+ dependencies:
+ "@babel/types" "^7.3.0"
+
+"@types/chrome@^0.0.126":
+ version "0.0.126"
+ resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz#f9f3436712f0c7c12ea9798abc9b95575ad7b23a"
+ integrity sha512-191z7uoyfbGU+z7/m45j9XbWugWqVHVPMM4hJV5cZ+3YzGCT9wFjMUHO3Wr3Xvo8aVodvRNu28u7lvEaAnfbzg==
+ dependencies:
+ "@types/filesystem" "*"
+ "@types/har-format" "*"
+
+"@types/debug@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
+ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+
+"@types/filesystem@*":
+ version "0.0.29"
+ resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
+ integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==
+ dependencies:
+ "@types/filewriter" "*"
+
+"@types/filewriter@*":
+ version "0.0.28"
+ resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
+ integrity sha1-wFTor02d11205jq8dviFFocU1LM=
+
+"@types/firefox-webext-browser@^82.0.0":
+ version "82.0.0"
+ resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958"
+ integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA==
+
+"@types/fs-extra@^9.0.1":
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz#2afb76a43a4bef80a363b94b314d0ca1694fc4f8"
+ integrity sha512-wr3t7wIW1c0A2BIJtdVp4EflriVaVVAsCAIHVzzh8B+GiFv9X1xeJjCs4upRXtzp7kQ6lP5xvskjoD4awJ1ZeA==
+ dependencies:
+ "@types/node" "*"
+
+"@types/graceful-fs@^4.1.2":
+ version "4.1.4"
+ resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
+ integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==
+ dependencies:
+ "@types/node" "*"
+
+"@types/har-format@*":
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz#4f6648814d0fdcb6a510e3364a9db439a753c4b1"
+ integrity sha512-IG8AE1m2pWtPqQ7wXhFhy6Q59bwwnLwO36v5Rit2FrbXCIp8Sk8E2PfUCreyrdo17STwFSKDAkitVuVYbpEHvQ==
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+ integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
+"@types/istanbul-lib-report@*":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+ integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+ dependencies:
+ "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+ integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+ dependencies:
+ "@types/istanbul-lib-report" "*"
+
+"@types/node@*":
+ version "14.14.13"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz#9e425079799322113ae8477297ae6ef51b8e0cdf"
+ integrity sha512-vbxr0VZ8exFMMAjCW8rJwaya0dMCDyYW2ZRdTyjtrCvJoENMpdUHOT/eTzvgyA5ZnqRZ/sI0NwqAxNHKYokLJQ==
+
+"@types/node@^12.0.12":
+ version "12.19.9"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+ integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
+
+"@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/prettier@^2.0.0":
+ version "2.1.5"
+ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00"
+ integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==
+
+"@types/stack-utils@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+ integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+
+"@types/yargs-parser@*":
+ version "15.0.0"
+ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+ integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+
+"@types/yargs@^15.0.0", "@types/yargs@^15.0.5":
+ version "15.0.11"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c"
+ integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==
+ dependencies:
+ "@types/yargs-parser" "*"
+
+abab@^2.0.3:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+ integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
+acorn-globals@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+ integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+ dependencies:
+ acorn "^7.1.1"
+ acorn-walk "^7.1.1"
+
+acorn-jsx@^5.3.1:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+ integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
+acorn-walk@^7.1.1:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+ integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn@^7.1.1, acorn@^7.4.0:
+ version "7.4.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+ integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+ajv-keywords@^3.4.1:
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+ integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4:
+ version "6.12.6"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+ integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
+ansi-align@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+ integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
+ dependencies:
+ string-width "^3.0.0"
+
+ansi-colors@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+ integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-escapes@^4.2.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+ integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+ dependencies:
+ type-fest "^0.11.0"
+
+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.0.3:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+ integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+ dependencies:
+ normalize-path "^3.0.0"
+ picomatch "^2.0.4"
+
+app-builder-bin@3.5.10:
+ version "3.5.10"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"
+ integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==
+
+app-builder-lib@22.9.1:
+ version "22.9.1"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c"
+ integrity sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A==
+ dependencies:
+ "7zip-bin" "~5.0.3"
+ "@develar/schema-utils" "~2.6.5"
+ async-exit-hook "^2.0.1"
+ bluebird-lst "^1.0.9"
+ builder-util "22.9.1"
+ builder-util-runtime "8.7.2"
+ chromium-pickle-js "^0.2.0"
+ debug "^4.3.0"
+ ejs "^3.1.5"
+ electron-publish "22.9.1"
+ fs-extra "^9.0.1"
+ hosted-git-info "^3.0.5"
+ is-ci "^2.0.0"
+ isbinaryfile "^4.0.6"
+ js-yaml "^3.14.0"
+ lazy-val "^1.0.4"
+ minimatch "^3.0.4"
+ normalize-package-data "^2.5.0"
+ read-config-file "6.0.0"
+ sanitize-filename "^1.6.3"
+ semver "^7.3.2"
+ temp-file "^3.3.7"
+
+archiver-utils@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+ integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+ dependencies:
+ glob "^7.1.4"
+ graceful-fs "^4.2.0"
+ lazystream "^1.0.0"
+ lodash.defaults "^4.2.0"
+ lodash.difference "^4.5.0"
+ lodash.flatten "^4.4.0"
+ lodash.isplainobject "^4.0.6"
+ lodash.union "^4.6.0"
+ normalize-path "^3.0.0"
+ readable-stream "^2.0.0"
+
+archiver@^5.0.2:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37"
+ integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA==
+ dependencies:
+ archiver-utils "^2.1.0"
+ async "^3.2.0"
+ buffer-crc32 "^0.2.1"
+ readable-stream "^3.6.0"
+ readdir-glob "^1.0.0"
+ tar-stream "^2.1.4"
+ zip-stream "^4.0.4"
+
+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"
+
+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-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=
+
+asn1@~0.2.3:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+ integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+ dependencies:
+ safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+ integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assign-symbols@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+ integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+astral-regex@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+ integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
+async-exit-hook@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
+ integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==
+
+async@0.9.x:
+ version "0.9.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+ integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
+async@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+ integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+at-least-node@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+ integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
+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==
+
+aws-sign2@~0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+ integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+ integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+babel-jest@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+ integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
+ dependencies:
+ "@jest/transform" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/babel__core" "^7.1.7"
+ babel-plugin-istanbul "^6.0.0"
+ babel-preset-jest "^26.6.2"
+ chalk "^4.0.0"
+ graceful-fs "^4.2.4"
+ slash "^3.0.0"
+
+babel-plugin-istanbul@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+ integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@istanbuljs/load-nyc-config" "^1.0.0"
+ "@istanbuljs/schema" "^0.1.2"
+ istanbul-lib-instrument "^4.0.0"
+ test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+ integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
+ dependencies:
+ "@babel/template" "^7.3.3"
+ "@babel/types" "^7.3.3"
+ "@types/babel__core" "^7.0.0"
+ "@types/babel__traverse" "^7.0.6"
+
+babel-preset-current-node-syntax@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77"
+ integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==
+ dependencies:
+ "@babel/plugin-syntax-async-generators" "^7.8.4"
+ "@babel/plugin-syntax-bigint" "^7.8.3"
+ "@babel/plugin-syntax-class-properties" "^7.8.3"
+ "@babel/plugin-syntax-import-meta" "^7.8.3"
+ "@babel/plugin-syntax-json-strings" "^7.8.3"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+ "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+ "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+ "@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-top-level-await" "^7.8.3"
+
+babel-preset-jest@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+ integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
+ dependencies:
+ babel-plugin-jest-hoist "^26.6.2"
+ babel-preset-current-node-syntax "^1.0.0"
+
+balanced-match@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+ integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-js@^1.3.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+ integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+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"
+
+bcrypt-pbkdf@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+ integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+ dependencies:
+ tweetnacl "^0.14.3"
+
+bl@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+ integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+ dependencies:
+ buffer "^5.5.0"
+ inherits "^2.0.4"
+ readable-stream "^3.4.0"
+
+bluebird-lst@^1.0.9:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
+ integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==
+ dependencies:
+ bluebird "^3.5.5"
+
+bluebird@^3.5.5:
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+ integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+boolean@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
+ integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
+
+boxen@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
+ integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
+ dependencies:
+ ansi-align "^3.0.0"
+ camelcase "^5.3.1"
+ chalk "^3.0.0"
+ cli-boxes "^2.2.0"
+ string-width "^4.1.0"
+ term-size "^2.1.0"
+ type-fest "^0.8.1"
+ widest-line "^3.1.0"
+
+brace-expansion@^1.1.7:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+ dependencies:
+ balanced-match "^1.0.0"
+ concat-map "0.0.1"
+
+braces@^2.3.1:
+ 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:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+ dependencies:
+ fill-range "^7.0.1"
+
+browser-process-hrtime@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+ integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+bser@2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+ integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+ dependencies:
+ node-int64 "^0.4.0"
+
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
+ version "0.2.13"
+ resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+ integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
+buffer-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@^5.5.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+ integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+ dependencies:
+ base64-js "^1.3.1"
+ ieee754 "^1.1.13"
+
+builder-util-runtime@8.7.2:
+ version "8.7.2"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
+ integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
+ dependencies:
+ debug "^4.1.1"
+ sax "^1.2.4"
+
+builder-util@22.9.1:
+ version "22.9.1"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af"
+ integrity sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw==
+ dependencies:
+ "7zip-bin" "~5.0.3"
+ "@types/debug" "^4.1.5"
+ "@types/fs-extra" "^9.0.1"
+ app-builder-bin "3.5.10"
+ bluebird-lst "^1.0.9"
+ builder-util-runtime "8.7.2"
+ chalk "^4.1.0"
+ debug "^4.3.0"
+ fs-extra "^9.0.1"
+ is-ci "^2.0.0"
+ js-yaml "^3.14.0"
+ source-map-support "^0.5.19"
+ stat-mode "^1.0.0"
+ temp-file "^3.3.7"
+
+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"
+
+cacheable-request@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+ integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+ dependencies:
+ clone-response "^1.0.2"
+ get-stream "^5.1.0"
+ http-cache-semantics "^4.0.0"
+ keyv "^3.0.0"
+ lowercase-keys "^2.0.0"
+ normalize-url "^4.1.0"
+ responselike "^1.0.2"
+
+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@^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==
+
+camelcase@^6.0.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+ integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+
+capture-exit@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+ integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+ dependencies:
+ rsvp "^4.8.4"
+
+caseless@~0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+ integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^2.0.0, chalk@^2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+ dependencies:
+ ansi-styles "^3.2.1"
+ escape-string-regexp "^1.0.5"
+ supports-color "^5.3.0"
+
+chalk@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+ integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
+chalk@^4.0.0, chalk@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+ integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+ integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
+chromium-pickle-js@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
+ integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
+
+ci-info@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+ integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cjs-module-lexer@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+ integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
+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"
+
+cli-boxes@^2.2.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+ integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
+
+cliui@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+ integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.0"
+ wrap-ansi "^6.2.0"
+
+cliui@^7.0.2:
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+ integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.0"
+ wrap-ansi "^7.0.0"
+
+clone-response@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+ integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+ dependencies:
+ mimic-response "^1.0.0"
+
+co@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+ integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+collect-v8-coverage@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+ integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+
+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:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+ dependencies:
+ color-name "1.1.3"
+
+color-convert@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+ integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+ dependencies:
+ color-name "~1.1.4"
+
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+ integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+ dependencies:
+ delayed-stream "~1.0.0"
+
+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==
+
+compress-commons@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7"
+ integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==
+ dependencies:
+ buffer-crc32 "^0.2.13"
+ crc32-stream "^4.0.1"
+ normalize-path "^3.0.0"
+ readable-stream "^3.6.0"
+
+concat-map@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.6.2:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+ integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+ dependencies:
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^2.2.2"
+ typedarray "^0.0.6"
+
+config-chain@^1.1.11:
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+ integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+ dependencies:
+ ini "^1.3.4"
+ proto-list "~1.2.1"
+
+configstore@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+ integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+ dependencies:
+ dot-prop "^5.2.0"
+ graceful-fs "^4.1.2"
+ make-dir "^3.0.0"
+ unique-string "^2.0.0"
+ write-file-atomic "^3.0.0"
+ xdg-basedir "^4.0.0"
+
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, 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-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=
+
+core-js@^3.6.5:
+ version "3.8.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
+ integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
+
+core-util-is@1.0.2, 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=
+
+crc-32@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+ integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+ dependencies:
+ exit-on-epipe "~1.0.1"
+ printj "~1.1.0"
+
+crc32-stream@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067"
+ integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw==
+ dependencies:
+ crc-32 "^1.2.0"
+ readable-stream "^3.4.0"
+
+cross-spawn@^6.0.0:
+ 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.0, 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-random-string@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+ integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+cssom@^0.4.4:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+ integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
+ version "0.3.8"
+ resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+ integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+ integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+ dependencies:
+ cssom "~0.3.6"
+
+darkreader@^4.9.26:
+ version "4.9.26"
+ resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz#ad92139742f22fc406ae14d12ec6e5672a7eedde"
+ integrity sha512-8Mixd/u3VTXEjld7dl+Rtz6NvHkCDpp9JweZemLsxtS9o00YxRDLTH+lkJTGg2jD+qOQblh7ahyLvEby5JBNDw==
+
+dashdash@^1.12.0:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+ dependencies:
+ assert-plus "^1.0.0"
+
+data-urls@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+ integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+ dependencies:
+ abab "^2.0.3"
+ whatwg-mimetype "^2.3.0"
+ whatwg-url "^8.0.0"
+
+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@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0:
+ 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@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+ integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decimal.js@^10.2.0:
+ version "10.2.1"
+ resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+ integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+
+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=
+
+decompress-response@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+ integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+ dependencies:
+ mimic-response "^1.0.0"
+
+deep-extend@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+ integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+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=
+
+deepmerge@^4.2.2:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+ integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+defer-to-connect@^1.0.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+ integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
+define-properties@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+ integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+ dependencies:
+ object-keys "^1.0.12"
+
+define-property@^0.2.5:
+ version "0.2.5"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+ integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+ dependencies:
+ is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+ integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+ dependencies:
+ is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+ integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+ dependencies:
+ is-descriptor "^1.0.2"
+ isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+detect-newline@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+ integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+detect-node@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+ integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+
+diff-sequences@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+ integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+
+dmg-builder@22.9.1:
+ version "22.9.1"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f"
+ integrity sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ==
+ dependencies:
+ app-builder-lib "22.9.1"
+ builder-util "22.9.1"
+ fs-extra "^9.0.1"
+ iconv-lite "^0.6.2"
+ js-yaml "^3.14.0"
+ sanitize-filename "^1.6.3"
+
+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"
+
+domexception@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+ integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+ dependencies:
+ webidl-conversions "^5.0.0"
+
+dot-prop@^5.2.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+ integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+ dependencies:
+ is-obj "^2.0.0"
+
+dotenv-expand@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
+ integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
+
+dotenv@^8.2.0:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
+ integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
+
+duplexer3@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+ integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+ecc-jsbn@~0.1.1:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+ integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+ dependencies:
+ jsbn "~0.1.0"
+ safer-buffer "^2.1.0"
+
+ejs@^3.1.5:
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
+ integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==
+ dependencies:
+ jake "^10.6.1"
+
+electron-builder@^22.9.1:
+ version "22.9.1"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60"
+ integrity sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA==
+ dependencies:
+ "@types/yargs" "^15.0.5"
+ app-builder-lib "22.9.1"
+ bluebird-lst "^1.0.9"
+ builder-util "22.9.1"
+ builder-util-runtime "8.7.2"
+ chalk "^4.1.0"
+ dmg-builder "22.9.1"
+ fs-extra "^9.0.1"
+ is-ci "^2.0.0"
+ lazy-val "^1.0.4"
+ read-config-file "6.0.0"
+ sanitize-filename "^1.6.3"
+ update-notifier "^4.1.1"
+ yargs "^16.0.3"
+
+electron-publish@22.9.1:
+ version "22.9.1"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e"
+ integrity sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w==
+ dependencies:
+ "@types/fs-extra" "^9.0.1"
+ bluebird-lst "^1.0.9"
+ builder-util "22.9.1"
+ builder-util-runtime "8.7.2"
+ chalk "^4.1.0"
+ fs-extra "^9.0.1"
+ lazy-val "^1.0.4"
+ mime "^2.4.6"
+
+electron@^11.0.3:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz#8dfdf579d1eb79feef3e3d2937fc022e72129c90"
+ integrity sha512-RFAhR/852VMaRd9NSe7jprwSoG9dLc6u1GwnqRWg+/3cy/8Zrwt1Betw1lXiZH7hGuB9K2cqju83Xv5Pq5ZSGA==
+ dependencies:
+ "@electron/get" "^1.0.1"
+ "@types/node" "^12.0.12"
+ extract-zip "^1.0.3"
+
+emittery@^0.7.1:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
+ integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
+
+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==
+
+encodeurl@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+ integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+ dependencies:
+ once "^1.4.0"
+
+enquirer@^2.3.5:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+ integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+ dependencies:
+ ansi-colors "^4.1.1"
+
+env-paths@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+ integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
+error-ex@^1.3.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+ integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+ dependencies:
+ is-arrayish "^0.2.1"
+
+es6-error@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+ integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
+escalade@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+ integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-goat@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
+ integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
+
+escape-string-regexp@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escape-string-regexp@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+ integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+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.14.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"
+
+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.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+ integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^7.15.0:
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
+ integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@eslint/eslintrc" "^0.2.2"
+ ajv "^6.10.0"
+ chalk "^4.0.0"
+ cross-spawn "^7.0.2"
+ debug "^4.0.1"
+ doctrine "^3.0.0"
+ enquirer "^2.3.5"
+ eslint-scope "^5.1.1"
+ eslint-utils "^2.1.0"
+ eslint-visitor-keys "^2.0.0"
+ espree "^7.3.1"
+ esquery "^1.2.0"
+ esutils "^2.0.2"
+ file-entry-cache "^6.0.0"
+ functional-red-black-tree "^1.0.1"
+ glob-parent "^5.0.0"
+ globals "^12.1.0"
+ ignore "^4.0.6"
+ import-fresh "^3.0.0"
+ imurmurhash "^0.1.4"
+ is-glob "^4.0.0"
+ js-yaml "^3.13.1"
+ json-stable-stringify-without-jsonify "^1.0.1"
+ levn "^0.4.1"
+ lodash "^4.17.19"
+ 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 "^5.2.3"
+ text-table "^0.2.0"
+ v8-compile-cache "^2.0.3"
+
+espree@^7.3.0, espree@^7.3.1:
+ version "7.3.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+ integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+ dependencies:
+ acorn "^7.4.0"
+ acorn-jsx "^5.3.1"
+ eslint-visitor-keys "^1.3.0"
+
+esprima@^4.0.0, esprima@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+ integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.2.0:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+ integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+ dependencies:
+ estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+ integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+ dependencies:
+ estraverse "^5.2.0"
+
+estraverse@^4.1.1, 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==
+
+exec-sh@^0.3.2:
+ version "0.3.4"
+ resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+ integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
+execa@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+ integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+ dependencies:
+ cross-spawn "^6.0.0"
+ get-stream "^4.0.0"
+ is-stream "^1.1.0"
+ npm-run-path "^2.0.0"
+ p-finally "^1.0.0"
+ signal-exit "^3.0.0"
+ strip-eof "^1.0.0"
+
+execa@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+ integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+ dependencies:
+ cross-spawn "^7.0.0"
+ get-stream "^5.0.0"
+ human-signals "^1.1.1"
+ is-stream "^2.0.0"
+ merge-stream "^2.0.0"
+ npm-run-path "^4.0.0"
+ onetime "^5.1.0"
+ signal-exit "^3.0.2"
+ strip-final-newline "^2.0.0"
+
+exit-on-epipe@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+ integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
+exit@^0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+ integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+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"
+
+expect@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+ integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ ansi-styles "^4.0.0"
+ jest-get-type "^26.3.0"
+ jest-matcher-utils "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-regex-util "^26.0.0"
+
+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.2:
+ 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"
+
+extract-zip@^1.0.3:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+ integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+ dependencies:
+ concat-stream "^1.6.2"
+ debug "^2.6.9"
+ mkdirp "^0.5.4"
+ yauzl "^2.10.0"
+
+extsprintf@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+ integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+ integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+ integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+ integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+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=
+
+fb-watchman@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+ integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+ dependencies:
+ bser "2.1.1"
+
+fd-slicer@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+ integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+ dependencies:
+ pend "~1.2.0"
+
+file-entry-cache@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+ integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
+ dependencies:
+ flat-cache "^3.0.4"
+
+filelist@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
+ integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==
+ dependencies:
+ minimatch "^3.0.4"
+
+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-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"
+
+flat-cache@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+ integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+ dependencies:
+ flatted "^3.1.0"
+ rimraf "^3.0.2"
+
+flatted@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
+ integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
+
+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=
+
+forever-agent@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+ integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+ integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
+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"
+
+fs-constants@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+ dependencies:
+ graceful-fs "^4.2.0"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
+
+fs-extra@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+ integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+ dependencies:
+ at-least-node "^1.0.0"
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^1.0.0"
+
+fs.realpath@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^2.1.2:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d"
+ integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==
+
+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.1:
+ 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, get-caller-file@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-package-type@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+ integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
+get-stream@^4.0.0, get-stream@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+ integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+ dependencies:
+ pump "^3.0.0"
+
+get-stream@^5.0.0, get-stream@^5.1.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+ integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+ dependencies:
+ pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+ integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+ dependencies:
+ assert-plus "^1.0.0"
+
+glob-parent@^5.0.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+ integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+ dependencies:
+ is-glob "^4.0.1"
+
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+ version "7.1.6"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+ integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.4"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+global-agent@^2.0.2:
+ version "2.1.12"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
+ integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+ dependencies:
+ boolean "^3.0.1"
+ core-js "^3.6.5"
+ es6-error "^4.1.1"
+ matcher "^3.0.0"
+ roarr "^2.15.3"
+ semver "^7.3.2"
+ serialize-error "^7.0.1"
+
+global-dirs@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
+ integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
+ dependencies:
+ ini "^1.3.5"
+
+global-tunnel-ng@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
+ integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
+ dependencies:
+ encodeurl "^1.0.2"
+ lodash "^4.17.10"
+ npm-conf "^1.1.3"
+ tunnel "^0.0.6"
+
+globals@^11.1.0:
+ version "11.12.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+ integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globals@^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"
+
+globalthis@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
+ integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
+ dependencies:
+ define-properties "^1.1.3"
+
+got@^9.6.0:
+ version "9.6.0"
+ resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+ integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+ dependencies:
+ "@sindresorhus/is" "^0.14.0"
+ "@szmarczak/http-timer" "^1.1.2"
+ cacheable-request "^6.0.0"
+ decompress-response "^3.3.0"
+ duplexer3 "^0.1.4"
+ get-stream "^4.1.0"
+ lowercase-keys "^1.0.1"
+ mimic-response "^1.0.1"
+ p-cancelable "^1.0.0"
+ to-readable-stream "^1.0.0"
+ url-parse-lax "^3.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+growly@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+ integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+har-schema@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+ integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+ integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+ dependencies:
+ ajv "^6.12.3"
+ har-schema "^2.0.0"
+
+has-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-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-yarn@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+ integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
+has@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+ integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+ dependencies:
+ function-bind "^1.1.1"
+
+hosted-git-info@^2.1.4:
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+ integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+hosted-git-info@^3.0.5:
+ version "3.0.7"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
+ integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
+ dependencies:
+ lru-cache "^6.0.0"
+
+html-comment-regex@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+ integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
+
+html-encoding-sniffer@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+ integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+ dependencies:
+ whatwg-encoding "^1.0.5"
+
+html-escaper@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+ integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+http-cache-semantics@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+ integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+http-signature@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+ dependencies:
+ assert-plus "^1.0.0"
+ jsprim "^1.2.2"
+ sshpk "^1.7.0"
+
+human-signals@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+ integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
+iconv-lite@0.4.24:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.2:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+ integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3.0.0"
+
+ieee754@^1.1.13:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+ integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+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==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+ integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
+ dependencies:
+ parent-module "^1.0.0"
+ resolve-from "^4.0.0"
+
+import-lazy@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+ integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
+import-local@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
+ integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
+ dependencies:
+ pkg-dir "^4.2.0"
+ resolve-cwd "^3.0.0"
+
+imurmurhash@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+ integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+inflight@^1.0.4:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ dependencies:
+ once "^1.3.0"
+ wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ version "1.3.8"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+ integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+ip-regex@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+ integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+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-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-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-ci@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+ integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+ dependencies:
+ ci-info "^2.0.0"
+
+is-core-module@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+ integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+ 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-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-docker@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+ integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+
+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.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-generator-fn@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+ integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
+is-glob@^4.0.0, is-glob@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+ integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+ dependencies:
+ is-extglob "^2.1.1"
+
+is-installed-globally@^0.3.1:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
+ integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
+ dependencies:
+ global-dirs "^2.0.1"
+ is-path-inside "^3.0.1"
+
+is-npm@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
+ integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
+
+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-path-inside@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+ integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
+
+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-potential-custom-element-name@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+ integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+
+is-stream@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+ integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+ integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-svg@^4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz#095b496e345fec9211c2a7d5d021003e040d6f81"
+ integrity sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A==
+ dependencies:
+ html-comment-regex "^1.1.2"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+ integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-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@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+ integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+ dependencies:
+ is-docker "^2.0.0"
+
+is-yarn-global@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+ integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
+isarray@1.0.0, isarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isbinaryfile@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+ integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
+
+isexe@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+ integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+ dependencies:
+ isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+ integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+ integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istanbul-lib-coverage@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+ integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+ integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+ dependencies:
+ "@babel/core" "^7.7.5"
+ "@istanbuljs/schema" "^0.1.2"
+ istanbul-lib-coverage "^3.0.0"
+ semver "^6.3.0"
+
+istanbul-lib-report@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+ integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+ dependencies:
+ istanbul-lib-coverage "^3.0.0"
+ make-dir "^3.0.0"
+ supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+ integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+ dependencies:
+ debug "^4.1.1"
+ istanbul-lib-coverage "^3.0.0"
+ source-map "^0.6.1"
+
+istanbul-reports@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+ integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+ dependencies:
+ html-escaper "^2.0.0"
+ istanbul-lib-report "^3.0.0"
+
+jake@^10.6.1:
+ version "10.8.2"
+ resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+ integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+ dependencies:
+ async "0.9.x"
+ chalk "^2.4.2"
+ filelist "^1.0.1"
+ minimatch "^3.0.4"
+
+jest-changed-files@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+ integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ execa "^4.0.0"
+ throat "^5.0.0"
+
+jest-cli@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+ integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
+ dependencies:
+ "@jest/core" "^26.6.3"
+ "@jest/test-result" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ chalk "^4.0.0"
+ exit "^0.1.2"
+ graceful-fs "^4.2.4"
+ import-local "^3.0.2"
+ is-ci "^2.0.0"
+ jest-config "^26.6.3"
+ jest-util "^26.6.2"
+ jest-validate "^26.6.2"
+ prompts "^2.0.1"
+ yargs "^15.4.1"
+
+jest-config@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+ integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
+ dependencies:
+ "@babel/core" "^7.1.0"
+ "@jest/test-sequencer" "^26.6.3"
+ "@jest/types" "^26.6.2"
+ babel-jest "^26.6.3"
+ chalk "^4.0.0"
+ deepmerge "^4.2.2"
+ glob "^7.1.1"
+ graceful-fs "^4.2.4"
+ jest-environment-jsdom "^26.6.2"
+ jest-environment-node "^26.6.2"
+ jest-get-type "^26.3.0"
+ jest-jasmine2 "^26.6.3"
+ jest-regex-util "^26.0.0"
+ jest-resolve "^26.6.2"
+ jest-util "^26.6.2"
+ jest-validate "^26.6.2"
+ micromatch "^4.0.2"
+ pretty-format "^26.6.2"
+
+jest-diff@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+ integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+ dependencies:
+ chalk "^4.0.0"
+ diff-sequences "^26.6.2"
+ jest-get-type "^26.3.0"
+ pretty-format "^26.6.2"
+
+jest-docblock@^26.0.0:
+ version "26.0.0"
+ resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
+ integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+ dependencies:
+ detect-newline "^3.0.0"
+
+jest-each@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+ integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ chalk "^4.0.0"
+ jest-get-type "^26.3.0"
+ jest-util "^26.6.2"
+ pretty-format "^26.6.2"
+
+jest-environment-jsdom@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+ integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
+ dependencies:
+ "@jest/environment" "^26.6.2"
+ "@jest/fake-timers" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ jest-mock "^26.6.2"
+ jest-util "^26.6.2"
+ jsdom "^16.4.0"
+
+jest-environment-node@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+ integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
+ dependencies:
+ "@jest/environment" "^26.6.2"
+ "@jest/fake-timers" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ jest-mock "^26.6.2"
+ jest-util "^26.6.2"
+
+jest-get-type@^26.3.0:
+ version "26.3.0"
+ resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+ integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+
+jest-haste-map@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+ integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ "@types/graceful-fs" "^4.1.2"
+ "@types/node" "*"
+ anymatch "^3.0.3"
+ fb-watchman "^2.0.0"
+ graceful-fs "^4.2.4"
+ jest-regex-util "^26.0.0"
+ jest-serializer "^26.6.2"
+ jest-util "^26.6.2"
+ jest-worker "^26.6.2"
+ micromatch "^4.0.2"
+ sane "^4.0.3"
+ walker "^1.0.7"
+ optionalDependencies:
+ fsevents "^2.1.2"
+
+jest-jasmine2@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+ integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
+ dependencies:
+ "@babel/traverse" "^7.1.0"
+ "@jest/environment" "^26.6.2"
+ "@jest/source-map" "^26.6.2"
+ "@jest/test-result" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ chalk "^4.0.0"
+ co "^4.6.0"
+ expect "^26.6.2"
+ is-generator-fn "^2.0.0"
+ jest-each "^26.6.2"
+ jest-matcher-utils "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-runtime "^26.6.3"
+ jest-snapshot "^26.6.2"
+ jest-util "^26.6.2"
+ pretty-format "^26.6.2"
+ throat "^5.0.0"
+
+jest-leak-detector@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+ integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
+ dependencies:
+ jest-get-type "^26.3.0"
+ pretty-format "^26.6.2"
+
+jest-matcher-utils@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+ integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+ dependencies:
+ chalk "^4.0.0"
+ jest-diff "^26.6.2"
+ jest-get-type "^26.3.0"
+ pretty-format "^26.6.2"
+
+jest-message-util@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+ integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@jest/types" "^26.6.2"
+ "@types/stack-utils" "^2.0.0"
+ chalk "^4.0.0"
+ graceful-fs "^4.2.4"
+ micromatch "^4.0.2"
+ pretty-format "^26.6.2"
+ slash "^3.0.0"
+ stack-utils "^2.0.2"
+
+jest-mock@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+ integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+
+jest-pnp-resolver@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+ integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+
+jest-regex-util@^26.0.0:
+ version "26.0.0"
+ resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
+ integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
+
+jest-resolve-dependencies@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+ integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ jest-regex-util "^26.0.0"
+ jest-snapshot "^26.6.2"
+
+jest-resolve@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+ integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ chalk "^4.0.0"
+ graceful-fs "^4.2.4"
+ jest-pnp-resolver "^1.2.2"
+ jest-util "^26.6.2"
+ read-pkg-up "^7.0.1"
+ resolve "^1.18.1"
+ slash "^3.0.0"
+
+jest-runner@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+ integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
+ dependencies:
+ "@jest/console" "^26.6.2"
+ "@jest/environment" "^26.6.2"
+ "@jest/test-result" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ chalk "^4.0.0"
+ emittery "^0.7.1"
+ exit "^0.1.2"
+ graceful-fs "^4.2.4"
+ jest-config "^26.6.3"
+ jest-docblock "^26.0.0"
+ jest-haste-map "^26.6.2"
+ jest-leak-detector "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-resolve "^26.6.2"
+ jest-runtime "^26.6.3"
+ jest-util "^26.6.2"
+ jest-worker "^26.6.2"
+ source-map-support "^0.5.6"
+ throat "^5.0.0"
+
+jest-runtime@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+ integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
+ dependencies:
+ "@jest/console" "^26.6.2"
+ "@jest/environment" "^26.6.2"
+ "@jest/fake-timers" "^26.6.2"
+ "@jest/globals" "^26.6.2"
+ "@jest/source-map" "^26.6.2"
+ "@jest/test-result" "^26.6.2"
+ "@jest/transform" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/yargs" "^15.0.0"
+ chalk "^4.0.0"
+ cjs-module-lexer "^0.6.0"
+ collect-v8-coverage "^1.0.0"
+ exit "^0.1.2"
+ glob "^7.1.3"
+ graceful-fs "^4.2.4"
+ jest-config "^26.6.3"
+ jest-haste-map "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-mock "^26.6.2"
+ jest-regex-util "^26.0.0"
+ jest-resolve "^26.6.2"
+ jest-snapshot "^26.6.2"
+ jest-util "^26.6.2"
+ jest-validate "^26.6.2"
+ slash "^3.0.0"
+ strip-bom "^4.0.0"
+ yargs "^15.4.1"
+
+jest-serializer@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+ integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
+ dependencies:
+ "@types/node" "*"
+ graceful-fs "^4.2.4"
+
+jest-snapshot@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+ integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
+ dependencies:
+ "@babel/types" "^7.0.0"
+ "@jest/types" "^26.6.2"
+ "@types/babel__traverse" "^7.0.4"
+ "@types/prettier" "^2.0.0"
+ chalk "^4.0.0"
+ expect "^26.6.2"
+ graceful-fs "^4.2.4"
+ jest-diff "^26.6.2"
+ jest-get-type "^26.3.0"
+ jest-haste-map "^26.6.2"
+ jest-matcher-utils "^26.6.2"
+ jest-message-util "^26.6.2"
+ jest-resolve "^26.6.2"
+ natural-compare "^1.4.0"
+ pretty-format "^26.6.2"
+ semver "^7.3.2"
+
+jest-util@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+ integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ chalk "^4.0.0"
+ graceful-fs "^4.2.4"
+ is-ci "^2.0.0"
+ micromatch "^4.0.2"
+
+jest-validate@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+ integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ camelcase "^6.0.0"
+ chalk "^4.0.0"
+ jest-get-type "^26.3.0"
+ leven "^3.1.0"
+ pretty-format "^26.6.2"
+
+jest-watcher@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+ integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
+ dependencies:
+ "@jest/test-result" "^26.6.2"
+ "@jest/types" "^26.6.2"
+ "@types/node" "*"
+ ansi-escapes "^4.2.1"
+ chalk "^4.0.0"
+ jest-util "^26.6.2"
+ string-length "^4.0.1"
+
+jest-worker@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+ integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+ dependencies:
+ "@types/node" "*"
+ merge-stream "^2.0.0"
+ supports-color "^7.0.0"
+
+jest@^26.6.3:
+ version "26.6.3"
+ resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+ integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
+ dependencies:
+ "@jest/core" "^26.6.3"
+ import-local "^3.0.2"
+ jest-cli "^26.6.3"
+
+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, js-yaml@^3.14.0:
+ 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"
+
+jsbn@~0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+ integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^16.4.0:
+ version "16.4.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+ integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
+ dependencies:
+ abab "^2.0.3"
+ acorn "^7.1.1"
+ acorn-globals "^6.0.0"
+ cssom "^0.4.4"
+ cssstyle "^2.2.0"
+ data-urls "^2.0.0"
+ decimal.js "^10.2.0"
+ domexception "^2.0.1"
+ escodegen "^1.14.1"
+ html-encoding-sniffer "^2.0.1"
+ is-potential-custom-element-name "^1.0.0"
+ nwsapi "^2.2.0"
+ parse5 "5.1.1"
+ request "^2.88.2"
+ request-promise-native "^1.0.8"
+ saxes "^5.0.0"
+ symbol-tree "^3.2.4"
+ tough-cookie "^3.0.1"
+ w3c-hr-time "^1.0.2"
+ w3c-xmlserializer "^2.0.0"
+ webidl-conversions "^6.1.0"
+ whatwg-encoding "^1.0.5"
+ whatwg-mimetype "^2.3.0"
+ whatwg-url "^8.0.0"
+ ws "^7.2.3"
+ xml-name-validator "^3.0.0"
+
+jsesc@^2.5.1:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+ integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+json-buffer@3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+ integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-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@0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+ integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stable-stringify-without-jsonify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+ integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json5@^2.1.2:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+ integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+ dependencies:
+ minimist "^1.2.5"
+
+jsonfile@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
+jsonfile@^6.0.1:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+ integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+ dependencies:
+ universalify "^2.0.0"
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
+jsprim@^1.2.2:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+ integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+ dependencies:
+ assert-plus "1.0.0"
+ extsprintf "1.3.0"
+ json-schema "0.2.3"
+ verror "1.10.0"
+
+keyv@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+ integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+ dependencies:
+ json-buffer "3.0.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+ integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+ dependencies:
+ is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+ integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+ dependencies:
+ is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+ integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+ integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+kleur@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+ integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
+latest-version@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+ integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+ dependencies:
+ package-json "^6.3.0"
+
+lazy-val@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
+ integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
+
+lazystream@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+ integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+ dependencies:
+ readable-stream "^2.0.5"
+
+leven@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+ integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+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=
+
+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.defaults@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+ integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.difference@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+ integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
+lodash.flatten@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+ integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.isplainobject@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+ integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.sortby@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+ integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
+lodash.union@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+ integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
+
+lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19:
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+ integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+ integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+lru-cache@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+ integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+ dependencies:
+ yallist "^4.0.0"
+
+make-dir@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+ integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+ dependencies:
+ semver "^6.0.0"
+
+makeerror@1.0.x:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+ integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+ dependencies:
+ tmpl "1.0.x"
+
+map-cache@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+ integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+ integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+ dependencies:
+ object-visit "^1.0.0"
+
+matcher@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
+ integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
+ dependencies:
+ escape-string-regexp "^4.0.0"
+
+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==
+
+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:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+ integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+ dependencies:
+ braces "^3.0.1"
+ picomatch "^2.0.5"
+
+mime-db@1.44.0:
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+ integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+ version "2.1.27"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+ integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+ dependencies:
+ mime-db "1.44.0"
+
+mime@^2.4.6:
+ version "2.4.6"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+ integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+
+mimic-fn@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+ integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+minimatch@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+ dependencies:
+ brace-expansion "^1.1.7"
+
+minimist@^1.1.1, 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==
+
+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.4:
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+ integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+ dependencies:
+ minimist "^1.2.5"
+
+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==
+
+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=
+
+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-int64@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+ integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-modules-regexp@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+ integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
+node-notifier@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
+ integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+ dependencies:
+ growly "^1.3.0"
+ is-wsl "^2.2.0"
+ semver "^7.3.2"
+ shellwords "^0.1.1"
+ uuid "^8.3.0"
+ which "^2.0.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-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:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+ integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@^4.1.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+ integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
+npm-conf@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+ integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+ dependencies:
+ config-chain "^1.1.11"
+ pify "^3.0.0"
+
+npm-run-path@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+ integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+ dependencies:
+ path-key "^2.0.0"
+
+npm-run-path@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+ integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+ dependencies:
+ path-key "^3.0.0"
+
+nwsapi@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+ integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+ integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-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-keys@^1.0.12:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+ integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+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.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"
+
+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"
+
+onetime@^5.1.0:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+ integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+ dependencies:
+ mimic-fn "^2.1.0"
+
+optionator@^0.8.1:
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+ integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+ dependencies:
+ deep-is "~0.1.3"
+ fast-levenshtein "~2.0.6"
+ levn "~0.3.0"
+ prelude-ls "~1.1.2"
+ type-check "~0.3.2"
+ word-wrap "~1.2.3"
+
+optionator@^0.9.1:
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+ dependencies:
+ deep-is "^0.1.3"
+ fast-levenshtein "^2.0.6"
+ levn "^0.4.1"
+ prelude-ls "^1.2.1"
+ type-check "^0.4.0"
+ word-wrap "^1.2.3"
+
+p-cancelable@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+ integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
+p-each-series@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
+ integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
+
+p-finally@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+ integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-limit@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+ integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+ dependencies:
+ p-try "^2.0.0"
+
+p-locate@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+ integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+ dependencies:
+ p-limit "^2.2.0"
+
+p-try@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+ integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^6.3.0:
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+ integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+ dependencies:
+ got "^9.6.0"
+ registry-auth-token "^4.0.0"
+ registry-url "^5.0.0"
+ semver "^6.2.0"
+
+parent-module@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+ dependencies:
+ callsites "^3.0.0"
+
+parse-json@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+ integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ error-ex "^1.3.1"
+ json-parse-even-better-errors "^2.3.0"
+ lines-and-columns "^1.1.6"
+
+parse5@5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+ integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
+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-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.0, 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.0.0, path-key@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+ integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+ integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+pend@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+ integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
+performance-now@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+ integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.4, picomatch@^2.0.5:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+ integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pify@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+ integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pirates@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+ integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+ dependencies:
+ node-modules-regexp "^1.0.0"
+
+pkg-dir@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+ integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+ dependencies:
+ find-up "^4.0.0"
+
+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=
+
+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@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+ integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+pretty-format@^26.6.2:
+ version "26.6.2"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+ integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+ dependencies:
+ "@jest/types" "^26.6.2"
+ ansi-regex "^5.0.0"
+ ansi-styles "^4.0.0"
+ react-is "^17.0.1"
+
+printj@~1.1.0:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+ integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
+process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+progress@^2.0.0, progress@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+prompts@^2.0.1:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
+ integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
+ dependencies:
+ kleur "^3.0.3"
+ sisteransi "^1.0.5"
+
+proto-list@~1.2.1:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+ integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
+psl@^1.1.28:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+ integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+pump@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+ integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+ dependencies:
+ end-of-stream "^1.1.0"
+ once "^1.3.1"
+
+punycode@^2.1.0, punycode@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+ integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+pupa@^2.0.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
+ integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
+ dependencies:
+ escape-goat "^2.0.0"
+
+qs@~6.5.2:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+ integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+rc@^1.2.8:
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+ integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+ dependencies:
+ deep-extend "^0.6.0"
+ ini "~1.3.0"
+ minimist "^1.2.0"
+ strip-json-comments "~2.0.1"
+
+react-is@^17.0.1:
+ version "17.0.1"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+ integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
+read-config-file@6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
+ integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
+ dependencies:
+ dotenv "^8.2.0"
+ dotenv-expand "^5.1.0"
+ js-yaml "^3.13.1"
+ json5 "^2.1.2"
+ lazy-val "^1.0.4"
+
+read-pkg-up@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+ integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+ dependencies:
+ find-up "^4.1.0"
+ read-pkg "^5.2.0"
+ type-fest "^0.8.1"
+
+read-pkg@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+ integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+ dependencies:
+ "@types/normalize-package-data" "^2.4.0"
+ normalize-package-data "^2.5.0"
+ parse-json "^5.0.0"
+ type-fest "^0.6.0"
+
+readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2:
+ version "2.3.7"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+ dependencies:
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
+
+readdir-glob@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
+ integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==
+ dependencies:
+ minimatch "^3.0.4"
+
+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"
+
+regexpp@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+ integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+registry-auth-token@^4.0.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+ integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+ dependencies:
+ rc "^1.2.8"
+
+registry-url@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+ integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+ dependencies:
+ rc "^1.2.8"
+
+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.3"
+ resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+ integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+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=
+
+request-promise-core@1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+ integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
+ dependencies:
+ lodash "^4.17.19"
+
+request-promise-native@^1.0.8:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+ integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
+ dependencies:
+ request-promise-core "1.1.4"
+ stealthy-require "^1.1.1"
+ tough-cookie "^2.3.3"
+
+request@^2.88.2:
+ version "2.88.2"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+ integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+ dependencies:
+ aws-sign2 "~0.7.0"
+ aws4 "^1.8.0"
+ caseless "~0.12.0"
+ combined-stream "~1.0.6"
+ extend "~3.0.2"
+ forever-agent "~0.6.1"
+ form-data "~2.3.2"
+ har-validator "~5.1.3"
+ http-signature "~1.2.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.19"
+ oauth-sign "~0.9.0"
+ performance-now "^2.1.0"
+ qs "~6.5.2"
+ safe-buffer "^5.1.2"
+ tough-cookie "~2.5.0"
+ tunnel-agent "^0.6.0"
+ uuid "^3.3.2"
+
+require-directory@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+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@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+ integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+ dependencies:
+ resolve-from "^5.0.0"
+
+resolve-from@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-from@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+ integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve-url@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+ integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.10.0, resolve@^1.18.1:
+ version "1.19.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+ integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+ dependencies:
+ is-core-module "^2.1.0"
+ path-parse "^1.0.6"
+
+responselike@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+ integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+ dependencies:
+ lowercase-keys "^1.0.0"
+
+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==
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+ dependencies:
+ glob "^7.1.3"
+
+roarr@^2.15.3:
+ version "2.15.4"
+ resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
+ integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
+ dependencies:
+ boolean "^3.0.1"
+ detect-node "^2.0.4"
+ globalthis "^1.0.1"
+ json-stringify-safe "^5.0.1"
+ semver-compare "^1.0.0"
+ sprintf-js "^1.1.2"
+
+rsvp@^4.8.4:
+ version "4.8.5"
+ resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+ integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+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.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sane@^4.0.3:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+ integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+ dependencies:
+ "@cnakazawa/watch" "^1.0.3"
+ anymatch "^2.0.0"
+ capture-exit "^2.0.0"
+ exec-sh "^0.3.2"
+ execa "^1.0.0"
+ fb-watchman "^2.0.0"
+ micromatch "^3.1.4"
+ minimist "^1.1.1"
+ walker "~1.0.5"
+
+sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
+ version "1.6.3"
+ resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
+ integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
+ dependencies:
+ truncate-utf8-bytes "^1.0.0"
+
+sax@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+ integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+ integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+ dependencies:
+ xmlchars "^2.2.0"
+
+semver-compare@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+ integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
+semver-diff@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
+ integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
+ dependencies:
+ semver "^6.3.0"
+
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.2.1, semver@^7.3.2:
+ version "7.3.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+ integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+ dependencies:
+ lru-cache "^6.0.0"
+
+serialize-error@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
+ integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
+ dependencies:
+ type-fest "^0.13.1"
+
+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"
+
+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==
+
+shellwords@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+ integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+signal-exit@^3.0.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==
+
+sisteransi@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+ integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
+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@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+ integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+ dependencies:
+ ansi-styles "^3.2.0"
+ astral-regex "^1.0.0"
+ is-fullwidth-code-point "^2.0.0"
+
+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"
+
+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.19, source-map-support@^0.5.6:
+ version "0.5.19"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+ integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+ dependencies:
+ buffer-from "^1.0.0"
+ source-map "^0.6.0"
+
+source-map-url@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+ integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+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.3:
+ 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.7"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+ integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+
+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.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+ integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+ integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sshpk@^1.7.0:
+ version "1.16.1"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+ integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+ dependencies:
+ asn1 "~0.2.3"
+ assert-plus "^1.0.0"
+ bcrypt-pbkdf "^1.0.0"
+ dashdash "^1.12.0"
+ ecc-jsbn "~0.1.1"
+ getpass "^0.1.1"
+ jsbn "~0.1.0"
+ safer-buffer "^2.0.2"
+ tweetnacl "~0.14.0"
+
+stack-utils@^2.0.2:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
+ integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ dependencies:
+ escape-string-regexp "^2.0.0"
+
+stat-mode@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
+ integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
+
+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"
+
+stealthy-require@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+ integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+string-length@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
+ integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+ dependencies:
+ char-regex "^1.0.2"
+ strip-ansi "^6.0.0"
+
+string-width@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+ integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+ dependencies:
+ emoji-regex "^7.0.1"
+ is-fullwidth-code-point "^2.0.0"
+ strip-ansi "^5.1.0"
+
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+ integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+ dependencies:
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.0"
+
+string_decoder@^1.1.1:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+ integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+ dependencies:
+ safe-buffer "~5.2.0"
+
+string_decoder@~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.1.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+ integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+ dependencies:
+ ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+ integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+ dependencies:
+ ansi-regex "^5.0.0"
+
+strip-bom@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+ integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+ integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+ integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+ integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+strip-json-comments@~2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+ integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+sumchecker@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
+ integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
+ dependencies:
+ debug "^4.1.0"
+
+supports-color@^5.3.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+ dependencies:
+ has-flag "^3.0.0"
+
+supports-color@^7.0.0, supports-color@^7.1.0:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+ integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+ dependencies:
+ has-flag "^4.0.0"
+
+supports-hyperlinks@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
+ integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+ dependencies:
+ has-flag "^4.0.0"
+ supports-color "^7.0.0"
+
+symbol-tree@^3.2.4:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+ integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+table@^5.2.3:
+ version "5.4.6"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+ integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+ dependencies:
+ ajv "^6.10.2"
+ lodash "^4.17.14"
+ slice-ansi "^2.1.0"
+ string-width "^3.0.0"
+
+tar-stream@^2.1.4:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
+ integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
+ dependencies:
+ bl "^4.0.3"
+ end-of-stream "^1.4.1"
+ fs-constants "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.1.1"
+
+temp-file@^3.3.7:
+ version "3.3.7"
+ resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a"
+ integrity sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g==
+ dependencies:
+ async-exit-hook "^2.0.1"
+ fs-extra "^8.1.0"
+
+term-size@^2.1.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
+ integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
+
+terminal-link@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+ integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+ dependencies:
+ ansi-escapes "^4.2.1"
+ supports-hyperlinks "^2.0.0"
+
+test-exclude@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+ integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+ dependencies:
+ "@istanbuljs/schema" "^0.1.2"
+ glob "^7.1.4"
+ minimatch "^3.0.4"
+
+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=
+
+throat@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+ integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+
+tldts-core@^5.6.64:
+ version "5.6.64"
+ resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz#0f80d0c9607d7583acc477a10dae7e62e7c08063"
+ integrity sha512-uzVHDyya5Qy7VtMaaWYdNxvBBp8PKhRMt6FrzB5lDJiFtUIma4JdxRCxGxbyOoJig1DOmqcQDjnH3+C2etvyaA==
+
+tldts-experimental@^5.6.21:
+ version "5.6.64"
+ resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz#f867449964d94c6a17a499335658f42a9fbdc7d3"
+ integrity sha512-PaA3Lau6l7PsxvMd9Ptocalu/K9RA3Ia5QovHTuLdJZfaJJNFrC3FEQpzYqxQ4bGqB7bpPeFXZDLisA/d4KWKg==
+ dependencies:
+ tldts-core "^5.6.64"
+
+tmpl@1.0.x:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+ integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+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-readable-stream@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+ integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
+to-regex-range@^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"
+
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+ dependencies:
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tough-cookie@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+ integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+ dependencies:
+ ip-regex "^2.1.0"
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tr46@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+ integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+ dependencies:
+ punycode "^2.1.1"
+
+truncate-utf8-bytes@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
+ integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+ dependencies:
+ utf8-byte-length "^1.0.1"
+
+tunnel-agent@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+ integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+ dependencies:
+ safe-buffer "^5.0.1"
+
+tunnel@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+ version "0.14.5"
+ resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+ integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@^0.4.0, type-check@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+ dependencies:
+ prelude-ls "^1.2.1"
+
+type-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-detect@4.0.8:
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+ integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+ integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-fest@^0.13.1:
+ version "0.13.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+ integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
+type-fest@^0.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=
+
+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"
+
+unique-string@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+ integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+ dependencies:
+ crypto-random-string "^2.0.0"
+
+universalify@^0.1.0:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+universalify@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+ integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
+universalify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+ integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
+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"
+
+update-notifier@^4.1.1:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
+ integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==
+ dependencies:
+ boxen "^4.2.0"
+ chalk "^3.0.0"
+ configstore "^5.0.1"
+ has-yarn "^2.1.0"
+ import-lazy "^2.1.0"
+ is-ci "^2.0.0"
+ is-installed-globally "^0.3.1"
+ is-npm "^4.0.0"
+ is-yarn-global "^0.3.0"
+ latest-version "^5.0.0"
+ pupa "^2.0.1"
+ semver-diff "^3.1.1"
+ xdg-basedir "^4.0.0"
+
+uri-js@^4.2.2:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+ integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+ 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-parse-lax@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+ integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+ dependencies:
+ prepend-http "^2.0.0"
+
+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==
+
+utf8-byte-length@^1.0.1:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+ integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+
+util-deprecate@^1.0.1, 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=
+
+uuid@^3.3.2:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+ integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^8.3.0:
+ version "8.3.2"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+ integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v8-compile-cache@^2.0.3:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+ integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+
+v8-to-istanbul@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc"
+ integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==
+ dependencies:
+ "@types/istanbul-lib-coverage" "^2.0.1"
+ convert-source-map "^1.6.0"
+ source-map "^0.7.3"
+
+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"
+
+verror@1.10.0:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+ integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+ dependencies:
+ assert-plus "^1.0.0"
+ core-util-is "1.0.2"
+ extsprintf "^1.2.0"
+
+w3c-hr-time@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+ integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+ dependencies:
+ browser-process-hrtime "^1.0.0"
+
+w3c-xmlserializer@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+ integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+ dependencies:
+ xml-name-validator "^3.0.0"
+
+walker@^1.0.7, walker@~1.0.5:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+ integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+ dependencies:
+ makeerror "1.0.x"
+
+webidl-conversions@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+ integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+ integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
+whatwg-encoding@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+ integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+ dependencies:
+ iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+ integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^8.0.0:
+ version "8.4.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
+ integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
+ dependencies:
+ lodash.sortby "^4.7.0"
+ tr46 "^2.0.2"
+ webidl-conversions "^6.1.0"
+
+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.9:
+ 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, which@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+ integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+ dependencies:
+ isexe "^2.0.0"
+
+widest-line@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
+ integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
+ dependencies:
+ string-width "^4.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==
+
+wrap-ansi@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+ integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+ integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+ dependencies:
+ imurmurhash "^0.1.4"
+ is-typedarray "^1.0.0"
+ signal-exit "^3.0.2"
+ typedarray-to-buffer "^3.1.5"
+
+ws@^7.2.3:
+ version "7.4.1"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
+ integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
+
+xdg-basedir@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+ integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
+xml-name-validator@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+ integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+ integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+y18n@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+ integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+
+y18n@^5.0.5:
+ version "5.0.5"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+ integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+
+yallist@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+ integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^18.1.2:
+ version "18.1.3"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+ integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+ dependencies:
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
+
+yargs-parser@^20.2.2:
+ version "20.2.4"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+ integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
+yargs@^15.4.1:
+ version "15.4.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+ integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+ dependencies:
+ cliui "^6.0.0"
+ decamelize "^1.2.0"
+ find-up "^4.1.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 "^4.2.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^18.1.2"
+
+yargs@^16.0.3:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+ integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+ dependencies:
+ cliui "^7.0.2"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
+ require-directory "^2.1.1"
+ string-width "^4.2.0"
+ y18n "^5.0.5"
+ yargs-parser "^20.2.2"
+
+yauzl@^2.10.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+ integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+ dependencies:
+ buffer-crc32 "~0.2.3"
+ fd-slicer "~1.1.0"
+
+zip-stream@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a"
+ integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==
+ dependencies:
+ archiver-utils "^2.1.0"
+ compress-commons "^4.0.2"
+ readable-stream "^3.6.0"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix
new file mode 100644
index 0000000000..6f92c3a385
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix
@@ -0,0 +1,5653 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+ offline_cache = linkFarm "offline" packages;
+ packages = [
+ {
+ name = "7zip_bin___7zip_bin_5.0.3.tgz";
+ path = fetchurl {
+ name = "7zip_bin___7zip_bin_5.0.3.tgz";
+ url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz";
+ sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f";
+ };
+ }
+ {
+ name = "_babel_code_frame___code_frame_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_code_frame___code_frame_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz";
+ sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a";
+ };
+ }
+ {
+ name = "_babel_core___core_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_core___core_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz";
+ sha1 = "b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd";
+ };
+ }
+ {
+ name = "_babel_generator___generator_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_generator___generator_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz";
+ sha1 = "2b188fc329fb8e4f762181703beffc0fe6df3460";
+ };
+ }
+ {
+ name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+ sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a";
+ };
+ }
+ {
+ name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+ sha1 = "b158817a3165b5faa2047825dfa61970ddcc16cf";
+ };
+ }
+ {
+ name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz";
+ path = fetchurl {
+ name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+ sha1 = "aa77bd0396ec8114e5e30787efa78599d874a855";
+ };
+ }
+ {
+ name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz";
+ path = fetchurl {
+ name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+ sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb";
+ };
+ }
+ {
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz";
+ path = fetchurl {
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+ sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c";
+ };
+ }
+ {
+ name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+ sha1 = "94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d";
+ };
+ }
+ {
+ name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+ sha1 = "2f75a831269d4f677de49986dff59927533cf375";
+ };
+ }
+ {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz";
+ path = fetchurl {
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+ sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9";
+ };
+ }
+ {
+ name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz";
+ path = fetchurl {
+ name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+ sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136";
+ };
+ }
+ {
+ 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.11.0.tgz";
+ path = fetchurl {
+ name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+ sha1 = "f8a491244acf6a676158ac42072911ba83ad099f";
+ };
+ }
+ {
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+ sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2";
+ };
+ }
+ {
+ name = "_babel_helpers___helpers_7.12.5.tgz";
+ path = fetchurl {
+ name = "_babel_helpers___helpers_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz";
+ sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e";
+ };
+ }
+ {
+ name = "_babel_highlight___highlight_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_highlight___highlight_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz";
+ sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143";
+ };
+ }
+ {
+ name = "_babel_parser___parser_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_parser___parser_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz";
+ sha1 = "824600d59e96aea26a5a2af5a9d812af05c3ae81";
+ };
+ }
+ {
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+ sha1 = "e02f0ea1b5dc59d401ec16fb824679f683d3303c";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz";
+ sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz";
+ sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+ sha1 = "bcb297c5366e79bebadef509549cd93b04f19978";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz";
+ sha1 = "ee601348c370fa334d2207be158777496521fd51";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz";
+ sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a";
+ };
+ }
+ {
+ name = "_babel_plugin_syntax_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_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz";
+ path = fetchurl {
+ name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+ sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0";
+ };
+ }
+ {
+ name = "_babel_template___template_7.12.7.tgz";
+ path = fetchurl {
+ name = "_babel_template___template_7.12.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz";
+ sha1 = "c817233696018e39fbb6c491d2fb684e05ed43bc";
+ };
+ }
+ {
+ name = "_babel_traverse___traverse_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_traverse___traverse_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz";
+ sha1 = "2d1f4041e8bf42ea099e5b2dc48d6a594c00017a";
+ };
+ }
+ {
+ name = "_babel_types___types_7.12.10.tgz";
+ path = fetchurl {
+ name = "_babel_types___types_7.12.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz";
+ sha1 = "7965e4a7260b26f09c56bcfcb0498af1f6d9b260";
+ };
+ }
+ {
+ name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz";
+ path = fetchurl {
+ name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz";
+ url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz";
+ sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39";
+ };
+ }
+ {
+ name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz";
+ path = fetchurl {
+ name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz";
+ url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz";
+ sha1 = "96473f14c098a20091298d34a6addcd430aceebd";
+ };
+ }
+ {
+ name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz";
+ path = fetchurl {
+ name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz";
+ url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz";
+ sha1 = "c2058647e015b6f61c222e7d58040347324c63b0";
+ };
+ }
+ {
+ name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz";
+ path = fetchurl {
+ name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz";
+ url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz";
+ sha1 = "5f697c5dc65cd936b3908078a6e4516ec995567a";
+ };
+ }
+ {
+ name = "_cliqz_adblocker___adblocker_1.18.8.tgz";
+ path = fetchurl {
+ name = "_cliqz_adblocker___adblocker_1.18.8.tgz";
+ url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz";
+ sha1 = "f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9";
+ };
+ }
+ {
+ name = "_cnakazawa_watch___watch_1.0.4.tgz";
+ path = fetchurl {
+ name = "_cnakazawa_watch___watch_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz";
+ sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a";
+ };
+ }
+ {
+ name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
+ path = fetchurl {
+ name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
+ url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz";
+ sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6";
+ };
+ }
+ {
+ name = "_electron_get___get_1.12.2.tgz";
+ path = fetchurl {
+ name = "_electron_get___get_1.12.2.tgz";
+ url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz";
+ sha1 = "6442066afb99be08cefb9a281e4b4692b33764f3";
+ };
+ }
+ {
+ name = "_eslint_eslintrc___eslintrc_0.2.2.tgz";
+ path = fetchurl {
+ name = "_eslint_eslintrc___eslintrc_0.2.2.tgz";
+ url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz";
+ sha1 = "d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76";
+ };
+ }
+ {
+ name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz";
+ path = fetchurl {
+ name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz";
+ sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced";
+ };
+ }
+ {
+ name = "_istanbuljs_schema___schema_0.1.2.tgz";
+ path = fetchurl {
+ name = "_istanbuljs_schema___schema_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz";
+ sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd";
+ };
+ }
+ {
+ name = "_jest_console___console_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_console___console_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz";
+ sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2";
+ };
+ }
+ {
+ name = "_jest_core___core_26.6.3.tgz";
+ path = fetchurl {
+ name = "_jest_core___core_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz";
+ sha1 = "7639fcb3833d748a4656ada54bde193051e45fad";
+ };
+ }
+ {
+ name = "_jest_environment___environment_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_environment___environment_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz";
+ sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c";
+ };
+ }
+ {
+ name = "_jest_fake_timers___fake_timers_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_fake_timers___fake_timers_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz";
+ sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad";
+ };
+ }
+ {
+ name = "_jest_globals___globals_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_globals___globals_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz";
+ sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a";
+ };
+ }
+ {
+ name = "_jest_reporters___reporters_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_reporters___reporters_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz";
+ sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6";
+ };
+ }
+ {
+ name = "_jest_source_map___source_map_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_source_map___source_map_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz";
+ sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535";
+ };
+ }
+ {
+ name = "_jest_test_result___test_result_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_test_result___test_result_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz";
+ sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18";
+ };
+ }
+ {
+ name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz";
+ path = fetchurl {
+ name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz";
+ sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17";
+ };
+ }
+ {
+ name = "_jest_transform___transform_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_transform___transform_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz";
+ sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b";
+ };
+ }
+ {
+ name = "_jest_types___types_26.6.2.tgz";
+ path = fetchurl {
+ name = "_jest_types___types_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz";
+ sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e";
+ };
+ }
+ {
+ name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz";
+ path = fetchurl {
+ name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz";
+ sha1 = "fb1402b4c47266161501704d74427b8d49e4b3e4";
+ };
+ }
+ {
+ name = "_remusao_small___small_1.2.0.tgz";
+ path = fetchurl {
+ name = "_remusao_small___small_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz";
+ sha1 = "1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9";
+ };
+ }
+ {
+ name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz";
+ path = fetchurl {
+ name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz";
+ sha1 = "ec79c87f5780865da616cd214b3b8978807d1e9a";
+ };
+ }
+ {
+ name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz";
+ path = fetchurl {
+ name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz";
+ sha1 = "9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf";
+ };
+ }
+ {
+ name = "_remusao_smaz___smaz_1.9.0.tgz";
+ path = fetchurl {
+ name = "_remusao_smaz___smaz_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz";
+ sha1 = "d02c2fb007483d4b4d050fb2fdaf523fcef08d40";
+ };
+ }
+ {
+ name = "_remusao_trie___trie_1.4.0.tgz";
+ path = fetchurl {
+ name = "_remusao_trie___trie_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz";
+ sha1 = "b439210445339f0ca95ff200d98b898d431a4ce1";
+ };
+ }
+ {
+ name = "_sindresorhus_is___is_0.14.0.tgz";
+ path = fetchurl {
+ name = "_sindresorhus_is___is_0.14.0.tgz";
+ url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz";
+ sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea";
+ };
+ }
+ {
+ name = "_sinonjs_commons___commons_1.8.1.tgz";
+ path = fetchurl {
+ name = "_sinonjs_commons___commons_1.8.1.tgz";
+ url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz";
+ sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217";
+ };
+ }
+ {
+ name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
+ path = fetchurl {
+ name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
+ url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz";
+ sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40";
+ };
+ }
+ {
+ name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
+ path = fetchurl {
+ name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
+ sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421";
+ };
+ }
+ {
+ name = "_types_babel__core___babel__core_7.1.12.tgz";
+ path = fetchurl {
+ name = "_types_babel__core___babel__core_7.1.12.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz";
+ sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d";
+ };
+ }
+ {
+ name = "_types_babel__generator___babel__generator_7.6.2.tgz";
+ path = fetchurl {
+ name = "_types_babel__generator___babel__generator_7.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz";
+ sha1 = "f3d71178e187858f7c45e30380f8f1b7415a12d8";
+ };
+ }
+ {
+ name = "_types_babel__template___babel__template_7.4.0.tgz";
+ path = fetchurl {
+ name = "_types_babel__template___babel__template_7.4.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz";
+ sha1 = "0c888dd70b3ee9eebb6e4f200e809da0076262be";
+ };
+ }
+ {
+ name = "_types_babel__traverse___babel__traverse_7.11.0.tgz";
+ path = fetchurl {
+ name = "_types_babel__traverse___babel__traverse_7.11.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
+ sha1 = "b9a1efa635201ba9bc850323a8793ee2d36c04a0";
+ };
+ }
+ {
+ name = "_types_chrome___chrome_0.0.126.tgz";
+ path = fetchurl {
+ name = "_types_chrome___chrome_0.0.126.tgz";
+ url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz";
+ sha1 = "f9f3436712f0c7c12ea9798abc9b95575ad7b23a";
+ };
+ }
+ {
+ name = "_types_debug___debug_4.1.5.tgz";
+ path = fetchurl {
+ name = "_types_debug___debug_4.1.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz";
+ sha1 = "b14efa8852b7768d898906613c23f688713e02cd";
+ };
+ }
+ {
+ name = "_types_filesystem___filesystem_0.0.29.tgz";
+ path = fetchurl {
+ name = "_types_filesystem___filesystem_0.0.29.tgz";
+ url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz";
+ sha1 = "ee3748eb5be140dcf980c3bd35f11aec5f7a3748";
+ };
+ }
+ {
+ name = "_types_filewriter___filewriter_0.0.28.tgz";
+ path = fetchurl {
+ name = "_types_filewriter___filewriter_0.0.28.tgz";
+ url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz";
+ sha1 = "c054e8af4d9dd75db4e63abc76f885168714d4b3";
+ };
+ }
+ {
+ name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz";
+ path = fetchurl {
+ name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz";
+ sha1 = "4d0f5cfebd7321d2cbf0ccfb6032570f0138b958";
+ };
+ }
+ {
+ name = "_types_fs_extra___fs_extra_9.0.5.tgz";
+ path = fetchurl {
+ name = "_types_fs_extra___fs_extra_9.0.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz";
+ sha1 = "2afb76a43a4bef80a363b94b314d0ca1694fc4f8";
+ };
+ }
+ {
+ name = "_types_graceful_fs___graceful_fs_4.1.4.tgz";
+ path = fetchurl {
+ name = "_types_graceful_fs___graceful_fs_4.1.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz";
+ sha1 = "4ff9f641a7c6d1a3508ff88bc3141b152772e753";
+ };
+ }
+ {
+ name = "_types_har_format___har_format_1.2.5.tgz";
+ path = fetchurl {
+ name = "_types_har_format___har_format_1.2.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz";
+ sha1 = "4f6648814d0fdcb6a510e3364a9db439a753c4b1";
+ };
+ }
+ {
+ name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz";
+ path = fetchurl {
+ name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz";
+ sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762";
+ };
+ }
+ {
+ name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz";
+ path = fetchurl {
+ name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+ sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686";
+ };
+ }
+ {
+ name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
+ path = fetchurl {
+ name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz";
+ sha1 = "508b13aa344fa4976234e75dddcc34925737d821";
+ };
+ }
+ {
+ name = "_types_node___node_14.14.13.tgz";
+ path = fetchurl {
+ name = "_types_node___node_14.14.13.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz";
+ sha1 = "9e425079799322113ae8477297ae6ef51b8e0cdf";
+ };
+ }
+ {
+ name = "_types_node___node_12.19.9.tgz";
+ path = fetchurl {
+ name = "_types_node___node_12.19.9.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz";
+ sha1 = "990ad687ad8b26ef6dcc34a4f69c33d40c95b679";
+ };
+ }
+ {
+ 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_prettier___prettier_2.1.5.tgz";
+ path = fetchurl {
+ name = "_types_prettier___prettier_2.1.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz";
+ sha1 = "b6ab3bba29e16b821d84e09ecfaded462b816b00";
+ };
+ }
+ {
+ name = "_types_stack_utils___stack_utils_2.0.0.tgz";
+ path = fetchurl {
+ name = "_types_stack_utils___stack_utils_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz";
+ sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff";
+ };
+ }
+ {
+ name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
+ path = fetchurl {
+ name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+ sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d";
+ };
+ }
+ {
+ name = "_types_yargs___yargs_15.0.11.tgz";
+ path = fetchurl {
+ name = "_types_yargs___yargs_15.0.11.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz";
+ sha1 = "361d7579ecdac1527687bcebf9946621c12ab78c";
+ };
+ }
+ {
+ name = "abab___abab_2.0.5.tgz";
+ path = fetchurl {
+ name = "abab___abab_2.0.5.tgz";
+ url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz";
+ sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a";
+ };
+ }
+ {
+ name = "acorn_globals___acorn_globals_6.0.0.tgz";
+ path = fetchurl {
+ name = "acorn_globals___acorn_globals_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz";
+ sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45";
+ };
+ }
+ {
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+ path = fetchurl {
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+ sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
+ };
+ }
+ {
+ name = "acorn_walk___acorn_walk_7.2.0.tgz";
+ path = fetchurl {
+ name = "acorn_walk___acorn_walk_7.2.0.tgz";
+ url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz";
+ sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc";
+ };
+ }
+ {
+ name = "acorn___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 = "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 = "ansi_align___ansi_align_3.0.0.tgz";
+ path = fetchurl {
+ name = "ansi_align___ansi_align_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz";
+ sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb";
+ };
+ }
+ {
+ name = "ansi_colors___ansi_colors_4.1.1.tgz";
+ path = fetchurl {
+ name = "ansi_colors___ansi_colors_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz";
+ sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348";
+ };
+ }
+ {
+ name = "ansi_escapes___ansi_escapes_4.3.1.tgz";
+ path = fetchurl {
+ name = "ansi_escapes___ansi_escapes_4.3.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
+ sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61";
+ };
+ }
+ {
+ name = "ansi_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.1.tgz";
+ path = fetchurl {
+ name = "anymatch___anymatch_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz";
+ sha1 = "c55ecf02185e2469259399310c173ce31233b142";
+ };
+ }
+ {
+ name = "app_builder_bin___app_builder_bin_3.5.10.tgz";
+ path = fetchurl {
+ name = "app_builder_bin___app_builder_bin_3.5.10.tgz";
+ url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz";
+ sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d";
+ };
+ }
+ {
+ name = "app_builder_lib___app_builder_lib_22.9.1.tgz";
+ path = fetchurl {
+ name = "app_builder_lib___app_builder_lib_22.9.1.tgz";
+ url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz";
+ sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c";
+ };
+ }
+ {
+ name = "archiver_utils___archiver_utils_2.1.0.tgz";
+ path = fetchurl {
+ name = "archiver_utils___archiver_utils_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz";
+ sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2";
+ };
+ }
+ {
+ name = "archiver___archiver_5.1.0.tgz";
+ path = fetchurl {
+ name = "archiver___archiver_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz";
+ sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37";
+ };
+ }
+ {
+ 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 = "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_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 = "asn1___asn1_0.2.4.tgz";
+ path = fetchurl {
+ name = "asn1___asn1_0.2.4.tgz";
+ url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz";
+ sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136";
+ };
+ }
+ {
+ name = "assert_plus___assert_plus_1.0.0.tgz";
+ path = fetchurl {
+ name = "assert_plus___assert_plus_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz";
+ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+ };
+ }
+ {
+ name = "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 = "astral_regex___astral_regex_1.0.0.tgz";
+ path = fetchurl {
+ name = "astral_regex___astral_regex_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz";
+ sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
+ };
+ }
+ {
+ name = "async_exit_hook___async_exit_hook_2.0.1.tgz";
+ path = fetchurl {
+ name = "async_exit_hook___async_exit_hook_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz";
+ sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3";
+ };
+ }
+ {
+ name = "async___async_0.9.2.tgz";
+ path = fetchurl {
+ name = "async___async_0.9.2.tgz";
+ url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz";
+ sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+ };
+ }
+ {
+ name = "async___async_3.2.0.tgz";
+ path = fetchurl {
+ name = "async___async_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz";
+ sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720";
+ };
+ }
+ {
+ name = "asynckit___asynckit_0.4.0.tgz";
+ path = fetchurl {
+ name = "asynckit___asynckit_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz";
+ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+ };
+ }
+ {
+ name = "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 = "aws_sign2___aws_sign2_0.7.0.tgz";
+ path = fetchurl {
+ name = "aws_sign2___aws_sign2_0.7.0.tgz";
+ url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz";
+ sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+ };
+ }
+ {
+ name = "aws4___aws4_1.11.0.tgz";
+ path = fetchurl {
+ name = "aws4___aws4_1.11.0.tgz";
+ url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz";
+ sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59";
+ };
+ }
+ {
+ name = "babel_jest___babel_jest_26.6.3.tgz";
+ path = fetchurl {
+ name = "babel_jest___babel_jest_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz";
+ sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056";
+ };
+ }
+ {
+ name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz";
+ path = fetchurl {
+ name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz";
+ sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765";
+ };
+ }
+ {
+ name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz";
+ path = fetchurl {
+ name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz";
+ sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d";
+ };
+ }
+ {
+ name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz";
+ path = fetchurl {
+ name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz";
+ sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77";
+ };
+ }
+ {
+ name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz";
+ path = fetchurl {
+ name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz";
+ sha1 = "747872b1171df032252426586881d62d31798fee";
+ };
+ }
+ {
+ name = "balanced_match___balanced_match_1.0.0.tgz";
+ path = fetchurl {
+ name = "balanced_match___balanced_match_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ }
+ {
+ name = "base64_js___base64_js_1.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 = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+ path = fetchurl {
+ name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+ };
+ }
+ {
+ name = "bl___bl_4.0.3.tgz";
+ path = fetchurl {
+ name = "bl___bl_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz";
+ sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489";
+ };
+ }
+ {
+ name = "bluebird_lst___bluebird_lst_1.0.9.tgz";
+ path = fetchurl {
+ name = "bluebird_lst___bluebird_lst_1.0.9.tgz";
+ url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz";
+ sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c";
+ };
+ }
+ {
+ 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 = "boolean___boolean_3.0.2.tgz";
+ path = fetchurl {
+ name = "boolean___boolean_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz";
+ sha1 = "df1baa18b6a2b0e70840475e1d93ec8fe75b2570";
+ };
+ }
+ {
+ name = "boxen___boxen_4.2.0.tgz";
+ path = fetchurl {
+ name = "boxen___boxen_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz";
+ sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64";
+ };
+ }
+ {
+ 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 = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
+ path = fetchurl {
+ name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+ sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626";
+ };
+ }
+ {
+ name = "bser___bser_2.1.1.tgz";
+ path = fetchurl {
+ name = "bser___bser_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz";
+ sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05";
+ };
+ }
+ {
+ name = "buffer_crc32___buffer_crc32_0.2.13.tgz";
+ path = fetchurl {
+ name = "buffer_crc32___buffer_crc32_0.2.13.tgz";
+ url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+ sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
+ };
+ }
+ {
+ 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___buffer_5.7.1.tgz";
+ path = fetchurl {
+ name = "buffer___buffer_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz";
+ sha1 = "ba62e7c13133053582197160851a8f648e99eed0";
+ };
+ }
+ {
+ name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz";
+ path = fetchurl {
+ name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz";
+ url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz";
+ sha1 = "d93afc71428a12789b437e13850e1fa7da956d72";
+ };
+ }
+ {
+ name = "builder_util___builder_util_22.9.1.tgz";
+ path = fetchurl {
+ name = "builder_util___builder_util_22.9.1.tgz";
+ url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz";
+ sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af";
+ };
+ }
+ {
+ 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 = "cacheable_request___cacheable_request_6.1.0.tgz";
+ path = fetchurl {
+ name = "cacheable_request___cacheable_request_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz";
+ sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912";
+ };
+ }
+ {
+ name = "callsites___callsites_3.1.0.tgz";
+ path = fetchurl {
+ name = "callsites___callsites_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz";
+ sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73";
+ };
+ }
+ {
+ name = "camelcase___camelcase_5.3.1.tgz";
+ path = fetchurl {
+ name = "camelcase___camelcase_5.3.1.tgz";
+ url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz";
+ sha1 = "e3c9b31569e106811df242f715725a1f4c494320";
+ };
+ }
+ {
+ name = "camelcase___camelcase_6.2.0.tgz";
+ path = fetchurl {
+ name = "camelcase___camelcase_6.2.0.tgz";
+ url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz";
+ sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809";
+ };
+ }
+ {
+ name = "capture_exit___capture_exit_2.0.0.tgz";
+ path = fetchurl {
+ name = "capture_exit___capture_exit_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz";
+ sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4";
+ };
+ }
+ {
+ name = "caseless___caseless_0.12.0.tgz";
+ path = fetchurl {
+ name = "caseless___caseless_0.12.0.tgz";
+ url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz";
+ sha1 = "1b681c21ff84033c826543090689420d187151dc";
+ };
+ }
+ {
+ name = "chalk___chalk_2.4.2.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_2.4.2.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+ };
+ }
+ {
+ name = "chalk___chalk_3.0.0.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
+ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
+ };
+ }
+ {
+ name = "chalk___chalk_4.1.0.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz";
+ sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a";
+ };
+ }
+ {
+ name = "char_regex___char_regex_1.0.2.tgz";
+ path = fetchurl {
+ name = "char_regex___char_regex_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz";
+ sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf";
+ };
+ }
+ {
+ name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz";
+ path = fetchurl {
+ name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz";
+ url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz";
+ sha1 = "04a106672c18b085ab774d983dfa3ea138f22205";
+ };
+ }
+ {
+ name = "ci_info___ci_info_2.0.0.tgz";
+ path = fetchurl {
+ name = "ci_info___ci_info_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz";
+ sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46";
+ };
+ }
+ {
+ name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz";
+ path = fetchurl {
+ name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz";
+ url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz";
+ sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f";
+ };
+ }
+ {
+ name = "class_utils___class_utils_0.3.6.tgz";
+ path = fetchurl {
+ name = "class_utils___class_utils_0.3.6.tgz";
+ url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz";
+ sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463";
+ };
+ }
+ {
+ name = "cli_boxes___cli_boxes_2.2.1.tgz";
+ path = fetchurl {
+ name = "cli_boxes___cli_boxes_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz";
+ sha1 = "ddd5035d25094fce220e9cab40a45840a440318f";
+ };
+ }
+ {
+ name = "cliui___cliui_6.0.0.tgz";
+ path = fetchurl {
+ name = "cliui___cliui_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz";
+ sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1";
+ };
+ }
+ {
+ name = "cliui___cliui_7.0.4.tgz";
+ path = fetchurl {
+ name = "cliui___cliui_7.0.4.tgz";
+ url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz";
+ sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f";
+ };
+ }
+ {
+ name = "clone_response___clone_response_1.0.2.tgz";
+ path = fetchurl {
+ name = "clone_response___clone_response_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz";
+ sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
+ };
+ }
+ {
+ name = "co___co_4.6.0.tgz";
+ path = fetchurl {
+ name = "co___co_4.6.0.tgz";
+ url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz";
+ sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+ };
+ }
+ {
+ name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz";
+ path = fetchurl {
+ name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz";
+ sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59";
+ };
+ }
+ {
+ name = "collection_visit___collection_visit_1.0.0.tgz";
+ path = fetchurl {
+ name = "collection_visit___collection_visit_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz";
+ sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+ };
+ }
+ {
+ name = "color_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 = "combined_stream___combined_stream_1.0.8.tgz";
+ path = fetchurl {
+ name = "combined_stream___combined_stream_1.0.8.tgz";
+ url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz";
+ sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f";
+ };
+ }
+ {
+ name = "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 = "compress_commons___compress_commons_4.0.2.tgz";
+ path = fetchurl {
+ name = "compress_commons___compress_commons_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz";
+ sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7";
+ };
+ }
+ {
+ 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 = "config_chain___config_chain_1.1.12.tgz";
+ path = fetchurl {
+ name = "config_chain___config_chain_1.1.12.tgz";
+ url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz";
+ sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa";
+ };
+ }
+ {
+ name = "configstore___configstore_5.0.1.tgz";
+ path = fetchurl {
+ name = "configstore___configstore_5.0.1.tgz";
+ url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz";
+ sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96";
+ };
+ }
+ {
+ 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_descriptor___copy_descriptor_0.1.1.tgz";
+ path = fetchurl {
+ name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
+ url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+ sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+ };
+ }
+ {
+ name = "core_js___core_js_3.8.1.tgz";
+ path = fetchurl {
+ name = "core_js___core_js_3.8.1.tgz";
+ url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz";
+ sha1 = "f51523668ac8a294d1285c3b9db44025fda66d47";
+ };
+ }
+ {
+ 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 = "crc_32___crc_32_1.2.0.tgz";
+ path = fetchurl {
+ name = "crc_32___crc_32_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz";
+ sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208";
+ };
+ }
+ {
+ name = "crc32_stream___crc32_stream_4.0.1.tgz";
+ path = fetchurl {
+ name = "crc32_stream___crc32_stream_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz";
+ sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067";
+ };
+ }
+ {
+ 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_random_string___crypto_random_string_2.0.0.tgz";
+ path = fetchurl {
+ name = "crypto_random_string___crypto_random_string_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz";
+ sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5";
+ };
+ }
+ {
+ name = "cssom___cssom_0.4.4.tgz";
+ path = fetchurl {
+ name = "cssom___cssom_0.4.4.tgz";
+ url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz";
+ sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10";
+ };
+ }
+ {
+ name = "cssom___cssom_0.3.8.tgz";
+ path = fetchurl {
+ name = "cssom___cssom_0.3.8.tgz";
+ url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
+ sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
+ };
+ }
+ {
+ name = "cssstyle___cssstyle_2.3.0.tgz";
+ path = fetchurl {
+ name = "cssstyle___cssstyle_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz";
+ sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852";
+ };
+ }
+ {
+ name = "darkreader___darkreader_4.9.26.tgz";
+ path = fetchurl {
+ name = "darkreader___darkreader_4.9.26.tgz";
+ url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz";
+ sha1 = "ad92139742f22fc406ae14d12ec6e5672a7eedde";
+ };
+ }
+ {
+ name = "dashdash___dashdash_1.14.1.tgz";
+ path = fetchurl {
+ name = "dashdash___dashdash_1.14.1.tgz";
+ url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz";
+ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+ };
+ }
+ {
+ name = "data_urls___data_urls_2.0.0.tgz";
+ path = fetchurl {
+ name = "data_urls___data_urls_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz";
+ sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b";
+ };
+ }
+ {
+ name = "debug___debug_2.6.9.tgz";
+ path = fetchurl {
+ name = "debug___debug_2.6.9.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz";
+ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
+ };
+ }
+ {
+ name = "debug___debug_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___decamelize_1.2.0.tgz";
+ path = fetchurl {
+ name = "decamelize___decamelize_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz";
+ sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+ };
+ }
+ {
+ name = "decimal.js___decimal.js_10.2.1.tgz";
+ path = fetchurl {
+ name = "decimal.js___decimal.js_10.2.1.tgz";
+ url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz";
+ sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3";
+ };
+ }
+ {
+ name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+ path = fetchurl {
+ name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+ url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+ sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+ };
+ }
+ {
+ name = "decompress_response___decompress_response_3.3.0.tgz";
+ path = fetchurl {
+ name = "decompress_response___decompress_response_3.3.0.tgz";
+ url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz";
+ sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+ };
+ }
+ {
+ name = "deep_extend___deep_extend_0.6.0.tgz";
+ path = fetchurl {
+ name = "deep_extend___deep_extend_0.6.0.tgz";
+ url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz";
+ sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac";
+ };
+ }
+ {
+ name = "deep_is___deep_is_0.1.3.tgz";
+ path = fetchurl {
+ name = "deep_is___deep_is_0.1.3.tgz";
+ url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz";
+ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+ };
+ }
+ {
+ name = "deepmerge___deepmerge_4.2.2.tgz";
+ path = fetchurl {
+ name = "deepmerge___deepmerge_4.2.2.tgz";
+ url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz";
+ sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955";
+ };
+ }
+ {
+ name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+ path = fetchurl {
+ name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
+ sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591";
+ };
+ }
+ {
+ 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 = "delayed_stream___delayed_stream_1.0.0.tgz";
+ path = fetchurl {
+ name = "delayed_stream___delayed_stream_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz";
+ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+ };
+ }
+ {
+ name = "detect_newline___detect_newline_3.1.0.tgz";
+ path = fetchurl {
+ name = "detect_newline___detect_newline_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz";
+ sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651";
+ };
+ }
+ {
+ name = "detect_node___detect_node_2.0.4.tgz";
+ path = fetchurl {
+ name = "detect_node___detect_node_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz";
+ sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c";
+ };
+ }
+ {
+ name = "diff_sequences___diff_sequences_26.6.2.tgz";
+ path = fetchurl {
+ name = "diff_sequences___diff_sequences_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz";
+ sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1";
+ };
+ }
+ {
+ name = "dmg_builder___dmg_builder_22.9.1.tgz";
+ path = fetchurl {
+ name = "dmg_builder___dmg_builder_22.9.1.tgz";
+ url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz";
+ sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f";
+ };
+ }
+ {
+ 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 = "domexception___domexception_2.0.1.tgz";
+ path = fetchurl {
+ name = "domexception___domexception_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz";
+ sha1 = "fb44aefba793e1574b0af6aed2801d057529f304";
+ };
+ }
+ {
+ name = "dot_prop___dot_prop_5.3.0.tgz";
+ path = fetchurl {
+ name = "dot_prop___dot_prop_5.3.0.tgz";
+ url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz";
+ sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88";
+ };
+ }
+ {
+ name = "dotenv_expand___dotenv_expand_5.1.0.tgz";
+ path = fetchurl {
+ name = "dotenv_expand___dotenv_expand_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz";
+ sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0";
+ };
+ }
+ {
+ name = "dotenv___dotenv_8.2.0.tgz";
+ path = fetchurl {
+ name = "dotenv___dotenv_8.2.0.tgz";
+ url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz";
+ sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a";
+ };
+ }
+ {
+ name = "duplexer3___duplexer3_0.1.4.tgz";
+ path = fetchurl {
+ name = "duplexer3___duplexer3_0.1.4.tgz";
+ url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz";
+ sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+ };
+ }
+ {
+ name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+ path = fetchurl {
+ name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+ sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+ };
+ }
+ {
+ name = "ejs___ejs_3.1.5.tgz";
+ path = fetchurl {
+ name = "ejs___ejs_3.1.5.tgz";
+ url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz";
+ sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b";
+ };
+ }
+ {
+ name = "electron_builder___electron_builder_22.9.1.tgz";
+ path = fetchurl {
+ name = "electron_builder___electron_builder_22.9.1.tgz";
+ url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz";
+ sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60";
+ };
+ }
+ {
+ name = "electron_publish___electron_publish_22.9.1.tgz";
+ path = fetchurl {
+ name = "electron_publish___electron_publish_22.9.1.tgz";
+ url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz";
+ sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e";
+ };
+ }
+ {
+ name = "electron___electron_11.1.0.tgz";
+ path = fetchurl {
+ name = "electron___electron_11.1.0.tgz";
+ url = "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz";
+ sha1 = "8dfdf579d1eb79feef3e3d2937fc022e72129c90";
+ };
+ }
+ {
+ name = "emittery___emittery_0.7.2.tgz";
+ path = fetchurl {
+ name = "emittery___emittery_0.7.2.tgz";
+ url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz";
+ sha1 = "25595908e13af0f5674ab419396e2fb394cdfa82";
+ };
+ }
+ {
+ 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 = "encodeurl___encodeurl_1.0.2.tgz";
+ path = fetchurl {
+ name = "encodeurl___encodeurl_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
+ sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+ };
+ }
+ {
+ name = "end_of_stream___end_of_stream_1.4.4.tgz";
+ path = fetchurl {
+ name = "end_of_stream___end_of_stream_1.4.4.tgz";
+ url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz";
+ sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0";
+ };
+ }
+ {
+ name = "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 = "env_paths___env_paths_2.2.0.tgz";
+ path = fetchurl {
+ name = "env_paths___env_paths_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz";
+ sha1 = "cdca557dc009152917d6166e2febe1f039685e43";
+ };
+ }
+ {
+ 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 = "es6_error___es6_error_4.1.1.tgz";
+ path = fetchurl {
+ name = "es6_error___es6_error_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz";
+ sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d";
+ };
+ }
+ {
+ 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_goat___escape_goat_2.1.1.tgz";
+ path = fetchurl {
+ name = "escape_goat___escape_goat_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz";
+ sha1 = "1b2dc77003676c457ec760b2dc68edb648188675";
+ };
+ }
+ {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+ };
+ }
+ {
+ name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz";
+ sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344";
+ };
+ }
+ {
+ name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
+ path = fetchurl {
+ name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
+ sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34";
+ };
+ }
+ {
+ name = "escodegen___escodegen_1.14.3.tgz";
+ path = fetchurl {
+ name = "escodegen___escodegen_1.14.3.tgz";
+ url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz";
+ sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503";
+ };
+ }
+ {
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
+ path = fetchurl {
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz";
+ sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c";
+ };
+ }
+ {
+ name = "eslint_utils___eslint_utils_2.1.0.tgz";
+ path = fetchurl {
+ name = "eslint_utils___eslint_utils_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz";
+ sha1 = "d2de5e03424e707dc10c74068ddedae708741b27";
+ };
+ }
+ {
+ name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+ path = fetchurl {
+ name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+ sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e";
+ };
+ }
+ {
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
+ path = fetchurl {
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
+ sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8";
+ };
+ }
+ {
+ name = "eslint___eslint_7.15.0.tgz";
+ path = fetchurl {
+ name = "eslint___eslint_7.15.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz";
+ sha1 = "eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7";
+ };
+ }
+ {
+ name = "espree___espree_7.3.1.tgz";
+ path = fetchurl {
+ name = "espree___espree_7.3.1.tgz";
+ url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz";
+ sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6";
+ };
+ }
+ {
+ name = "esprima___esprima_4.0.1.tgz";
+ path = fetchurl {
+ name = "esprima___esprima_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz";
+ sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71";
+ };
+ }
+ {
+ name = "esquery___esquery_1.3.1.tgz";
+ path = fetchurl {
+ name = "esquery___esquery_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz";
+ sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57";
+ };
+ }
+ {
+ 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 = "exec_sh___exec_sh_0.3.4.tgz";
+ path = fetchurl {
+ name = "exec_sh___exec_sh_0.3.4.tgz";
+ url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz";
+ sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5";
+ };
+ }
+ {
+ name = "execa___execa_1.0.0.tgz";
+ path = fetchurl {
+ name = "execa___execa_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz";
+ sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8";
+ };
+ }
+ {
+ name = "execa___execa_4.1.0.tgz";
+ path = fetchurl {
+ name = "execa___execa_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz";
+ sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a";
+ };
+ }
+ {
+ name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz";
+ path = fetchurl {
+ name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
+ sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
+ };
+ }
+ {
+ name = "exit___exit_0.1.2.tgz";
+ path = fetchurl {
+ name = "exit___exit_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz";
+ sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+ };
+ }
+ {
+ name = "expand_brackets___expand_brackets_2.1.4.tgz";
+ path = fetchurl {
+ name = "expand_brackets___expand_brackets_2.1.4.tgz";
+ url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz";
+ sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+ };
+ }
+ {
+ name = "expect___expect_26.6.2.tgz";
+ path = fetchurl {
+ name = "expect___expect_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz";
+ sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417";
+ };
+ }
+ {
+ name = "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 = "extract_zip___extract_zip_1.7.0.tgz";
+ path = fetchurl {
+ name = "extract_zip___extract_zip_1.7.0.tgz";
+ url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz";
+ sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927";
+ };
+ }
+ {
+ name = "extsprintf___extsprintf_1.3.0.tgz";
+ path = fetchurl {
+ name = "extsprintf___extsprintf_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz";
+ sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+ };
+ }
+ {
+ name = "extsprintf___extsprintf_1.4.0.tgz";
+ path = fetchurl {
+ name = "extsprintf___extsprintf_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz";
+ sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f";
+ };
+ }
+ {
+ name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
+ path = fetchurl {
+ name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
+ url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+ sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525";
+ };
+ }
+ {
+ name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+ path = fetchurl {
+ name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+ sha1 = "874bf69c6f404c2b5d99c481341399fd55892633";
+ };
+ }
+ {
+ name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+ path = fetchurl {
+ name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+ };
+ }
+ {
+ name = "fb_watchman___fb_watchman_2.0.1.tgz";
+ path = fetchurl {
+ name = "fb_watchman___fb_watchman_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz";
+ sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85";
+ };
+ }
+ {
+ name = "fd_slicer___fd_slicer_1.1.0.tgz";
+ path = fetchurl {
+ name = "fd_slicer___fd_slicer_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz";
+ sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e";
+ };
+ }
+ {
+ name = "file_entry_cache___file_entry_cache_6.0.0.tgz";
+ path = fetchurl {
+ name = "file_entry_cache___file_entry_cache_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
+ sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a";
+ };
+ }
+ {
+ name = "filelist___filelist_1.0.1.tgz";
+ path = fetchurl {
+ name = "filelist___filelist_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz";
+ sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb";
+ };
+ }
+ {
+ 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_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 = "flat_cache___flat_cache_3.0.4.tgz";
+ path = fetchurl {
+ name = "flat_cache___flat_cache_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz";
+ sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11";
+ };
+ }
+ {
+ name = "flatted___flatted_3.1.0.tgz";
+ path = fetchurl {
+ name = "flatted___flatted_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz";
+ sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067";
+ };
+ }
+ {
+ name = "for_in___for_in_1.0.2.tgz";
+ path = fetchurl {
+ name = "for_in___for_in_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz";
+ sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
+ };
+ }
+ {
+ name = "forever_agent___forever_agent_0.6.1.tgz";
+ path = fetchurl {
+ name = "forever_agent___forever_agent_0.6.1.tgz";
+ url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz";
+ sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+ };
+ }
+ {
+ name = "form_data___form_data_2.3.3.tgz";
+ path = fetchurl {
+ name = "form_data___form_data_2.3.3.tgz";
+ url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz";
+ sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6";
+ };
+ }
+ {
+ name = "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 = "fs_constants___fs_constants_1.0.0.tgz";
+ path = fetchurl {
+ name = "fs_constants___fs_constants_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz";
+ sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad";
+ };
+ }
+ {
+ name = "fs_extra___fs_extra_8.1.0.tgz";
+ path = fetchurl {
+ name = "fs_extra___fs_extra_8.1.0.tgz";
+ url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz";
+ sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0";
+ };
+ }
+ {
+ name = "fs_extra___fs_extra_9.0.1.tgz";
+ path = fetchurl {
+ name = "fs_extra___fs_extra_9.0.1.tgz";
+ url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz";
+ sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc";
+ };
+ }
+ {
+ 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_2.2.1.tgz";
+ path = fetchurl {
+ name = "fsevents___fsevents_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz";
+ sha1 = "1fb02ded2036a8ac288d507a65962bd87b97628d";
+ };
+ }
+ {
+ 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_package_type___get_package_type_0.1.0.tgz";
+ path = fetchurl {
+ name = "get_package_type___get_package_type_0.1.0.tgz";
+ url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz";
+ sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a";
+ };
+ }
+ {
+ name = "get_stream___get_stream_4.1.0.tgz";
+ path = fetchurl {
+ name = "get_stream___get_stream_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz";
+ sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5";
+ };
+ }
+ {
+ name = "get_stream___get_stream_5.2.0.tgz";
+ path = fetchurl {
+ name = "get_stream___get_stream_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz";
+ sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3";
+ };
+ }
+ {
+ name = "get_value___get_value_2.0.6.tgz";
+ path = fetchurl {
+ name = "get_value___get_value_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz";
+ sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+ };
+ }
+ {
+ name = "getpass___getpass_0.1.7.tgz";
+ path = fetchurl {
+ name = "getpass___getpass_0.1.7.tgz";
+ url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz";
+ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+ };
+ }
+ {
+ name = "glob_parent___glob_parent_5.1.1.tgz";
+ path = fetchurl {
+ name = "glob_parent___glob_parent_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz";
+ sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229";
+ };
+ }
+ {
+ name = "glob___glob_7.1.6.tgz";
+ path = fetchurl {
+ name = "glob___glob_7.1.6.tgz";
+ url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
+ sha1 = "141f33b81a7c2492e125594307480c46679278a6";
+ };
+ }
+ {
+ name = "global_agent___global_agent_2.1.12.tgz";
+ path = fetchurl {
+ name = "global_agent___global_agent_2.1.12.tgz";
+ url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz";
+ sha1 = "e4ae3812b731a9e81cbf825f9377ef450a8e4195";
+ };
+ }
+ {
+ name = "global_dirs___global_dirs_2.0.1.tgz";
+ path = fetchurl {
+ name = "global_dirs___global_dirs_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz";
+ sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201";
+ };
+ }
+ {
+ name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
+ path = fetchurl {
+ name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
+ url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz";
+ sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f";
+ };
+ }
+ {
+ 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 = "globalthis___globalthis_1.0.1.tgz";
+ path = fetchurl {
+ name = "globalthis___globalthis_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz";
+ sha1 = "40116f5d9c071f9e8fb0037654df1ab3a83b7ef9";
+ };
+ }
+ {
+ name = "got___got_9.6.0.tgz";
+ path = fetchurl {
+ name = "got___got_9.6.0.tgz";
+ url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz";
+ sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85";
+ };
+ }
+ {
+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
+ path = fetchurl {
+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
+ url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
+ sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
+ };
+ }
+ {
+ name = "growly___growly_1.3.0.tgz";
+ path = fetchurl {
+ name = "growly___growly_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz";
+ sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081";
+ };
+ }
+ {
+ name = "har_schema___har_schema_2.0.0.tgz";
+ path = fetchurl {
+ name = "har_schema___har_schema_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz";
+ sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+ };
+ }
+ {
+ name = "har_validator___har_validator_5.1.5.tgz";
+ path = fetchurl {
+ name = "har_validator___har_validator_5.1.5.tgz";
+ url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz";
+ sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd";
+ };
+ }
+ {
+ name = "has_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_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_yarn___has_yarn_2.1.0.tgz";
+ path = fetchurl {
+ name = "has_yarn___has_yarn_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz";
+ sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77";
+ };
+ }
+ {
+ 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 = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+ path = fetchurl {
+ name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+ url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+ sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488";
+ };
+ }
+ {
+ name = "hosted_git_info___hosted_git_info_3.0.7.tgz";
+ path = fetchurl {
+ name = "hosted_git_info___hosted_git_info_3.0.7.tgz";
+ url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz";
+ sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c";
+ };
+ }
+ {
+ name = "html_comment_regex___html_comment_regex_1.1.2.tgz";
+ path = fetchurl {
+ name = "html_comment_regex___html_comment_regex_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz";
+ sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7";
+ };
+ }
+ {
+ name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
+ path = fetchurl {
+ name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz";
+ sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3";
+ };
+ }
+ {
+ name = "html_escaper___html_escaper_2.0.2.tgz";
+ path = fetchurl {
+ name = "html_escaper___html_escaper_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz";
+ sha1 = "dfd60027da36a36dfcbe236262c00a5822681453";
+ };
+ }
+ {
+ name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
+ path = fetchurl {
+ name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
+ sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390";
+ };
+ }
+ {
+ name = "http_signature___http_signature_1.2.0.tgz";
+ path = fetchurl {
+ name = "http_signature___http_signature_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz";
+ sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+ };
+ }
+ {
+ name = "human_signals___human_signals_1.1.1.tgz";
+ path = fetchurl {
+ name = "human_signals___human_signals_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz";
+ sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3";
+ };
+ }
+ {
+ name = "iconv_lite___iconv_lite_0.4.24.tgz";
+ path = fetchurl {
+ name = "iconv_lite___iconv_lite_0.4.24.tgz";
+ url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz";
+ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b";
+ };
+ }
+ {
+ name = "iconv_lite___iconv_lite_0.6.2.tgz";
+ path = fetchurl {
+ name = "iconv_lite___iconv_lite_0.6.2.tgz";
+ url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz";
+ sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01";
+ };
+ }
+ {
+ 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 = "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 = "import_fresh___import_fresh_3.2.2.tgz";
+ path = fetchurl {
+ name = "import_fresh___import_fresh_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz";
+ sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e";
+ };
+ }
+ {
+ name = "import_lazy___import_lazy_2.1.0.tgz";
+ path = fetchurl {
+ name = "import_lazy___import_lazy_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz";
+ sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+ };
+ }
+ {
+ name = "import_local___import_local_3.0.2.tgz";
+ path = fetchurl {
+ name = "import_local___import_local_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz";
+ sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6";
+ };
+ }
+ {
+ name = "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 = "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 = "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 = "ip_regex___ip_regex_2.1.0.tgz";
+ path = fetchurl {
+ name = "ip_regex___ip_regex_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz";
+ sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
+ };
+ }
+ {
+ name = "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_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_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_ci___is_ci_2.0.0.tgz";
+ path = fetchurl {
+ name = "is_ci___is_ci_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz";
+ sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c";
+ };
+ }
+ {
+ name = "is_core_module___is_core_module_2.2.0.tgz";
+ path = fetchurl {
+ name = "is_core_module___is_core_module_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz";
+ sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a";
+ };
+ }
+ {
+ 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_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_docker___is_docker_2.1.1.tgz";
+ path = fetchurl {
+ name = "is_docker___is_docker_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz";
+ sha1 = "4125a88e44e450d384e09047ede71adc2d144156";
+ };
+ }
+ {
+ name = "is_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_generator_fn___is_generator_fn_2.1.0.tgz";
+ path = fetchurl {
+ name = "is_generator_fn___is_generator_fn_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
+ sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118";
+ };
+ }
+ {
+ name = "is_glob___is_glob_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_installed_globally___is_installed_globally_0.3.2.tgz";
+ path = fetchurl {
+ name = "is_installed_globally___is_installed_globally_0.3.2.tgz";
+ url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz";
+ sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141";
+ };
+ }
+ {
+ name = "is_npm___is_npm_4.0.0.tgz";
+ path = fetchurl {
+ name = "is_npm___is_npm_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz";
+ sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d";
+ };
+ }
+ {
+ name = "is_number___is_number_3.0.0.tgz";
+ path = fetchurl {
+ name = "is_number___is_number_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz";
+ sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+ };
+ }
+ {
+ name = "is_number___is_number_7.0.0.tgz";
+ path = fetchurl {
+ name = "is_number___is_number_7.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz";
+ sha1 = "7535345b896734d5f80c4d06c50955527a14f12b";
+ };
+ }
+ {
+ name = "is_obj___is_obj_2.0.0.tgz";
+ path = fetchurl {
+ name = "is_obj___is_obj_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz";
+ sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982";
+ };
+ }
+ {
+ name = "is_path_inside___is_path_inside_3.0.2.tgz";
+ path = fetchurl {
+ name = "is_path_inside___is_path_inside_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz";
+ sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017";
+ };
+ }
+ {
+ name = "is_plain_object___is_plain_object_2.0.4.tgz";
+ path = fetchurl {
+ name = "is_plain_object___is_plain_object_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz";
+ sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+ };
+ }
+ {
+ name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
+ path = fetchurl {
+ name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz";
+ sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397";
+ };
+ }
+ {
+ name = "is_stream___is_stream_1.1.0.tgz";
+ path = fetchurl {
+ name = "is_stream___is_stream_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz";
+ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+ };
+ }
+ {
+ name = "is_stream___is_stream_2.0.0.tgz";
+ path = fetchurl {
+ name = "is_stream___is_stream_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz";
+ sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3";
+ };
+ }
+ {
+ name = "is_svg___is_svg_4.2.1.tgz";
+ path = fetchurl {
+ name = "is_svg___is_svg_4.2.1.tgz";
+ url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz";
+ sha1 = "095b496e345fec9211c2a7d5d021003e040d6f81";
+ };
+ }
+ {
+ 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_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_2.2.0.tgz";
+ path = fetchurl {
+ name = "is_wsl___is_wsl_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz";
+ sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271";
+ };
+ }
+ {
+ name = "is_yarn_global___is_yarn_global_0.3.0.tgz";
+ path = fetchurl {
+ name = "is_yarn_global___is_yarn_global_0.3.0.tgz";
+ url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz";
+ sha1 = "d502d3382590ea3004893746754c89139973e232";
+ };
+ }
+ {
+ 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 = "isbinaryfile___isbinaryfile_4.0.6.tgz";
+ path = fetchurl {
+ name = "isbinaryfile___isbinaryfile_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz";
+ sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b";
+ };
+ }
+ {
+ name = "isexe___isexe_2.0.0.tgz";
+ path = fetchurl {
+ name = "isexe___isexe_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz";
+ sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+ };
+ }
+ {
+ name = "isobject___isobject_2.1.0.tgz";
+ path = fetchurl {
+ name = "isobject___isobject_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz";
+ sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
+ };
+ }
+ {
+ name = "isobject___isobject_3.0.1.tgz";
+ path = fetchurl {
+ name = "isobject___isobject_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz";
+ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+ };
+ }
+ {
+ name = "isstream___isstream_0.1.2.tgz";
+ path = fetchurl {
+ name = "isstream___isstream_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz";
+ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+ };
+ }
+ {
+ name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz";
+ path = fetchurl {
+ name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz";
+ sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec";
+ };
+ }
+ {
+ name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz";
+ path = fetchurl {
+ name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz";
+ sha1 = "873c6fff897450118222774696a3f28902d77c1d";
+ };
+ }
+ {
+ name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz";
+ path = fetchurl {
+ name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+ sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6";
+ };
+ }
+ {
+ name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz";
+ path = fetchurl {
+ name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz";
+ sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9";
+ };
+ }
+ {
+ name = "istanbul_reports___istanbul_reports_3.0.2.tgz";
+ path = fetchurl {
+ name = "istanbul_reports___istanbul_reports_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz";
+ sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b";
+ };
+ }
+ {
+ name = "jake___jake_10.8.2.tgz";
+ path = fetchurl {
+ name = "jake___jake_10.8.2.tgz";
+ url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz";
+ sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b";
+ };
+ }
+ {
+ name = "jest_changed_files___jest_changed_files_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_changed_files___jest_changed_files_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz";
+ sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0";
+ };
+ }
+ {
+ name = "jest_cli___jest_cli_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_cli___jest_cli_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz";
+ sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a";
+ };
+ }
+ {
+ name = "jest_config___jest_config_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_config___jest_config_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz";
+ sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349";
+ };
+ }
+ {
+ name = "jest_diff___jest_diff_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_diff___jest_diff_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz";
+ sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394";
+ };
+ }
+ {
+ name = "jest_docblock___jest_docblock_26.0.0.tgz";
+ path = fetchurl {
+ name = "jest_docblock___jest_docblock_26.0.0.tgz";
+ url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz";
+ sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5";
+ };
+ }
+ {
+ name = "jest_each___jest_each_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_each___jest_each_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz";
+ sha1 = "02526438a77a67401c8a6382dfe5999952c167cb";
+ };
+ }
+ {
+ name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz";
+ sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e";
+ };
+ }
+ {
+ name = "jest_environment_node___jest_environment_node_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_environment_node___jest_environment_node_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz";
+ sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c";
+ };
+ }
+ {
+ name = "jest_get_type___jest_get_type_26.3.0.tgz";
+ path = fetchurl {
+ name = "jest_get_type___jest_get_type_26.3.0.tgz";
+ url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz";
+ sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0";
+ };
+ }
+ {
+ name = "jest_haste_map___jest_haste_map_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_haste_map___jest_haste_map_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz";
+ sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa";
+ };
+ }
+ {
+ name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz";
+ sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd";
+ };
+ }
+ {
+ name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz";
+ sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af";
+ };
+ }
+ {
+ name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz";
+ sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a";
+ };
+ }
+ {
+ name = "jest_message_util___jest_message_util_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_message_util___jest_message_util_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz";
+ sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07";
+ };
+ }
+ {
+ name = "jest_mock___jest_mock_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_mock___jest_mock_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz";
+ sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302";
+ };
+ }
+ {
+ name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
+ path = fetchurl {
+ name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz";
+ sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c";
+ };
+ }
+ {
+ name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
+ path = fetchurl {
+ name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
+ url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz";
+ sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28";
+ };
+ }
+ {
+ name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz";
+ sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6";
+ };
+ }
+ {
+ name = "jest_resolve___jest_resolve_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_resolve___jest_resolve_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz";
+ sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507";
+ };
+ }
+ {
+ name = "jest_runner___jest_runner_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_runner___jest_runner_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz";
+ sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159";
+ };
+ }
+ {
+ name = "jest_runtime___jest_runtime_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest_runtime___jest_runtime_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz";
+ sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b";
+ };
+ }
+ {
+ name = "jest_serializer___jest_serializer_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_serializer___jest_serializer_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz";
+ sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1";
+ };
+ }
+ {
+ name = "jest_snapshot___jest_snapshot_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_snapshot___jest_snapshot_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz";
+ sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84";
+ };
+ }
+ {
+ name = "jest_util___jest_util_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_util___jest_util_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz";
+ sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1";
+ };
+ }
+ {
+ name = "jest_validate___jest_validate_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_validate___jest_validate_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz";
+ sha1 = "23d380971587150467342911c3d7b4ac57ab20ec";
+ };
+ }
+ {
+ name = "jest_watcher___jest_watcher_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_watcher___jest_watcher_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz";
+ sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975";
+ };
+ }
+ {
+ name = "jest_worker___jest_worker_26.6.2.tgz";
+ path = fetchurl {
+ name = "jest_worker___jest_worker_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz";
+ sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed";
+ };
+ }
+ {
+ name = "jest___jest_26.6.3.tgz";
+ path = fetchurl {
+ name = "jest___jest_26.6.3.tgz";
+ url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz";
+ sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef";
+ };
+ }
+ {
+ name = "js_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 = "jsbn___jsbn_0.1.1.tgz";
+ path = fetchurl {
+ name = "jsbn___jsbn_0.1.1.tgz";
+ url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz";
+ sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+ };
+ }
+ {
+ name = "jsdom___jsdom_16.4.0.tgz";
+ path = fetchurl {
+ name = "jsdom___jsdom_16.4.0.tgz";
+ url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz";
+ sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb";
+ };
+ }
+ {
+ name = "jsesc___jsesc_2.5.2.tgz";
+ path = fetchurl {
+ name = "jsesc___jsesc_2.5.2.tgz";
+ url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz";
+ sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4";
+ };
+ }
+ {
+ name = "json_buffer___json_buffer_3.0.0.tgz";
+ path = fetchurl {
+ name = "json_buffer___json_buffer_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz";
+ sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
+ };
+ }
+ {
+ 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___json_schema_0.2.3.tgz";
+ path = fetchurl {
+ name = "json_schema___json_schema_0.2.3.tgz";
+ url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz";
+ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+ };
+ }
+ {
+ name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+ path = fetchurl {
+ name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+ sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+ };
+ }
+ {
+ name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+ path = fetchurl {
+ name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+ url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+ };
+ }
+ {
+ name = "json5___json5_2.1.3.tgz";
+ path = fetchurl {
+ name = "json5___json5_2.1.3.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
+ sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
+ };
+ }
+ {
+ name = "jsonfile___jsonfile_4.0.0.tgz";
+ path = fetchurl {
+ name = "jsonfile___jsonfile_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz";
+ sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+ };
+ }
+ {
+ name = "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 = "jsprim___jsprim_1.4.1.tgz";
+ path = fetchurl {
+ name = "jsprim___jsprim_1.4.1.tgz";
+ url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz";
+ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+ };
+ }
+ {
+ name = "keyv___keyv_3.1.0.tgz";
+ path = fetchurl {
+ name = "keyv___keyv_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz";
+ sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9";
+ };
+ }
+ {
+ name = "kind_of___kind_of_3.2.2.tgz";
+ path = fetchurl {
+ name = "kind_of___kind_of_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz";
+ sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+ };
+ }
+ {
+ name = "kind_of___kind_of_4.0.0.tgz";
+ path = fetchurl {
+ name = "kind_of___kind_of_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz";
+ sha1 = "20813df3d712928b207378691a45066fae72dd57";
+ };
+ }
+ {
+ name = "kind_of___kind_of_5.1.0.tgz";
+ path = fetchurl {
+ name = "kind_of___kind_of_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz";
+ sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d";
+ };
+ }
+ {
+ name = "kind_of___kind_of_6.0.3.tgz";
+ path = fetchurl {
+ name = "kind_of___kind_of_6.0.3.tgz";
+ url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+ sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
+ };
+ }
+ {
+ name = "kleur___kleur_3.0.3.tgz";
+ path = fetchurl {
+ name = "kleur___kleur_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz";
+ sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e";
+ };
+ }
+ {
+ name = "latest_version___latest_version_5.1.0.tgz";
+ path = fetchurl {
+ name = "latest_version___latest_version_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz";
+ sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face";
+ };
+ }
+ {
+ name = "lazy_val___lazy_val_1.0.4.tgz";
+ path = fetchurl {
+ name = "lazy_val___lazy_val_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz";
+ sha1 = "882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65";
+ };
+ }
+ {
+ name = "lazystream___lazystream_1.0.0.tgz";
+ path = fetchurl {
+ name = "lazystream___lazystream_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz";
+ sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
+ };
+ }
+ {
+ name = "leven___leven_3.1.0.tgz";
+ path = fetchurl {
+ name = "leven___leven_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz";
+ sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2";
+ };
+ }
+ {
+ name = "levn___levn_0.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 = "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.defaults___lodash.defaults_4.2.0.tgz";
+ path = fetchurl {
+ name = "lodash.defaults___lodash.defaults_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+ sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+ };
+ }
+ {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ path = fetchurl {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz";
+ sha1 = "9ccb4e505d486b91651345772885a2df27fd017c";
+ };
+ }
+ {
+ name = "lodash.flatten___lodash.flatten_4.4.0.tgz";
+ path = fetchurl {
+ name = "lodash.flatten___lodash.flatten_4.4.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+ sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+ };
+ }
+ {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ path = fetchurl {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+ };
+ }
+ {
+ name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+ path = fetchurl {
+ name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz";
+ sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
+ };
+ }
+ {
+ name = "lodash.union___lodash.union_4.6.0.tgz";
+ path = fetchurl {
+ name = "lodash.union___lodash.union_4.6.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz";
+ sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
+ };
+ }
+ {
+ name = "lodash___lodash_4.17.20.tgz";
+ path = fetchurl {
+ name = "lodash___lodash_4.17.20.tgz";
+ url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
+ sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
+ };
+ }
+ {
+ name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
+ path = fetchurl {
+ name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+ sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f";
+ };
+ }
+ {
+ name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
+ path = fetchurl {
+ name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz";
+ sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479";
+ };
+ }
+ {
+ 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 = "make_dir___make_dir_3.1.0.tgz";
+ path = fetchurl {
+ name = "make_dir___make_dir_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz";
+ sha1 = "415e967046b3a7f1d185277d84aa58203726a13f";
+ };
+ }
+ {
+ name = "makeerror___makeerror_1.0.11.tgz";
+ path = fetchurl {
+ name = "makeerror___makeerror_1.0.11.tgz";
+ url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz";
+ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+ };
+ }
+ {
+ name = "map_cache___map_cache_0.2.2.tgz";
+ path = fetchurl {
+ name = "map_cache___map_cache_0.2.2.tgz";
+ url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz";
+ sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+ };
+ }
+ {
+ name = "map_visit___map_visit_1.0.0.tgz";
+ path = fetchurl {
+ name = "map_visit___map_visit_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz";
+ sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+ };
+ }
+ {
+ name = "matcher___matcher_3.0.0.tgz";
+ path = fetchurl {
+ name = "matcher___matcher_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz";
+ sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca";
+ };
+ }
+ {
+ 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 = "micromatch___micromatch_3.1.10.tgz";
+ path = fetchurl {
+ name = "micromatch___micromatch_3.1.10.tgz";
+ url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz";
+ sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23";
+ };
+ }
+ {
+ name = "micromatch___micromatch_4.0.2.tgz";
+ path = fetchurl {
+ name = "micromatch___micromatch_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz";
+ sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259";
+ };
+ }
+ {
+ name = "mime_db___mime_db_1.44.0.tgz";
+ path = fetchurl {
+ name = "mime_db___mime_db_1.44.0.tgz";
+ url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz";
+ sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92";
+ };
+ }
+ {
+ name = "mime_types___mime_types_2.1.27.tgz";
+ path = fetchurl {
+ name = "mime_types___mime_types_2.1.27.tgz";
+ url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz";
+ sha1 = "47949f98e279ea53119f5722e0f34e529bec009f";
+ };
+ }
+ {
+ name = "mime___mime_2.4.6.tgz";
+ path = fetchurl {
+ name = "mime___mime_2.4.6.tgz";
+ url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz";
+ sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1";
+ };
+ }
+ {
+ name = "mimic_fn___mimic_fn_2.1.0.tgz";
+ path = fetchurl {
+ name = "mimic_fn___mimic_fn_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz";
+ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b";
+ };
+ }
+ {
+ name = "mimic_response___mimic_response_1.0.1.tgz";
+ path = fetchurl {
+ name = "mimic_response___mimic_response_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz";
+ sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b";
+ };
+ }
+ {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ path = fetchurl {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+ sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+ };
+ }
+ {
+ name = "minimist___minimist_1.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 = "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 = "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 = "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 = "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_int64___node_int64_0.4.0.tgz";
+ path = fetchurl {
+ name = "node_int64___node_int64_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz";
+ sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
+ };
+ }
+ {
+ name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+ path = fetchurl {
+ name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz";
+ sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40";
+ };
+ }
+ {
+ name = "node_notifier___node_notifier_8.0.0.tgz";
+ path = fetchurl {
+ name = "node_notifier___node_notifier_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz";
+ sha1 = "a7eee2d51da6d0f7ff5094bc7108c911240c1620";
+ };
+ }
+ {
+ name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+ path = fetchurl {
+ name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+ url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+ sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8";
+ };
+ }
+ {
+ name = "normalize_path___normalize_path_2.1.1.tgz";
+ path = fetchurl {
+ name = "normalize_path___normalize_path_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz";
+ sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+ };
+ }
+ {
+ name = "normalize_path___normalize_path_3.0.0.tgz";
+ path = fetchurl {
+ name = "normalize_path___normalize_path_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz";
+ sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65";
+ };
+ }
+ {
+ name = "normalize_url___normalize_url_4.5.0.tgz";
+ path = fetchurl {
+ name = "normalize_url___normalize_url_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz";
+ sha1 = "453354087e6ca96957bd8f5baf753f5982142129";
+ };
+ }
+ {
+ name = "npm_conf___npm_conf_1.1.3.tgz";
+ path = fetchurl {
+ name = "npm_conf___npm_conf_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz";
+ sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9";
+ };
+ }
+ {
+ name = "npm_run_path___npm_run_path_2.0.2.tgz";
+ path = fetchurl {
+ name = "npm_run_path___npm_run_path_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz";
+ sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+ };
+ }
+ {
+ name = "npm_run_path___npm_run_path_4.0.1.tgz";
+ path = fetchurl {
+ name = "npm_run_path___npm_run_path_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz";
+ sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea";
+ };
+ }
+ {
+ name = "nwsapi___nwsapi_2.2.0.tgz";
+ path = fetchurl {
+ name = "nwsapi___nwsapi_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz";
+ sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7";
+ };
+ }
+ {
+ name = "oauth_sign___oauth_sign_0.9.0.tgz";
+ path = fetchurl {
+ name = "oauth_sign___oauth_sign_0.9.0.tgz";
+ url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz";
+ sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455";
+ };
+ }
+ {
+ name = "object_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_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.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 = "once___once_1.4.0.tgz";
+ path = fetchurl {
+ name = "once___once_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ }
+ {
+ name = "onetime___onetime_5.1.2.tgz";
+ path = fetchurl {
+ name = "onetime___onetime_5.1.2.tgz";
+ url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz";
+ sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e";
+ };
+ }
+ {
+ name = "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 = "p_cancelable___p_cancelable_1.1.0.tgz";
+ path = fetchurl {
+ name = "p_cancelable___p_cancelable_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz";
+ sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc";
+ };
+ }
+ {
+ name = "p_each_series___p_each_series_2.2.0.tgz";
+ path = fetchurl {
+ name = "p_each_series___p_each_series_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz";
+ sha1 = "105ab0357ce72b202a8a8b94933672657b5e2a9a";
+ };
+ }
+ {
+ name = "p_finally___p_finally_1.0.0.tgz";
+ path = fetchurl {
+ name = "p_finally___p_finally_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz";
+ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+ };
+ }
+ {
+ name = "p_limit___p_limit_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_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_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 = "package_json___package_json_6.5.0.tgz";
+ path = fetchurl {
+ name = "package_json___package_json_6.5.0.tgz";
+ url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz";
+ sha1 = "6feedaca35e75725876d0b0e64974697fed145b0";
+ };
+ }
+ {
+ 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_json___parse_json_5.1.0.tgz";
+ path = fetchurl {
+ name = "parse_json___parse_json_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz";
+ sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646";
+ };
+ }
+ {
+ name = "parse5___parse5_5.1.1.tgz";
+ path = fetchurl {
+ name = "parse5___parse5_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz";
+ sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178";
+ };
+ }
+ {
+ name = "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_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 = "pend___pend_1.2.0.tgz";
+ path = fetchurl {
+ name = "pend___pend_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz";
+ sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+ };
+ }
+ {
+ name = "performance_now___performance_now_2.1.0.tgz";
+ path = fetchurl {
+ name = "performance_now___performance_now_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz";
+ sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+ };
+ }
+ {
+ name = "picomatch___picomatch_2.2.2.tgz";
+ path = fetchurl {
+ name = "picomatch___picomatch_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz";
+ sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad";
+ };
+ }
+ {
+ name = "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 = "pirates___pirates_4.0.1.tgz";
+ path = fetchurl {
+ name = "pirates___pirates_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz";
+ sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87";
+ };
+ }
+ {
+ name = "pkg_dir___pkg_dir_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 = "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 = "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_2.0.0.tgz";
+ path = fetchurl {
+ name = "prepend_http___prepend_http_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz";
+ sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
+ };
+ }
+ {
+ name = "pretty_format___pretty_format_26.6.2.tgz";
+ path = fetchurl {
+ name = "pretty_format___pretty_format_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz";
+ sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93";
+ };
+ }
+ {
+ name = "printj___printj_1.1.2.tgz";
+ path = fetchurl {
+ name = "printj___printj_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz";
+ sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222";
+ };
+ }
+ {
+ name = "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 = "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 = "prompts___prompts_2.4.0.tgz";
+ path = fetchurl {
+ name = "prompts___prompts_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz";
+ sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7";
+ };
+ }
+ {
+ name = "proto_list___proto_list_1.2.4.tgz";
+ path = fetchurl {
+ name = "proto_list___proto_list_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz";
+ sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+ };
+ }
+ {
+ name = "psl___psl_1.8.0.tgz";
+ path = fetchurl {
+ name = "psl___psl_1.8.0.tgz";
+ url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz";
+ sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24";
+ };
+ }
+ {
+ name = "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 = "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 = "pupa___pupa_2.1.1.tgz";
+ path = fetchurl {
+ name = "pupa___pupa_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz";
+ sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62";
+ };
+ }
+ {
+ name = "qs___qs_6.5.2.tgz";
+ path = fetchurl {
+ name = "qs___qs_6.5.2.tgz";
+ url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
+ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
+ };
+ }
+ {
+ name = "rc___rc_1.2.8.tgz";
+ path = fetchurl {
+ name = "rc___rc_1.2.8.tgz";
+ url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz";
+ sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed";
+ };
+ }
+ {
+ name = "react_is___react_is_17.0.1.tgz";
+ path = fetchurl {
+ name = "react_is___react_is_17.0.1.tgz";
+ url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz";
+ sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339";
+ };
+ }
+ {
+ name = "read_config_file___read_config_file_6.0.0.tgz";
+ path = fetchurl {
+ name = "read_config_file___read_config_file_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz";
+ sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299";
+ };
+ }
+ {
+ 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_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 = "readdir_glob___readdir_glob_1.1.1.tgz";
+ path = fetchurl {
+ name = "readdir_glob___readdir_glob_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz";
+ sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4";
+ };
+ }
+ {
+ 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 = "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 = "registry_auth_token___registry_auth_token_4.2.1.tgz";
+ path = fetchurl {
+ name = "registry_auth_token___registry_auth_token_4.2.1.tgz";
+ url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz";
+ sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250";
+ };
+ }
+ {
+ name = "registry_url___registry_url_5.1.0.tgz";
+ path = fetchurl {
+ name = "registry_url___registry_url_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz";
+ sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009";
+ };
+ }
+ {
+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+ path = fetchurl {
+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+ sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+ };
+ }
+ {
+ name = "repeat_element___repeat_element_1.1.3.tgz";
+ path = fetchurl {
+ name = "repeat_element___repeat_element_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz";
+ sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce";
+ };
+ }
+ {
+ name = "repeat_string___repeat_string_1.6.1.tgz";
+ path = fetchurl {
+ name = "repeat_string___repeat_string_1.6.1.tgz";
+ url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz";
+ sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+ };
+ }
+ {
+ name = "request_promise_core___request_promise_core_1.1.4.tgz";
+ path = fetchurl {
+ name = "request_promise_core___request_promise_core_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz";
+ sha1 = "3eedd4223208d419867b78ce815167d10593a22f";
+ };
+ }
+ {
+ name = "request_promise_native___request_promise_native_1.0.9.tgz";
+ path = fetchurl {
+ name = "request_promise_native___request_promise_native_1.0.9.tgz";
+ url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz";
+ sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28";
+ };
+ }
+ {
+ name = "request___request_2.88.2.tgz";
+ path = fetchurl {
+ name = "request___request_2.88.2.tgz";
+ url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz";
+ sha1 = "d73c918731cb5a87da047e207234146f664d12b3";
+ };
+ }
+ {
+ name = "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_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_3.0.0.tgz";
+ path = fetchurl {
+ name = "resolve_cwd___resolve_cwd_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz";
+ sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d";
+ };
+ }
+ {
+ name = "resolve_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_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.19.0.tgz";
+ path = fetchurl {
+ name = "resolve___resolve_1.19.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz";
+ sha1 = "1af5bf630409734a067cae29318aac7fa29a267c";
+ };
+ }
+ {
+ name = "responselike___responselike_1.0.2.tgz";
+ path = fetchurl {
+ name = "responselike___responselike_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz";
+ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+ };
+ }
+ {
+ 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 = "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 = "roarr___roarr_2.15.4.tgz";
+ path = fetchurl {
+ name = "roarr___roarr_2.15.4.tgz";
+ url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz";
+ sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd";
+ };
+ }
+ {
+ name = "rsvp___rsvp_4.8.5.tgz";
+ path = fetchurl {
+ name = "rsvp___rsvp_4.8.5.tgz";
+ url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz";
+ sha1 = "c8f155311d167f68f21e168df71ec5b083113734";
+ };
+ }
+ {
+ name = "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 = "sane___sane_4.1.0.tgz";
+ path = fetchurl {
+ name = "sane___sane_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz";
+ sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded";
+ };
+ }
+ {
+ name = "sanitize_filename___sanitize_filename_1.6.3.tgz";
+ path = fetchurl {
+ name = "sanitize_filename___sanitize_filename_1.6.3.tgz";
+ url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz";
+ sha1 = "755ebd752045931977e30b2025d340d7c9090378";
+ };
+ }
+ {
+ name = "sax___sax_1.2.4.tgz";
+ path = fetchurl {
+ name = "sax___sax_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz";
+ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
+ };
+ }
+ {
+ name = "saxes___saxes_5.0.1.tgz";
+ path = fetchurl {
+ name = "saxes___saxes_5.0.1.tgz";
+ url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz";
+ sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d";
+ };
+ }
+ {
+ name = "semver_compare___semver_compare_1.0.0.tgz";
+ path = fetchurl {
+ name = "semver_compare___semver_compare_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz";
+ sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc";
+ };
+ }
+ {
+ name = "semver_diff___semver_diff_3.1.1.tgz";
+ path = fetchurl {
+ name = "semver_diff___semver_diff_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz";
+ sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b";
+ };
+ }
+ {
+ 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_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.4.tgz";
+ path = fetchurl {
+ name = "semver___semver_7.3.4.tgz";
+ url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz";
+ sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97";
+ };
+ }
+ {
+ name = "serialize_error___serialize_error_7.0.1.tgz";
+ path = fetchurl {
+ name = "serialize_error___serialize_error_7.0.1.tgz";
+ url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz";
+ sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18";
+ };
+ }
+ {
+ 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 = "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 = "shellwords___shellwords_0.1.1.tgz";
+ path = fetchurl {
+ name = "shellwords___shellwords_0.1.1.tgz";
+ url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz";
+ sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b";
+ };
+ }
+ {
+ name = "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 = "sisteransi___sisteransi_1.0.5.tgz";
+ path = fetchurl {
+ name = "sisteransi___sisteransi_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz";
+ sha1 = "134d681297756437cc05ca01370d3a7a571075ed";
+ };
+ }
+ {
+ name = "slash___slash_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_2.1.0.tgz";
+ path = fetchurl {
+ name = "slice_ansi___slice_ansi_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz";
+ sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636";
+ };
+ }
+ {
+ 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 = "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.0.tgz";
+ path = fetchurl {
+ name = "source_map_url___source_map_url_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz";
+ sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+ };
+ }
+ {
+ name = "source_map___source_map_0.5.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.7.tgz";
+ path = fetchurl {
+ name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz";
+ url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+ sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65";
+ };
+ }
+ {
+ 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.1.2.tgz";
+ path = fetchurl {
+ name = "sprintf_js___sprintf_js_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz";
+ sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673";
+ };
+ }
+ {
+ name = "sprintf_js___sprintf_js_1.0.3.tgz";
+ path = fetchurl {
+ name = "sprintf_js___sprintf_js_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz";
+ sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+ };
+ }
+ {
+ name = "sshpk___sshpk_1.16.1.tgz";
+ path = fetchurl {
+ name = "sshpk___sshpk_1.16.1.tgz";
+ url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz";
+ sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
+ };
+ }
+ {
+ name = "stack_utils___stack_utils_2.0.3.tgz";
+ path = fetchurl {
+ name = "stack_utils___stack_utils_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz";
+ sha1 = "cd5f030126ff116b78ccb3c027fe302713b61277";
+ };
+ }
+ {
+ name = "stat_mode___stat_mode_1.0.0.tgz";
+ path = fetchurl {
+ name = "stat_mode___stat_mode_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz";
+ sha1 = "68b55cb61ea639ff57136f36b216a291800d1465";
+ };
+ }
+ {
+ 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 = "stealthy_require___stealthy_require_1.1.1.tgz";
+ path = fetchurl {
+ name = "stealthy_require___stealthy_require_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz";
+ sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
+ };
+ }
+ {
+ name = "string_length___string_length_4.0.1.tgz";
+ path = fetchurl {
+ name = "string_length___string_length_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz";
+ sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1";
+ };
+ }
+ {
+ name = "string_width___string_width_3.1.0.tgz";
+ path = fetchurl {
+ name = "string_width___string_width_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz";
+ sha1 = "22767be21b62af1081574306f69ac51b62203961";
+ };
+ }
+ {
+ name = "string_width___string_width_4.2.0.tgz";
+ path = fetchurl {
+ name = "string_width___string_width_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz";
+ sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
+ };
+ }
+ {
+ name = "string_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_4.0.0.tgz";
+ path = fetchurl {
+ name = "strip_bom___strip_bom_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz";
+ sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878";
+ };
+ }
+ {
+ name = "strip_eof___strip_eof_1.0.0.tgz";
+ path = fetchurl {
+ name = "strip_eof___strip_eof_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz";
+ sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+ };
+ }
+ {
+ name = "strip_final_newline___strip_final_newline_2.0.0.tgz";
+ path = fetchurl {
+ name = "strip_final_newline___strip_final_newline_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+ sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad";
+ };
+ }
+ {
+ name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
+ path = fetchurl {
+ name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+ sha1 = "31f1281b3832630434831c310c01cccda8cbe006";
+ };
+ }
+ {
+ name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
+ path = fetchurl {
+ name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+ sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+ };
+ }
+ {
+ name = "sumchecker___sumchecker_3.0.1.tgz";
+ path = fetchurl {
+ name = "sumchecker___sumchecker_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz";
+ sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42";
+ };
+ }
+ {
+ 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_7.2.0.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_7.2.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz";
+ sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da";
+ };
+ }
+ {
+ name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
+ path = fetchurl {
+ name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz";
+ sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47";
+ };
+ }
+ {
+ name = "symbol_tree___symbol_tree_3.2.4.tgz";
+ path = fetchurl {
+ name = "symbol_tree___symbol_tree_3.2.4.tgz";
+ url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz";
+ sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2";
+ };
+ }
+ {
+ name = "table___table_5.4.6.tgz";
+ path = fetchurl {
+ name = "table___table_5.4.6.tgz";
+ url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz";
+ sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e";
+ };
+ }
+ {
+ name = "tar_stream___tar_stream_2.1.4.tgz";
+ path = fetchurl {
+ name = "tar_stream___tar_stream_2.1.4.tgz";
+ url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz";
+ sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa";
+ };
+ }
+ {
+ name = "temp_file___temp_file_3.3.7.tgz";
+ path = fetchurl {
+ name = "temp_file___temp_file_3.3.7.tgz";
+ url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz";
+ sha1 = "686885d635f872748e384e871855958470aeb18a";
+ };
+ }
+ {
+ name = "term_size___term_size_2.2.1.tgz";
+ path = fetchurl {
+ name = "term_size___term_size_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz";
+ sha1 = "2a6a54840432c2fb6320fea0f415531e90189f54";
+ };
+ }
+ {
+ name = "terminal_link___terminal_link_2.1.1.tgz";
+ path = fetchurl {
+ name = "terminal_link___terminal_link_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz";
+ sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994";
+ };
+ }
+ {
+ name = "test_exclude___test_exclude_6.0.0.tgz";
+ path = fetchurl {
+ name = "test_exclude___test_exclude_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz";
+ sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e";
+ };
+ }
+ {
+ name = "text_table___text_table_0.2.0.tgz";
+ path = fetchurl {
+ name = "text_table___text_table_0.2.0.tgz";
+ url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz";
+ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+ };
+ }
+ {
+ name = "throat___throat_5.0.0.tgz";
+ path = fetchurl {
+ name = "throat___throat_5.0.0.tgz";
+ url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz";
+ sha1 = "c5199235803aad18754a667d659b5e72ce16764b";
+ };
+ }
+ {
+ name = "tldts_core___tldts_core_5.6.64.tgz";
+ path = fetchurl {
+ name = "tldts_core___tldts_core_5.6.64.tgz";
+ url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz";
+ sha1 = "0f80d0c9607d7583acc477a10dae7e62e7c08063";
+ };
+ }
+ {
+ name = "tldts_experimental___tldts_experimental_5.6.64.tgz";
+ path = fetchurl {
+ name = "tldts_experimental___tldts_experimental_5.6.64.tgz";
+ url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz";
+ sha1 = "f867449964d94c6a17a499335658f42a9fbdc7d3";
+ };
+ }
+ {
+ name = "tmpl___tmpl_1.0.4.tgz";
+ path = fetchurl {
+ name = "tmpl___tmpl_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz";
+ sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+ };
+ }
+ {
+ name = "to_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_readable_stream___to_readable_stream_1.0.0.tgz";
+ path = fetchurl {
+ name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
+ sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771";
+ };
+ }
+ {
+ 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 = "tough_cookie___tough_cookie_2.5.0.tgz";
+ path = fetchurl {
+ name = "tough_cookie___tough_cookie_2.5.0.tgz";
+ url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz";
+ sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2";
+ };
+ }
+ {
+ name = "tough_cookie___tough_cookie_3.0.1.tgz";
+ path = fetchurl {
+ name = "tough_cookie___tough_cookie_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz";
+ sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2";
+ };
+ }
+ {
+ name = "tr46___tr46_2.0.2.tgz";
+ path = fetchurl {
+ name = "tr46___tr46_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz";
+ sha1 = "03273586def1595ae08fedb38d7733cee91d2479";
+ };
+ }
+ {
+ name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz";
+ path = fetchurl {
+ name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz";
+ sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
+ };
+ }
+ {
+ name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+ path = fetchurl {
+ name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+ url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+ };
+ }
+ {
+ name = "tunnel___tunnel_0.0.6.tgz";
+ path = fetchurl {
+ name = "tunnel___tunnel_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz";
+ sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c";
+ };
+ }
+ {
+ name = "tweetnacl___tweetnacl_0.14.5.tgz";
+ path = fetchurl {
+ name = "tweetnacl___tweetnacl_0.14.5.tgz";
+ url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz";
+ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+ };
+ }
+ {
+ name = "type_check___type_check_0.4.0.tgz";
+ path = fetchurl {
+ name = "type_check___type_check_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz";
+ sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1";
+ };
+ }
+ {
+ name = "type_check___type_check_0.3.2.tgz";
+ path = fetchurl {
+ name = "type_check___type_check_0.3.2.tgz";
+ url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz";
+ sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+ };
+ }
+ {
+ name = "type_detect___type_detect_4.0.8.tgz";
+ path = fetchurl {
+ name = "type_detect___type_detect_4.0.8.tgz";
+ url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz";
+ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c";
+ };
+ }
+ {
+ name = "type_fest___type_fest_0.11.0.tgz";
+ path = fetchurl {
+ name = "type_fest___type_fest_0.11.0.tgz";
+ url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz";
+ sha1 = "97abf0872310fed88a5c466b25681576145e33f1";
+ };
+ }
+ {
+ name = "type_fest___type_fest_0.13.1.tgz";
+ path = fetchurl {
+ name = "type_fest___type_fest_0.13.1.tgz";
+ url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz";
+ sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934";
+ };
+ }
+ {
+ 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 = "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 = "unique_string___unique_string_2.0.0.tgz";
+ path = fetchurl {
+ name = "unique_string___unique_string_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz";
+ sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d";
+ };
+ }
+ {
+ name = "universalify___universalify_0.1.2.tgz";
+ path = fetchurl {
+ name = "universalify___universalify_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz";
+ sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66";
+ };
+ }
+ {
+ name = "universalify___universalify_1.0.0.tgz";
+ path = fetchurl {
+ name = "universalify___universalify_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz";
+ sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d";
+ };
+ }
+ {
+ 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 = "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 = "update_notifier___update_notifier_4.1.3.tgz";
+ path = fetchurl {
+ name = "update_notifier___update_notifier_4.1.3.tgz";
+ url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz";
+ sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3";
+ };
+ }
+ {
+ name = "uri_js___uri_js_4.4.0.tgz";
+ path = fetchurl {
+ name = "uri_js___uri_js_4.4.0.tgz";
+ url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz";
+ sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602";
+ };
+ }
+ {
+ name = "urix___urix_0.1.0.tgz";
+ path = fetchurl {
+ name = "urix___urix_0.1.0.tgz";
+ url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz";
+ sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+ };
+ }
+ {
+ name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
+ path = fetchurl {
+ name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
+ sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
+ };
+ }
+ {
+ 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 = "utf8_byte_length___utf8_byte_length_1.0.4.tgz";
+ path = fetchurl {
+ name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz";
+ sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61";
+ };
+ }
+ {
+ 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 = "uuid___uuid_3.4.0.tgz";
+ path = fetchurl {
+ name = "uuid___uuid_3.4.0.tgz";
+ url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+ sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
+ };
+ }
+ {
+ name = "uuid___uuid_8.3.2.tgz";
+ path = fetchurl {
+ name = "uuid___uuid_8.3.2.tgz";
+ url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz";
+ sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2";
+ };
+ }
+ {
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
+ path = fetchurl {
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132";
+ };
+ }
+ {
+ name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz";
+ path = fetchurl {
+ name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz";
+ url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz";
+ sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc";
+ };
+ }
+ {
+ name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+ path = fetchurl {
+ name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+ sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a";
+ };
+ }
+ {
+ name = "verror___verror_1.10.0.tgz";
+ path = fetchurl {
+ name = "verror___verror_1.10.0.tgz";
+ url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz";
+ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+ };
+ }
+ {
+ name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
+ path = fetchurl {
+ name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+ sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd";
+ };
+ }
+ {
+ name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+ path = fetchurl {
+ name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz";
+ sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a";
+ };
+ }
+ {
+ name = "walker___walker_1.0.7.tgz";
+ path = fetchurl {
+ name = "walker___walker_1.0.7.tgz";
+ url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz";
+ sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+ };
+ }
+ {
+ name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+ path = fetchurl {
+ name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+ url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
+ sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff";
+ };
+ }
+ {
+ name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+ path = fetchurl {
+ name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz";
+ sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514";
+ };
+ }
+ {
+ name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+ path = fetchurl {
+ name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
+ sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0";
+ };
+ }
+ {
+ name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+ path = fetchurl {
+ name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
+ sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf";
+ };
+ }
+ {
+ name = "whatwg_url___whatwg_url_8.4.0.tgz";
+ path = fetchurl {
+ name = "whatwg_url___whatwg_url_8.4.0.tgz";
+ url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz";
+ sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837";
+ };
+ }
+ {
+ 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 = "widest_line___widest_line_3.1.0.tgz";
+ path = fetchurl {
+ name = "widest_line___widest_line_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz";
+ sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca";
+ };
+ }
+ {
+ 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 = "wrap_ansi___wrap_ansi_6.2.0.tgz";
+ path = fetchurl {
+ name = "wrap_ansi___wrap_ansi_6.2.0.tgz";
+ url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz";
+ sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53";
+ };
+ }
+ {
+ name = "wrap_ansi___wrap_ansi_7.0.0.tgz";
+ path = fetchurl {
+ name = "wrap_ansi___wrap_ansi_7.0.0.tgz";
+ url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz";
+ sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43";
+ };
+ }
+ {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ path = fetchurl {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ }
+ {
+ name = "write_file_atomic___write_file_atomic_3.0.3.tgz";
+ path = fetchurl {
+ name = "write_file_atomic___write_file_atomic_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
+ sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8";
+ };
+ }
+ {
+ name = "ws___ws_7.4.1.tgz";
+ path = fetchurl {
+ name = "ws___ws_7.4.1.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz";
+ sha1 = "a333be02696bd0e54cea0434e21dcc8a9ac294bb";
+ };
+ }
+ {
+ name = "xdg_basedir___xdg_basedir_4.0.0.tgz";
+ path = fetchurl {
+ name = "xdg_basedir___xdg_basedir_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz";
+ sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13";
+ };
+ }
+ {
+ name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+ path = fetchurl {
+ name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
+ sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a";
+ };
+ }
+ {
+ name = "xmlchars___xmlchars_2.2.0.tgz";
+ path = fetchurl {
+ name = "xmlchars___xmlchars_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz";
+ sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb";
+ };
+ }
+ {
+ name = "y18n___y18n_4.0.1.tgz";
+ path = fetchurl {
+ name = "y18n___y18n_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz";
+ sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4";
+ };
+ }
+ {
+ name = "y18n___y18n_5.0.5.tgz";
+ path = fetchurl {
+ name = "y18n___y18n_5.0.5.tgz";
+ url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz";
+ sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18";
+ };
+ }
+ {
+ name = "yallist___yallist_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 = "yargs_parser___yargs_parser_18.1.3.tgz";
+ path = fetchurl {
+ name = "yargs_parser___yargs_parser_18.1.3.tgz";
+ url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz";
+ sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0";
+ };
+ }
+ {
+ name = "yargs_parser___yargs_parser_20.2.4.tgz";
+ path = fetchurl {
+ name = "yargs_parser___yargs_parser_20.2.4.tgz";
+ url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz";
+ sha1 = "b42890f14566796f85ae8e3a25290d205f154a54";
+ };
+ }
+ {
+ name = "yargs___yargs_15.4.1.tgz";
+ path = fetchurl {
+ name = "yargs___yargs_15.4.1.tgz";
+ url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz";
+ sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8";
+ };
+ }
+ {
+ name = "yargs___yargs_16.2.0.tgz";
+ path = fetchurl {
+ name = "yargs___yargs_16.2.0.tgz";
+ url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz";
+ sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66";
+ };
+ }
+ {
+ name = "yauzl___yauzl_2.10.0.tgz";
+ path = fetchurl {
+ name = "yauzl___yauzl_2.10.0.tgz";
+ url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz";
+ sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9";
+ };
+ }
+ {
+ name = "zip_stream___zip_stream_4.0.4.tgz";
+ path = fetchurl {
+ name = "zip_stream___zip_stream_4.0.4.tgz";
+ url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz";
+ sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a";
+ };
+ }
+ ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index aa4dd7f8e4..cf37a31ee4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
+{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat
@@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "3.4.2066.90-1";
+ version = "3.5.2115.73-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1";
+ sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz";
};
unpackPhase = ''
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
- stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
+ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index 981e555462..9aa0b6614b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
- version = "1.7.10";
+ version = "1.8.1";
commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "1vkdny88lmxkm3iw8qv5rrl0g5xwi16hfm2f6dga8i8xl555m78c";
+ sha256 = "1lz395nfvjzri3fnk0d9hiwlf7w01afbx4cpn2crdd3rlab105s4";
};
- vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl";
+ vendorSha256 = "1rd2wnsh95r1r5zb6xfav8gf7kkp68vzp295cv1iy3b71ak52ag1";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
index fb7d2e2d6a..e018422050 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cni-plugins";
- version = "0.8.7";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j";
+ sha256 = "1nkaspz96yglq1fr8a3xr39qmbs98pk7qpqav3cfd82qwbq7vs06";
};
vendorSha256 = null;
@@ -36,13 +36,14 @@ buildGoModule rec {
"plugins/meta/portmap"
"plugins/meta/sbr"
"plugins/meta/tuning"
+ "plugins/meta/vrf"
];
passthru.tests = { inherit (nixosTests) cri-o podman; };
meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team";
- homepage = "https://github.com/containernetworking/plugins";
+ homepage = "https://www.cni.dev/plugins/";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix
new file mode 100644
index 0000000000..bd903bf725
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+
+buildGoModule rec {
+ pname = "fluxcd";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "fluxcd";
+ repo = "flux2";
+ rev = "v${version}";
+ sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n";
+ };
+
+ vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ doCheck = false;
+
+ subPackages = [ "cmd/flux" ];
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
+
+ postInstall = ''
+ for shell in bash fish zsh; do
+ $out/bin/flux completion $shell > flux.$shell
+ installShellCompletion flux.$shell
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Open and extensible continuous delivery solution for Kubernetes";
+ longDescription = ''
+ Flux is a tool for keeping Kubernetes clusters in sync
+ with sources of configuration (like Git repositories), and automating
+ updates to configuration when there is new code to deploy.
+ '';
+ homepage = "https://fluxcd.io";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jlesquembre ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
index 86d1fd1383..1cb7a257ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "helm";
- version = "3.4.1";
+ version = "3.4.2";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2";
+ sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s";
};
- vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl";
+ vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
index ffe79381a2..5d293df915 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "0fwc56797gmcg9pcy0jpv5lb0b6wwiqh242xn1chd4a4hp8in7h9";
+ sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv";
};
- vendorSha256 = "0ing5pih2rz974dcianlb05fpgrj3y7h32awf3cp41gh448gxd24";
+ vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
index 55d51a656d..629f11865b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
@@ -43,9 +43,9 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
- k3sVersion = "1.19.2+k3s1"; # k3s git tag
+ k3sVersion = "1.19.4+k3s2"; # k3s git tag
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
- k3sRootVersion = "0.6.0-rc3"; # taken from ./scripts/download at the above k3s tag
+ k3sRootVersion = "0.7.1"; # taken from ./scripts/download at the above k3s tag
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
# bundled into the k3s binary
traefikChart = fetchurl {
@@ -63,8 +63,8 @@ let
# k3s binary.
k3sRoot = fetchzip {
# Note: marked as apache 2.0 license
- url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
- sha256 = "0xj3dcqawpzyzmz545iwh151krzbs9csnzg3zfl74lkv2kxgidk6";
+ url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
+ sha256 = "1wjg54816plbdwgv0dibq6dzmcakcmx0wiqijvr4f3gsxgk59zwf";
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
@@ -92,10 +92,10 @@ let
# Grab this separately from a build because it's used by both stages of the
# k3s build.
k3sRepo = fetchgit {
- url = "https://github.com/rancher/k3s";
+ url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
leaveDotGit = true; # ./scripts/version.sh depends on git
- sha256 = "1hbnarchs9w52w061bvfjvssdh7ycnxa04camjwkcx8vr0k804h4";
+ sha256 = "1qxjdgnq8mf54760f0vngcqa2y3b048pcmfsf1g593b2ij1kg1zi";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@@ -158,8 +158,8 @@ let
platforms = platforms.linux;
};
};
- k3sBuild = buildGoPackage rec {
- name = "k3s-build";
+ k3sBin = buildGoPackage rec {
+ name = "k3s-bin";
version = "${k3sVersion}";
goPackagePath = "github.com/rancher/k3s";
@@ -169,7 +169,9 @@ let
patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ];
nativeBuildInputs = [ git pkgconfig ];
- buildInputs = [ k3sBuildStage1 k3sPlugins runc ];
+ # These dependencies are embedded as compressed files in k3s at runtime.
+ # Propagate them to avoid broken runtime references to libraries.
+ propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ];
# k3s appends a suffix to the final distribution binary for some arches
archSuffix =
@@ -240,7 +242,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- k3sBuild
+ k3sBin
makeWrapper
] ++ k3sRuntimeDeps;
@@ -254,7 +256,7 @@ stdenv.mkDerivation rec {
# execute, but that we didn't bundle with it.
installPhase = ''
mkdir -p "$out/bin"
- makeWrapper ${k3sBuild}/bin/k3s "$out/bin/k3s" \
+ makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
--prefix PATH : "$out/bin"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
index cdda1487a4..d4ec9cf5ef 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.19.4";
+ version = "1.19.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi";
+ sha256 = "15bv620fj4x731f2z2a9dcdss18rk379kc40g49bpqsdn42jjx2z";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
new file mode 100644
index 0000000000..656badfe5a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
@@ -0,0 +1,41 @@
+{ lib, fetchurl, appimageTools }:
+
+let
+ pname = "lens";
+ version = "3.6.7";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
+ sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
+ name="${pname}.AppImage";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+
+in appimageTools.wrapType2 {
+ inherit name src;
+
+ extraInstallCommands =
+ ''
+ mv $out/bin/${name} $out/bin/${pname}
+
+ install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop
+ install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \
+ $out/share/icons/hicolor/512x512/apps/${pname}.png
+
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Icon=kontena-lens' 'Icon=${pname}' \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ meta = with lib; {
+ description = "The Kubernetes IDE";
+ homepage = "https://k8slens.dev/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dbirks ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
new file mode 100644
index 0000000000..ed00fb231a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, makeWrapper
+, buildkit
+, cni-plugins
+, extraPackages ? []
+}:
+
+let
+ binPath = lib.makeBinPath ([
+ buildkit
+ ] ++ extraPackages);
+in
+buildGoModule rec {
+ pname = "nerdctl";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "AkihiroSuda";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw";
+ };
+
+ vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildFlagsArray = [
+ "-ldflags="
+ "-w"
+ "-s"
+ "-X github.com/AkihiroSuda/nerdctl/pkg/version.Version=v${version}"
+ "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision="
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/nerdctl \
+ --prefix PATH : "${binPath}" \
+ --prefix CNI_PATH : "${cni-plugins}/bin"
+ '';
+
+ meta = with lib; {
+ description = "A Docker-compatible CLI for containerd";
+ homepage = src.meta.homepage;
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jk ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
index 3ff0e4b397..61f0feced9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
- version = "0.8.3";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
- sha256 = "1sga5l8bvqgm0j71yj3l1ykqvchxa7cg8pkfvjsrqlikgrfb54f3";
+ sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix
index aec421bf1a..2fd7c0403a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix
@@ -2,6 +2,6 @@
callPackage ./generic.nix {
inherit buildGoPackage;
- version = "0.11.6";
- sha256 = "09ym9fd4fp2461ddhrb5nlz8l24iq4hsbqikzc21ainagq2g1azf";
+ version = "0.11.8";
+ sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix
index 863f7cbed2..0120887957 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -2,6 +2,6 @@
callPackage ./generic.nix {
inherit buildGoPackage;
- version = "0.12.7";
- sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14";
+ version = "0.12.9";
+ sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix
new file mode 100644
index 0000000000..4b0b624001
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, buildGoPackage }:
+
+callPackage ./generic.nix {
+ inherit buildGoPackage;
+ version = "1.0.1";
+ sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv";
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
index 9e37bb6afe..4ccc05189c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
let
- version = "0.16.0";
+ version = "0.16.3";
system = stdenv.hostPlatform.system;
suffix = {
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
inherit version;
src = fetchsrc {
- x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr";
- aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p";
- x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql";
+ x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x";
+ aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs";
+ x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz";
};
doBuild = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
index 293c2ed31c..f7bcbca16c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "starboard-octant-plugin";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "140m7mnpqhfbp2qqpr3jjsc770xdph98mm5zpgwzg0jwgpsrcxsm";
+ sha256 = "11c8znbijhvxl2mas205mb18sqw868l6c86ah5hlkqh3niq2gmv3";
};
- vendorSha256 = "0aphx2rpnvzmfyfs11hf8j5b7s5lgw4kcq4jpdrkjwx7zhl6qx2g";
+ vendorSha256 = "0rmynfm5afjxc2lxy2rh9y6zhdd2q95wji2q8hcz78zank43rkcq";
meta = with lib; {
description = "Octant plugin for viewing Starboard security information";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix
index be5cb51d45..668a229a62 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -7,10 +7,8 @@ buildGoModule rec {
pname = "sonobuoy";
version = "0.19.0";
- goPackagePath = "github.com/vmware-tanzu/sonobuoy";
-
buildFlagsArray =
- let t = goPackagePath;
+ let t = "github.com/vmware-tanzu/sonobuoy";
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=v${version}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
index 0f8ed05d8e..29aa7d41f3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }:
+let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
-let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
-
-buildGoPackage rec {
+in
+buildGoModule rec {
pname = "stern";
- version = "1.11.0";
-
- goPackagePath = "github.com/wercker/stern";
+ version = "1.13.1";
src = fetchFromGitHub {
- owner = "wercker";
+ owner = "stern";
repo = "stern";
- rev = version;
- sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n";
+ rev = "v${version}";
+ sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782";
};
- deleteVendor = true;
- goDeps = ./deps.nix;
+ vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf";
nativeBuildInputs = [ installShellFiles ];
+ buildFlagsArray =
+ [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ];
+
postInstall =
- let stern = if isCrossBuild then buildPackages.stern else "$out"; in
+ let stern = if isCrossBuild then buildPackages.stern else "$out";
+ in
''
for shell in bash zsh; do
${stern}/bin/stern --completion $shell > stern.$shell
@@ -30,10 +31,10 @@ buildGoPackage rec {
'';
meta = with lib; {
- description = "Multi pod and container log tailing for Kubernetes";
- homepage = "https://github.com/wercker/stern";
- license = licenses.asl20;
- maintainers = with maintainers; [ mbode ];
- platforms = platforms.unix;
+ description = "Multi pod and container log tailing for Kubernetes";
+ homepage = "https://github.com/stern/stern";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mbode preisschild ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/deps.nix
deleted file mode 100644
index fff5cf8c0d..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/deps.nix
+++ /dev/null
@@ -1,336 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "cloud.google.com/go";
- fetch = {
- type = "git";
- url = "https://code.googlesource.com/gocloud";
- rev = "dfffe386c33fb24c34ee501e5723df5b97b98514";
- sha256 = "1g681yxz4mmzapzpzxfaz1nhcr1w526793yapfsnxlbs2skap3fy";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "1ff28809256a84bb6966640ff3d0371af82ccba4";
- sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
- sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
- };
- }
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "2d684516a8861da43017284349b7e303e809ac21";
- sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
- sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7";
- sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9";
- };
- }
- {
- goPackagePath = "github.com/golang/glog";
- fetch = {
- type = "git";
- url = "https://github.com/golang/glog";
- rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
- sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
- sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
- };
- }
- {
- goPackagePath = "github.com/google/btree";
- fetch = {
- type = "git";
- url = "https://github.com/google/btree";
- rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306";
- sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
- };
- }
- {
- goPackagePath = "github.com/google/gofuzz";
- fetch = {
- type = "git";
- url = "https://github.com/google/gofuzz";
- rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1";
- sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
- };
- }
- {
- goPackagePath = "github.com/googleapis/gnostic";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/gnostic";
- rev = "0c5108395e2debce0d731cf0287ddf7242066aba";
- sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
- };
- }
- {
- goPackagePath = "github.com/gregjones/httpcache";
- fetch = {
- type = "git";
- url = "https://github.com/gregjones/httpcache";
- rev = "787624de3eb7bd915c329cba748687a3b22666a6";
- sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5";
- };
- }
- {
- goPackagePath = "github.com/imdario/mergo";
- fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc";
- sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/json-iterator/go";
- fetch = {
- type = "git";
- url = "https://github.com/json-iterator/go";
- rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682";
- sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
- sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
- };
- }
- {
- goPackagePath = "github.com/modern-go/concurrent";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/concurrent";
- rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
- sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
- };
- }
- {
- goPackagePath = "github.com/modern-go/reflect2";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/reflect2";
- rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
- sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
- };
- }
- {
- goPackagePath = "github.com/petar/GoLLRB";
- fetch = {
- type = "git";
- url = "https://github.com/petar/GoLLRB";
- rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
- sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
- };
- }
- {
- goPackagePath = "github.com/peterbourgon/diskv";
- fetch = {
- type = "git";
- url = "https://github.com/peterbourgon/diskv";
- rev = "5f041e8faa004a95c88a202771f4cc3e991971e6";
- sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
- sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "a114f312e075f65bf30d6d9a1430113f857e543b";
- sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
- sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "49796115aa4b964c318aad4f3084fdb41e9aa067";
- sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "1c05540f6879653db88113bc4a2b70aec4bd491f";
- sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4";
- sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151";
- sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/time";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/time";
- rev = "f51c12702a4d776e4c1fa9b0fabab841babae631";
- sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
- sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
- };
- }
- {
- goPackagePath = "gopkg.in/inf.v0";
- fetch = {
- type = "git";
- url = "https://github.com/go-inf/inf";
- rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
- sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
- {
- goPackagePath = "k8s.io/api";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/api";
- rev = "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6";
- sha256 = "1dpmd59jlkxgrp5aaf8420344c6nq4kjlc1avgcp7690yrzc50v6";
- };
- }
- {
- goPackagePath = "k8s.io/apimachinery";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apimachinery";
- rev = "594fc14b6f143d963ea2c8132e09e73fe244b6c9";
- sha256 = "0xykhpmjgagyb0ac4y0ps4v1s9bd2b1sc0simh48c41a9fk3yvr7";
- };
- }
- {
- goPackagePath = "k8s.io/client-go";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/client-go";
- rev = "739dd8f9d4801eb23e2bc43423c0b4acaaded29a";
- sha256 = "15psjmb14rz4kwysim9vfbbylx0khkw29b195rziv1vk202lh28k";
- };
- }
-]
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index bb2a7ab582..c015afb787 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -70,10 +70,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
- "rev": "v3.15.0",
- "sha256": "0rxpdxg5p478sipbhq2x347gs5wrlwz4ggy9z007cbp34yhb2wka",
- "vendorSha256": "0vapfnd4c8jb15pdjnnb97vgsvfakjvl1czccbfy0znhdk2ynz02",
- "version": "3.15.0"
+ "rev": "v3.20.0",
+ "sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17",
+ "vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji",
+ "version": "3.20.0"
},
"azuread": {
"owner": "terraform-providers",
@@ -748,11 +748,13 @@
"version": "1.2.1"
},
"postgresql": {
- "owner": "terraform-providers",
+ "owner": "cyrilgdn",
+ "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql",
"repo": "terraform-provider-postgresql",
- "rev": "v1.7.1",
- "sha256": "0qlz00svvbwxslp8v7bi7mx5mvnjmh2cvg33a006gh4fy5n75shy",
- "version": "1.7.1"
+ "rev": "v1.8.1",
+ "sha256": "07qaiy3vmz179am1qrxwvrk7xpraaa8g0hf49bj54pw7nkrmaixq",
+ "vendorSha256": null,
+ "version": "1.8.1"
},
"powerdns": {
"owner": "terraform-providers",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index d8c17a89e6..6052f6882b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
@@ -42,6 +42,7 @@ let
description =
"Tool for building, changing, and versioning infrastructure";
homepage = "https://www.terraform.io/";
+ changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [
Chili-Man
@@ -135,15 +136,6 @@ let
"recurseForDerivations"
];
in rec {
- terraform_0_11 = pluggable (generic {
- version = "0.11.14";
- sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc";
- patches = [ ./provider-path.patch ];
- passthru = { inherit plugins; };
- });
-
- terraform_0_11-full = terraform_0_11.full;
-
terraform_0_12 = pluggable (generic {
version = "0.12.29";
sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8";
@@ -165,9 +157,9 @@ in rec {
});
terraform_0_14 = pluggable (generic {
- version = "0.14.0";
- sha256 = "0pbglnvb6cx8zrz791lfa67dmjqfsyysbxm2083b1lhlmbybi9ax";
- vendorSha256 = "1gxhdj98np482jm76aj6zbbmkn7vfk8b878hzz59iywgbdr1r4m1";
+ version = "0.14.3";
+ sha256 = "0w2j1phjv989bspbyvkhr25bdz1zjch3zggwk2lgjyk77mdw5h20";
+ vendorSha256 = "03dg703pw3h98vfvi2mnd2lw0mv6hlhvmc1l7ngrqdyv54cmihnp";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
@@ -180,7 +172,7 @@ in rec {
mainTf = writeText "main.tf" ''
resource "random_id" "test" {}
'';
- terraform = terraform_0_11.withPlugins (p: [ p.random ]);
+ terraform = terraform_0_12.withPlugins (p: [ p.random ]);
test =
runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } ''
set -e
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
index 40ba3530c8..42de638ec4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.17.13";
+ version = "0.18.1";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-x3U5OF8T3z9kHcYe7SwKVEKNiEsi8AEvA1rlOma4y+8=";
+ sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
new file mode 100644
index 0000000000..9623d5af2f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -0,0 +1,46 @@
+{ lib, buildGoModule, fetchFromGitHub, go-bindata }:
+
+buildGoModule rec {
+ pname = "waypoint";
+ version = "0.1.5";
+
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "115cak87kpfjckqgn8ws09z1w8x8l9bch9xrm29k4r0zi71xparn";
+ };
+
+ deleteVendor = true;
+ vendorSha256 = "1xdari6841jp6lpjwydv19v3wafj17hmnwsa2b55iw6dysm4yxdr";
+
+ subPackages = ["."];
+
+ nativeBuildInputs = [ go-bindata ];
+
+ buildPhase = ''
+ CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint
+ cd internal/assets
+ go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb
+ cd ../../
+ CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint
+ CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv waypoint{,-entrypoint} $out/bin/
+ '';
+
+ meta = with lib; {
+ description = "A tool to build, deploy, and release any application on any platform";
+ longDescription = ''
+ Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the
+ time to deliver deployments through a consistent and repeatable workflow.
+ '';
+ homepage = "https://waypointproject.io";
+ platforms = platforms.linux;
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ winpat jk ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix
index 97a2f6992f..ed04e90bcd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "compactor";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "dns-stats";
repo = pname;
rev = version;
- sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk";
+ sha256 = "0qykdnwi2q9sajkkc2sl5f00lvxjfymqjzqm0limsziykanh87c0";
};
# cbor-diag, cddl and wireshark-cli are only used for tests.
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix
new file mode 100644
index 0000000000..243999553e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/default.nix
@@ -0,0 +1,88 @@
+{ lib
+, callPackage
+, stdenv
+, fetchFromGitLab
+
+, appstream
+, gobject-introspection
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+
+, glib
+, gtk3
+, libhandy
+, listparser ? callPackage ./listparser.nix { }
+, webkitgtk
+, python3
+}:
+python3.pkgs.buildPythonApplication rec {
+ pname = "feeds";
+ version = "0.16.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = "gfeeds";
+ rev = version;
+ sha256 = "10hq06nx7lcm3dqq34qkxc6k6383mvjs7pxii9y9995d9kk5a49k";
+ };
+
+ format = "other";
+
+ nativeBuildInputs = [
+ appstream
+ glib # for glib-compile-schemas
+ gobject-introspection
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ libhandy
+ webkitgtk
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ beautifulsoup4
+ dateutil
+ feedparser
+ html5lib
+ listparser
+ lxml
+ pillow
+ pygments
+ pygobject3
+ pyreadability
+ pytz
+ requests
+ ];
+
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
+ dontWrapGApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ passthru = {
+ inherit listparser;
+ };
+
+ meta = with lib; {
+ description = "An RSS/Atom feed reader for GNOME";
+ homepage = "https://gitlab.gnome.org/World/gfeeds";
+ license = licenses.gpl3Plus;
+ maintainers = [
+ maintainers.pbogdan
+ ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/listparser.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/listparser.nix
new file mode 100644
index 0000000000..c67df416c5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feeds/listparser.nix
@@ -0,0 +1,31 @@
+{ lib
+, python3
+}:
+python3.pkgs.buildPythonPackage rec {
+ pname = "listparser";
+ version = "0.18";
+
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ requests
+ six
+ ];
+
+ checkPhase = ''
+ ${python3.interpreter} lptest.py
+ '';
+
+ meta = with lib; {
+ description = "A parser for subscription lists";
+ homepage = "https://github.com/kurtmckee/listparser";
+ license = licenses.lgpl3Plus;
+ maintainers = [
+ maintainers.pbogdan
+ ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 441a80fc07..e8a76b3d49 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -8,7 +8,7 @@
, gdk-pixbuf
, glib
, gtk3
-, libhandy_0
+, libhandy
, openssl
, sqlite
, webkitgtk
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsflash";
- version = "1.0.5";
+ version = "1.1.1";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
- sha256 = "0kh1xqvxfz58gnrl8av0zkig9vcgmx9iaxw5p6gdm8a7gv18nvp3";
+ sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd";
};
- cargoSha256 = "059sppidbxzjk8lmjq41d5qbymp9j9v2qr0jxd7xg9avr0klwc2s";
+ cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26";
patches = [
./no-post-install.patch
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
gtk3
- libhandy_0
+ libhandy
openssl
sqlite
webkitgtk
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 9fdee56b99..9435d995c3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages; [ feedparser ];
+ # Requested by @SuperSandro20001
+ pythonImportsCheck = [ "feedparser" ];
+ doCheck = false;
+
namePrefix = "";
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix b/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix
index a38ac8511c..2a3d294c5c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation {
pname = "http-getter";
- version = "unstable-2018-06-06";
+ version = "unstable-2020-12-08";
src = fetchFromGitHub {
owner = "tohojo";
repo = "http-getter";
- rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4";
- sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35";
+ rev = "0b20f08133206aaf225946814ceb6b85ab37e136";
+ sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
};
buildInputs = [ cmake pkgconfig curl ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index d6a253efda..8ef1a69044 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.71";
+ version = "3.1.91";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "4c25d8733c8eb54c7d3ce60a17d8020049fb137b796e5ada9d15f41cdd0e1655";
+ sha256 = "5d6668dd9721b60738ea44c616fcdee6210f7ef52b461eb13b77091caef4a832";
};
postPatch = ''
@@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec {
APScheduler
beautifulsoup4
cherrypy
+ colorama
colorclass
feedparser
flask-compress
@@ -49,6 +50,7 @@ python3Packages.buildPythonApplication rec {
rebulk
requests
rpyc
+ sgmllib3k
sqlalchemy
terminaltables
zxcvbn
diff --git a/third_party/nixpkgs/pkgs/applications/networking/icemon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/icemon/default.nix
new file mode 100644
index 0000000000..b757445eb0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/icemon/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, mkDerivation, qtbase, cmake, extra-cmake-modules, icecream, libcap_ng, lzo, zstd, libarchive, wrapQtAppsHook }:
+
+mkDerivation rec {
+ pname = "icemon";
+ version = "3.3";
+
+ src = fetchFromGitHub {
+ owner = "icecc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
+ };
+
+ nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
+ buildInputs = [ icecream qtbase libcap_ng lzo zstd libarchive ];
+
+ meta = with lib; {
+ description = "Icecream GUI Monitor";
+ inherit (src.meta) homepage;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ emantor ];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index 713156a662..336e3be074 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@ let
in
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.2.2";
+ version = "3.2.3";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc";
+ sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr";
};
nativeBuildInputs = [ cmake flex bison file ];
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Powerful network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";
+ changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub marsam tobim ];
platforms = platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 8b63483405..5e3f0bdb5d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -39,12 +39,12 @@
stdenv.mkDerivation rec {
pname = "bluejeans";
- version = "2.17.0";
- buildNumber = "11";
+ version = "2.19.0";
+ buildNumber = "61";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
- sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68";
+ sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index f2d882ad75..7a735e59dc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,12 +2,12 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.14",
+ "version": "1.7.16",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
"type": "git",
- "url": "https://github.com/vector-im/riot-desktop"
+ "url": "https://github.com/vector-im/element-desktop"
},
"license": "Apache-2.0",
"files": [],
@@ -21,7 +21,7 @@
"build32": "electron-builder --ia32",
"build64": "electron-builder --x64",
"build": "electron-builder",
- "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
+ "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
"docker:build:native": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build",
"docker:install": "scripts/in-docker.sh yarn install",
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "10.1.3",
+ "electronVersion": "10.1.6",
"files": [
"package.json",
{
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
index 21374014c8..08c3d2554c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
@@ -3042,11 +3042,11 @@
};
}
{
- name = "ini___ini_1.3.5.tgz";
+ name = "ini___ini_1.3.8.tgz";
path = fetchurl {
- name = "ini___ini_1.3.5.tgz";
- url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz";
- sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927";
+ name = "ini___ini_1.3.8.tgz";
+ url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz";
+ sha1 = "a29da425b48806f34767a4efce397269af28432c";
};
}
{
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 9a3dab920f..b6dfac397a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.14";
+ version = "1.7.16";
src = fetchFromGitHub {
owner = "vector-im";
- repo = "riot-desktop";
+ repo = "element-desktop";
rev = "v${version}";
- sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
+ sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g=";
};
electron = electron_9;
@@ -60,7 +60,7 @@ in mkYarnPackage rec {
# https://github.com/vector-im/riot-desktop/blob/develop/package.json
desktopItem = makeDesktopItem {
name = "element-desktop";
- exec = executableName;
+ exec = "${executableName} %u";
icon = "element";
desktopName = "Element (Riot)";
genericName = "Matrix Client";
@@ -68,6 +68,7 @@ in mkYarnPackage rec {
categories = "Network;InstantMessaging;Chat;";
extraEntries = ''
StartupWMClass=element
+ MimeType=x-scheme-handler/element;
'';
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 46ac18af9e..527af7a4de 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.14";
+ version = "1.7.16";
src = fetchurl {
- url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
+ url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
+ sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 7213332a54..63cbb69b18 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
inherit version;
src = fetchurl {
- url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
+ url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
index 0aa2dbf889..decdb18aa0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
@@ -1,7 +1,7 @@
-{ lib, mkDerivation, fetchFromGitHub
+{ stdenv, mkDerivation, fetchFromGitHub
, qmake, pkgconfig, olm, wrapQtAppsHook
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
-, python3Packages, pyotherside
+, python3Packages, pyotherside, libXScrnSaver
}:
let
@@ -13,13 +13,13 @@ let
in
mkDerivation rec {
pname = "mirage";
- version = "0.5.2";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "mirukana";
repo = pname;
rev = "v${version}";
- sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv";
+ sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv";
fetchSubmodules = true;
};
@@ -30,13 +30,14 @@ mkDerivation rec {
qtquickcontrols2
qtkeychain qtgraphicaleffects
olm pyotherside
+ libXScrnSaver
];
propagatedBuildInputs = pypkgs;
pythonPath = pypkgs;
- qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
+ qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ];
dontWrapQtApps = true;
postInstall = ''
@@ -46,11 +47,12 @@ mkDerivation rec {
"''${qtWrapperArgs[@]}"
'';
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
homepage = "https://github.com/mirukana/mirage";
license = licenses.lgpl3;
maintainers = with maintainers; [ colemickens ];
+ broken = stdenv.isDarwin;
inherit (qtbase.meta) platforms;
inherit version;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 2f5316c9fe..80ffbebe9b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -17,6 +17,7 @@
, mtxclient
, boost17x
, spdlog
+, fmt
, olm
, pkgconfig
, nlohmann_json
@@ -47,6 +48,7 @@ mkDerivation rec {
boost17x
lmdb
spdlog
+ fmt
cmark
qtbase
qtmultimedia
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 952182def2..2605d6dc08 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
-, libtoxcore
-, libpthreadstubs, libXdmcp, libXScrnSaver
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl
+, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver
, qtbase, qtsvg, qttools, qttranslations
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
, libvpx, openal, pcre, qrencode, sqlcipher
-, AVFoundation ? null }:
+, AVFoundation }:
-let
- version = "1.17.3";
- rev = "v${version}";
-
-in mkDerivation {
+mkDerivation rec {
pname = "qtox";
- inherit version;
+ version = "1.17.3";
src = fetchFromGitHub {
- owner = "qTox";
- repo = "qTox";
+ owner = "qTox";
+ repo = "qTox";
+ rev = "v${version}";
sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
- inherit rev;
};
buildInputs = [
@@ -27,25 +22,24 @@ in mkDerivation {
qtbase qtsvg qttranslations
ffmpeg_3 filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher
- ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ;
- nativeBuildInputs = [ cmake pkgconfig qttools ];
-
- enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake pkg-config qttools ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ perl ];
cmakeFlags = [
- "-DGIT_DESCRIBE=${rev}"
+ "-DGIT_DESCRIBE=v${version}"
"-DENABLE_STATUSNOTIFIER=False"
"-DENABLE_GTK_SYSTRAY=False"
"-DENABLE_APPINDICATOR=False"
"-DTIMESTAMP=1"
];
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "Qt Tox client";
- homepage = "https://tox.chat";
- license = licenses.gpl3;
+ homepage = "https://tox.chat";
+ license = licenses.gpl3;
maintainers = with maintainers; [ akaWolf peterhoeg ];
- platforms = platforms.all;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 84f0902286..44df5f6be6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "1.38.2"; # Please backport all updates to the stable channel.
+ version = "1.39.4"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4";
+ sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 6518f73a22..d4cc5293a9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.4.7";
+ version = "2.5.1";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv";
+ sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i";
};
postPatch = ''
@@ -80,9 +80,6 @@ in mkDerivation rec {
# TODO: Package mapbox-variant
postFixup = ''
- # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers.
- remove-references-to -t ${tg_owt} $out/bin/telegram-desktop
-
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
wrapProgram $out/bin/telegram-desktop \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 48499bf9f2..2853418da0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm
-, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm
+, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf
}:
let
- rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
- sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
+ rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
+ sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
in stdenv.mkDerivation {
pname = "tg_owt";
@@ -14,11 +14,16 @@ in stdenv.mkDerivation {
owner = "desktop-app";
repo = "tg_owt";
inherit rev sha256;
+ fetchSubmodules = true;
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
- buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];
+ buildInputs = [
+ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
+ ];
meta.license = lib.licenses.bsd3;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix
index d2339fbe89..8d83c27e62 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs-migrator";
- version = "1.6.4";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "ipfs";
repo = "fs-repo-migrations";
rev = "v${version}";
- sha256 = "004qqcwcw55q13r3sr273dfa5zgxc275pcgqwihzbikl3i168d9f";
+ sha256 = "0s2mmprhhb04i8pa3lfgb61wvlrp44xnb4d08y7vd2i82lmh234b";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
index 2890deccb8..3c80ef09aa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix
@@ -28,25 +28,15 @@
, phonon
}:
-let
+mkDerivation rec {
pname = "konversation";
- version = "1.7.5";
-in mkDerivation rec {
- name = "${pname}-${version}";
+ version = "1.7.7";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
+ sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
};
- patches = [
- # Delete this patch for konversation > 1.7.5
- (fetchpatch {
- url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
- sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
- })
- ];
-
buildInputs = [
kbookmarks
karchive
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix
new file mode 100644
index 0000000000..0b6d355797
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchurl, weechat }:
+
+stdenv.mkDerivation {
+ pname = "weechat-colorize_nicks";
+ version = "27";
+
+ src = fetchurl {
+ url = "https://github.com/weechat/scripts/raw/bc8a9051800779a036ba11689a277cd5f03657b2/python/colorize_nicks.py";
+ sha256 = "0hiay88vvy171jiq6ahflm0ipb7sslfxwhmmm8psv6qk19rv2sxs";
+ };
+
+ dontUnpack = true;
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp $src $out/share/colorize_nicks.py
+ '';
+
+ passthru = {
+ scripts = [ "colorize_nicks.py" ];
+ };
+
+ meta = with lib; {
+ inherit (weechat.meta) platforms;
+ description = "Use the weechat nick colors in the chat area";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ qyliss ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 6d22868860..07e7590354 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,6 +1,8 @@
{ callPackage, luaPackages, python3Packages }:
{
+ colorize_nicks = callPackage ./colorize_nicks { };
+
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
index d4cfd38c50..4134153263 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
- version = "1.2.1";
+ version = "1.3.1";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
- sha256 = "sha256-7qpVyQUbT+GChJl1TnKOONSyRDvzQ0M2z9RdN7PNl9U=";
+ sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -24,6 +24,8 @@ python3.pkgs.buildPythonApplication rec {
maestral
packaging
pyqt5
+ ] ++ stdenv.lib.optionals (pythonOlder "3.9") [
+ importlib-resources
];
nativeBuildInputs = [ wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
index 1e1909e710..2d93ff85b8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
@@ -31,12 +31,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "claws-mail-gtk3";
- version = "3.17.5";
+ version = "3.99.0";
src = fetchgit {
url = "git://git.claws-mail.org/claws.git";
- rev = "c1e1902323c2b5dfe82144328b7933dc857ef343"; # this commit is "for release 3.17.5"
- sha256 = "0cqzlzcms6alvsdsbcc06bsdi1h349b16qngn2z1p8fz16x6s6cy";
+ rev = version;
+ sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
index b677d82dce..8423beec46 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, openssl, lua, pcre }:
+{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }:
stdenv.mkDerivation rec {
pname = "imapfilter";
- version = "2.6.16";
+ version = "2.7.5";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck";
+ sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig=";
};
makeFlags = [
"SSLCAFILE=/etc/ssl/certs/ca-bundle.crt"
"PREFIX=$(out)"
];
- propagatedBuildInputs = [ openssl pcre lua ];
+ buildInputs = [ openssl pcre2 lua ];
meta = {
homepage = "https://github.com/lefcha/imapfilter";
description = "Mail filtering utility";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with stdenv.lib.maintainers; [ doronbehar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix
deleted file mode 100644
index 30ca6d6c7e..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ stdenv, fetchurl, binutils, patchelf, makeWrapper
-, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango
-, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
-
-stdenv.mkDerivation rec {
- pname = "inboxer";
- version = "1.2.3";
-
- meta = with stdenv.lib; {
- description = "Unofficial, free and open-source Google Inbox Desktop App";
- homepage = "https://denysdovhan.com/inboxer";
- maintainers = [ maintainers.mgttlinger ];
- license = licenses.mit;
- platforms = [ "x86_64-linux" ];
- };
-
- src = fetchurl {
- url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
- sha256 = "1ak8sr9sc0fkbrmfynxivbn9csrbyly4fhjlk7kx10aq8hk893a7";
- };
-
- unpackPhase = ''
- ar p $src data.tar.xz | tar xJ
- '';
- nativeBuildInputs = [ patchelf makeWrapper ];
- buildInputs = [ binutils ];
-
- preFixup = with stdenv.lib; let
- lpath = makeLibraryPath [
- alsaLib
- atk
- cairo
- cups
- dbus
- nss
- nspr
- freetype
- fontconfig
- gtk2-x11
- xorg.libX11
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXi
- xorg.libXext
- xorg.libXfixes
- xorg.libXrandr
- xorg.libXrender
- xorg.libXcomposite
- xorg.libXtst
- xorg.libXScrnSaver
- xorg.libxcb
- gdk-pixbuf
- glib
- pango
- gnome2.GConf
- expat
- stdenv.cc.cc.lib
- libpulseaudio
- udev
- ];
- in ''
- patchelf \
- --set-rpath "$out/opt/Inboxer:${lpath}" \
- $out/opt/Inboxer/libnode.so
- patchelf \
- --set-rpath "$out/opt/Inboxer:${lpath}" \
- $out/opt/Inboxer/libffmpeg.so
-
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$out/opt/Inboxer:${lpath}" \
- $out/opt/Inboxer/inboxer
-
- wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp -R usr/share opt $out/
- # fix the path in the desktop file
- substituteInPlace \
- $out/share/applications/inboxer.desktop \
- --replace /opt/ $out/opt/
- # symlink the binary to bin/
- ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer
- '';
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 8cdd27653e..b1905359cd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, fetchurl, config, makeWrapper
+{ stdenv, lib, fetchurl, config, makeWrapper
, alsaLib
, at-spi2-atk
, atk
, cairo
+, coreutils
, cups
, curl
-, dbus-glib
, dbus
+, dbus-glib
, fontconfig
, freetype
, gdk-pixbuf
, glib
, glibc
+, gnome3
+, gnugrep
+, gnupg
+, gnused
+, gpgme
, gtk2
, gtk3
, kerberos
+, libcanberra
+, libGL
+, libGLU
, libX11
-, libXScrnSaver
+, libxcb
, libXcomposite
, libXcursor
, libXdamage
@@ -25,21 +34,14 @@
, libXi
, libXinerama
, libXrender
+, libXScrnSaver
, libXt
-, libxcb
-, libcanberra
-, gnome3
-, libGLU, libGL
, nspr
, nss
, pango
+, runtimeShell
, writeScript
, xidel
-, coreutils
-, gnused
-, gnugrep
-, gnupg
-, runtimeShell
}:
# imports `version` and `sources`
@@ -58,9 +60,9 @@ let
systemLocale = config.i18n.defaultLocale or "en-US";
- defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
+ defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
- source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+ source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
name = "thunderbird-bin-${version}";
in
@@ -75,7 +77,7 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase";
- libPath = stdenv.lib.makeLibraryPath
+ libPath = lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
at-spi2-atk
@@ -110,7 +112,7 @@ stdenv.mkDerivation {
nspr
nss
pango
- ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
+ ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];
@@ -118,6 +120,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
+ # See "Note on GPG support" in `../thunderbird/default.nix` for explanations
+ # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH.
+
installPhase =
''
mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
@@ -158,7 +163,9 @@ stdenv.mkDerivation {
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
--set SNAP_NAME "thunderbird" \
--set MOZ_LEGACY_PROFILES 1 \
- --set MOZ_ALLOW_DOWNGRADE 1
+ --set MOZ_ALLOW_DOWNGRADE 1 \
+ --prefix PATH : "${lib.getBin gnupg}/bin" \
+ --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
@@ -168,14 +175,14 @@ stdenv.mkDerivation {
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
};
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
homepage = "http://www.mozilla.org/thunderbird/";
license = {
free = false;
url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";
};
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with lib.maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 4a1472fde7..b7858ba14e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
{
- version = "78.5.1";
+ version = "78.6.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/af/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/af/thunderbird-78.6.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "87cb38398aaa5af68e562a5fc6d20d3d3477d871979bd4a635c94c440e66a482";
+ sha256 = "7f8fd3a1f0e869ee03a4f120c88b606fbe4ae35d9865394fccd291caa9ae7069";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ar/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ar/thunderbird-78.6.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "935efae7caa116e16c341d64634954d77cafbc5e28626b46f5385b8416060f51";
+ sha256 = "73e7beba4e5a2b9cd92ded3ee8e662be9a80d65d59790ed1d5401b5a61c8d147";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ast/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ast/thunderbird-78.6.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "a5868dc7987529790910e638b64b15295a2d57e449fa515f4e17a4ab88a830e6";
+ sha256 = "890cda9e6a9582d43d61c9b4deb2241f46d34dbac5516d9a808dfbb472a22eec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/be/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/be/thunderbird-78.6.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "af52b29567ce26159890f70fcdccd4cafd49c7fc75c620bb606727fd27b7049a";
+ sha256 = "b951394def900c975b2796e47d948c03c59f0fde445f22d1b9a0d89ae8b7dd83";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/bg/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/bg/thunderbird-78.6.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "91856a4745a8bdefac7c2b0193766a4f0009378dfe941dbbe1afcae2ffae2337";
+ sha256 = "2440a8ea3a49d4fe7a84b0c6e67a98889bf98c5f828699bd980705c100a0e585";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/br/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/br/thunderbird-78.6.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "d5ba5fe368c99377a264d8574607335fc4317dad447bb38fdc6a5b53d2e95b49";
+ sha256 = "74b48030e64ff509379dd92d08734804006a8cc6176c69e387e03596138c48b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ca/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ca/thunderbird-78.6.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "396a1d7b668c7f47b56d7cb41e6e914f03e9e517a14b4698abedb501037ef2c1";
+ sha256 = "4b951a13352db2cc90aadf94c1e57bc5b40660d82dab855aa80751bbce9aa3b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cak/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cak/thunderbird-78.6.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "914b76ad8268db608be0595039a68189146ded384c23407ccbcd78a5e74e19ae";
+ sha256 = "bfb2ebc8a6b376603b9e310ad664a099725a29183c67b02ee13ecf3eb9a3bdac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cs/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cs/thunderbird-78.6.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "4b62702cabecfbb2567b19446f405936c9d948dad6f65a2e3f21809d4f2b1176";
+ sha256 = "de30e9d948ade3c82b7ebd58a3bbed5e880abcdb2d9c58f8e64d9d3d78bb336d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cy/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cy/thunderbird-78.6.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "736d245bd7766ac8c611a6801b3769a84baf4abae94818e0cfcadde8521850ad";
+ sha256 = "b7d0bb95acb861c453d8649673d9e582920a6df6a9662b8a6f996636d54c68c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/da/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/da/thunderbird-78.6.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "53143b51b84ee74ee9131d3b3b80e2cf873e5a8c22478c87db34a9d2ac34607a";
+ sha256 = "2c4765b34f1d63a9eae942531b7f489150d6850f68487565082ea18c94f3ad0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/de/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/de/thunderbird-78.6.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "2f3a4d8bf96e9653dd3883ac4399c650e87831d7df137358401966683d382e6c";
+ sha256 = "e29280a519f4eca06d4e5862085d8fb8cefb9577918ba953cdc6f63ffc44a6ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/dsb/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/dsb/thunderbird-78.6.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "81a3674dd2495da673a2fe3e3d200d7cadf83f9c67ff92bf2d607f6546bc2f38";
+ sha256 = "d638be5a999fd1b287628b449235e9995169c06c2cf46d1f7e6de282bf4357b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/el/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/el/thunderbird-78.6.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "651e8f535b2518bc4e56706cfb76da6d0e35d4fec031f8426cbefb404e4790d7";
+ sha256 = "34cbbca7eb8ecd5078d52d429b76ed0b5334398040d6e00aa5b5926bf8eeaba8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-CA/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-CA/thunderbird-78.6.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "775983115d98e3581db993f6202fdad1de6b23d38e5bb7edfd965ad6bc0ae425";
+ sha256 = "d50be05404a4b51e3a9c2fc4a73d75504f11e12a7ba7331ca43d5f078f462303";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-GB/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-GB/thunderbird-78.6.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "d0a3569c76b85fdca01e5098cf279b08a63d2d9023e92cadf3f8dc136d76c619";
+ sha256 = "4d11d73b268369117861250f4fecd5c6d19a904145caaaeb7ee86c7eb9e63f9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-US/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-US/thunderbird-78.6.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "4363d8fd759ac4f4783eeb76726c8cf22e5afb3c171f26fe5cca5ab194ab6959";
+ sha256 = "6691e528ac3fc88a023507e1172d67daac235fa1fce97e75e6fbd7072a493e0f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-AR/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-AR/thunderbird-78.6.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "3a04a2e42935c97c7ef003e4a690c0433783b57ce56700f07ad8b590e48b4ad0";
+ sha256 = "2f45d7f6e42fdef4f8bb8ab815879157cd962c91afa352a35f8cbc3fcf52fd82";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-ES/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-ES/thunderbird-78.6.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "f70a3feb09b79153d18e2a382017abbd6e015c78d4d55ff66f8b199b450172c4";
+ sha256 = "7bf50cefecce82e20c06441f003cc51eb7cc16d3a0e55a118213eee78e8b8494";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/et/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/et/thunderbird-78.6.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "c739f5306a2526baf74e57a029371390d02f8c119681b0f154481ae32c67c18c";
+ sha256 = "2b2c624808f75ae0d713ad37e9959ad518ae5702caa10845fb3aa8089e77bc9c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/eu/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/eu/thunderbird-78.6.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "9f95f4f1ec40e2732e053e68b31529b827f95876ad890d752f5380158f53b9e6";
+ sha256 = "3495821650563af2a62f36f928fb7503568de920211b9ef2f21904884d4fa3ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fa/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fa/thunderbird-78.6.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "e53dd458656ee9f39e996042016256949c974161c51b1bee63a401d90d59bace";
+ sha256 = "90b9ff389550e5801bc7ca7e1e4d7db5b281081bef2d0d30b7c2e9799e8cd0c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fi/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fi/thunderbird-78.6.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "b0a96b08e986e49ee6526ab098fb0d44700b3a2aa7f96205b318fdd4b938ef51";
+ sha256 = "cd5819b7ed9e3017cbef8e1ca33cb92e1804fc8ece9edf6a74133db90b61ee6f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fr/thunderbird-78.6.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "872da741245da7466de58d766a0362983d59a111a65a333881d3636defe00eb4";
+ sha256 = "82b382d1ea014a26a397c3fe06c586732df756104533c7450494ad43b11e43a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fy-NL/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fy-NL/thunderbird-78.6.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "d57862f51ec01e63ab77916ab352276b7f4992b089508dee0c9c5d389ab88d95";
+ sha256 = "3b4b0c4a23ad63f2d152eb8741a30fe4092c2d37d1bbb2cd56eb75c85d885f4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ga-IE/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ga-IE/thunderbird-78.6.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "bda41b8eff5a5004f753944c49f15ddbd1f76c19b0310481251e04ff64309597";
+ sha256 = "093b76080942d3e7584f7948dc65003c20878e8bf4bec4808669f012183cf97f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gd/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gd/thunderbird-78.6.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "0671af342859574cb96dbe119d76d7ffa92a8c3fef11eee2a03f662ea71fb84a";
+ sha256 = "a726c67ab384b58c3a1ff84a3a1fe95f73219996e7e26f5dcdfe5dda30d34cdf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gl/thunderbird-78.6.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "b458d6f79914fc4c551b3fa4444dc5ad4fa8d3310907a33a3480bf363bcdbfdb";
+ sha256 = "b731c512c61ece7b811d74e5f40cdae742207463799cccfa9906b43f58d5f2fb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/he/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/he/thunderbird-78.6.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "146f2a8417827d2d6352f7cc20486ecca8fd1e0ad384d4eb2d8b2635edf2075f";
+ sha256 = "d15591239235d2f7debc8454e65c1e67101b8f32901fcc7543025986c524b156";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hr/thunderbird-78.6.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "5c510bd3a8f8015e5c8a7c0cff401e3557b0cdca83bff77d2384c8f75f287152";
+ sha256 = "003d02062016c8f13038e61f189b7ebb75753ffd9a55879e1f8fd3ee1c1f2a2f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hsb/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hsb/thunderbird-78.6.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "605ae5746f0df98c7a561550da9cc938d0e06a222f422910ab118fa89d09e793";
+ sha256 = "2325fd29cadc8c824ddd90ba7d0975ca42c2d9964c62269f0361b5318274155f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hu/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hu/thunderbird-78.6.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "7d42f5e242e04d06bb9abd9bde8fe21571fa13f91b027369a048447d4de8526c";
+ sha256 = "15650cc17e75780f17927ced485a03a23dcf771dd7d8343b28acd0ae1f0e1f9e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hy-AM/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hy-AM/thunderbird-78.6.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "74b0b31089be36c0538eb24c98e57123f24599b4122aac5b08c4eb914f6a8f7d";
+ sha256 = "c20a4f0ccf2bce093986e3758784190215bf19d31469f6bb51f5a494ed54fb03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/id/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/id/thunderbird-78.6.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "291ad6b1fcdc537e723ee76cf0a40a3084bdf1ebec68fc3c8c54714618f5d790";
+ sha256 = "286eb0484f9a4b9c2d24dd836abcc07b00218a6c870535df1e4947482de1a79f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/is/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/is/thunderbird-78.6.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "188e2cab8e00421b8a5f9c9a174e8a529ab404a0f4f3976797e41848eb0abc4d";
+ sha256 = "b291df9b76800c56424ed8c9ad8e55be68f2606968abef2eb83ee3c86d56fc6f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/it/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/it/thunderbird-78.6.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "12daeb5314ae81a82ce95c35dc9e34d676fe8b666a84a38aea36367b52aa2c95";
+ sha256 = "51d112544b67c44d82b4d0f54bd35f0dfb485917ad72c09ce6136a8750e58eb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ja/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ja/thunderbird-78.6.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "cdd41967d60abff6053f1736375cbbdb521bbdf5aa25110ca8e08bb365c853ca";
+ sha256 = "931815f8f2e0e3a9e3b9eb150fe8f0112b26537b02cc0c0c0dce9c14c1959ac9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ka/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ka/thunderbird-78.6.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "9548232d8df327e6282b5413d904d5742aadfa75574b1333a235df2097337032";
+ sha256 = "d51b241842f8da9d6cfc8307b11b73fe813d46a7d6cd9651c46e1af18201e89c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kab/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kab/thunderbird-78.6.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "ca35aa36ed5794661372e76f24dd6c98d11d35da76aff5396215ebe9331aa881";
+ sha256 = "935d2e485aff93ee91c20710c286cb591379f5fae1a34851454707710c75df88";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kk/thunderbird-78.6.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "dd90fff1a4ee8380e03e59ef324298d1591833a021d14a11fdb2829cd3a934f3";
+ sha256 = "4534b9c69f44c197997283f455d4b692ff96df122e9d633288d2874b8657833b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ko/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ko/thunderbird-78.6.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "4dae3766bf420a0cfb5473fa95356f0061b657a7ebfdc808b69a8e639564893b";
+ sha256 = "bb083026c53734d3956126a7bc11f1e02e122e463b0f8cb72757cc7cf94cb911";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/lt/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/lt/thunderbird-78.6.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "de4b448d9651692bc4eb38447d94c94e37d93dae816edb5f3936d56a58aa41af";
+ sha256 = "a9cd61089e2898a3e27cd0d10d9295c295b579324a30ff58f7500c0dd9fa1977";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ms/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ms/thunderbird-78.6.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "08593e72643de8f79b6d90a0c41d6031f915097d3f28f1e7e901c21caa0ab037";
+ sha256 = "f84ac7f403802271c2730979dd7da85ec976d970aa39c1f50215ba1902449245";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nb-NO/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nb-NO/thunderbird-78.6.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "21caa07be03725788c41fa527e7656a0467194e8a498de87f2455b571c4e14b2";
+ sha256 = "98fd61d91149b26750f06e12f64605ffe04f243d96c5ead0d11a2a600c4baa7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nl/thunderbird-78.6.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "7c1c00a8e03d0a8e4fa9cdc3b4acce51215e9f273660e48ad76347e6003a1985";
+ sha256 = "44dbe77dbfb8d74c2c79052e1152e0da0a751d0cccea5b643c5019704454b0ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nn-NO/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nn-NO/thunderbird-78.6.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "103bc1307f47c20102e14362fcd6da696eb122fe77f680e70cd0849c9c03c47a";
+ sha256 = "e88e668c434b5b2469ef8268985015735ba5ff8639a1c670d1c9d42e1dd0b30b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pa-IN/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pa-IN/thunderbird-78.6.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "388d01d0881573164816d7ddf6a08c17ad966616f1c8e8e429f821d2bb179a62";
+ sha256 = "388b87f10db2a0dc9c73580ccc5248c492d6274766e4350981f8289db39c95cf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pl/thunderbird-78.6.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "160651e72037bb89ac62534714ce9ecbebdec0cf1f8a6127396c68ab531745f9";
+ sha256 = "cc0e7c7bf4fd33ab255b1bcca808e6ae84c9575b3555228f84da8dad83b02d2a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-BR/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-BR/thunderbird-78.6.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "6d2064a6ed4bb684384f7e79b61cfceb66a9a26900e9947b3666c36d6b8793cd";
+ sha256 = "a8b4b7db5ed2a45af8bc595c85f15f9ea78d2a790bb62a9e419b7b2c78616a66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-PT/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-PT/thunderbird-78.6.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "2ccc7a3d9d845f1a3e2ad3869cbd4cefa10e44992c27444a599f6f1429070f32";
+ sha256 = "c4504cebf2b2c831ec94029605b3068ab1cf220d3cce33b085d658c20fbf4dc4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/rm/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/rm/thunderbird-78.6.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "05e45497c19d46292617de4f247f014f7b14a684f74bfd314caf408416dc5b19";
+ sha256 = "b1be40d4a3f6f26c9a06e3179244ae2ad9c9c259e76cdd695cb3f881e43de919";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ro/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ro/thunderbird-78.6.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "bf01cf8c987e46f03236dbaab14aa551464019f471aa111299b6c7538e995f80";
+ sha256 = "305ecbe685a107461aa3dad94e7b74d9f32b343a3d9813cf7d570e0919d5d931";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ru/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ru/thunderbird-78.6.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "a3cbdfa26ff487d0efdabfa9dc324b75ec1446964f1c0192afcd67565dfc4a51";
+ sha256 = "4d49f15c2c9e69a6156e89017c71f5cbda3114940bfdf273efd0e82dfcc3457b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/si/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/si/thunderbird-78.6.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "fb26eef7b0c5b233e41f8d4ad79f11aa7d0db21b155bf0d9284881cabb51f6e4";
+ sha256 = "9d108c3b3d54d12c5008f0d77c4a6741ab94c7fcfec1cb4ff59bb2730938d01f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sk/thunderbird-78.6.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "d462f2606bfd7f6e0e45334a68d266889f0f9f927f08d5b92c39329711a8c4cf";
+ sha256 = "a6e51284b554fd6a8970757d519870098baa26d3fd23561e335105ec5bf836ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sl/thunderbird-78.6.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "b6011aefaf1eb60c8849b4ecc7a7a6fa0a72def8ba690f5b7ca61de3e089c9a4";
+ sha256 = "99b80fb6efd174beaf885e3d5451557a353693158ef147c931aa4d8560966122";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sq/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sq/thunderbird-78.6.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "aeed36c0d6129dc58d496f8f6177a88950a4c4cfe2e4ac157fb389ea79488b11";
+ sha256 = "5bba738143daec5c687fedf566052c9d387a87520e510acdb963ae80c5d24b3c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sr/thunderbird-78.6.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "f55cb398b3e6420acf6791d9ab5592b9915d299c5111ea917934b5729d22dd7f";
+ sha256 = "c18424e503d87ee7ea940a4d9551b9ec51a90b76b73180c89541872dbba27674";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sv-SE/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sv-SE/thunderbird-78.6.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "036b4f2b3d6cd24bcdcdbc1da1f44df2fba012f22ab96d0840a8c7ae0b945055";
+ sha256 = "d0eb7a8a1a6248e40142a62b61f9fe3e78bb8c277c9734d821358e0a075d5184";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/th/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/th/thunderbird-78.6.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "316ae39fb02b9ad1b28bbe7a21342e5e85dd7593978b4935b7be20253fe6b761";
+ sha256 = "04d3465fb8afcff051ce9a578901f3e9a8fbfab65f31cd7245b0b9321daa102f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/tr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/tr/thunderbird-78.6.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "73811e185274d880abdb15503a928a537428460080245426a07cf1c01e38f1c6";
+ sha256 = "46acaf32f9f035dd320d4e28d6b36ef8ce2d8ff5f753cfb6a7b02f37e8edb09f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uk/thunderbird-78.6.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "8ff9e333cf16a02e7888f297851b5a9316c5b57cf546f592f12d2aab6e3bed48";
+ sha256 = "60b0be6207532039958f03a81e5fdf070d15cd624a0583c4d8e87e0528ccd240";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uz/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uz/thunderbird-78.6.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "899c0c8c886fbaa6a6609a500bb374797bd36272138a6fcdc6aca7c7b6a6fe66";
+ sha256 = "070963c90b858e9ab75cee1490671ec3f9f46190896eca554fde0ced205d0d44";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/vi/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/vi/thunderbird-78.6.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "13afdad34f64a1c96f9612c10c8af880e9718ae10d8a1578bc397b238a936dbd";
+ sha256 = "9040ed756aa19c0e850391bd9fa148eb0fbca45b84eea888c874a9c93ee0428b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-CN/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-CN/thunderbird-78.6.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "00a1d01acabd210ba70ed6d0842ab5e1674109c7f39f561e8295d1ffd5f80a0d";
+ sha256 = "caba2b9f3fabf1231b947c578c9761a241178f732c110fcd4cf620146ce5002b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-TW/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-TW/thunderbird-78.6.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "19b84b15a6bbf593a342c874822764bd73022d2c846fe20a6d7d91aceeb1ee15";
+ sha256 = "b48378e3833a0710bca60cb9c87396f0163cf9cd6211725ea711e116557e5abc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/af/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/af/thunderbird-78.6.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "4c1487a6b823a76d477085e66b377f536f2cfd95b4ddc6804b97c792af77c554";
+ sha256 = "b4ca4cd2535fb02c059db2783f2428634373730217d420530d7c2f6441191fe7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ar/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ar/thunderbird-78.6.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "d33576a1d8c346195a20c8a222281d682d14f604654ff173eb28ca8a9343574b";
+ sha256 = "29c287ff2ce37f3d4c23770f85aa220d7b9265df2b188aa38730fca68f8ea40b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ast/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ast/thunderbird-78.6.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "09d68977bc121e562f3c697bd1d87b21250c8a0bcac013940e3806d4a69a749d";
+ sha256 = "e1267edf8d35bfaf1f2bab751b5235855ce9ab768acc607ff308021dc917cd8f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/be/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/be/thunderbird-78.6.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "bb58501c902788b2d1f8f308468aa57447a15979cab59dc89c27e3738748b6d9";
+ sha256 = "1359027429e2c1ed2535f0878105bc0485f52b569aa342246d380acd1df13e4f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/bg/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/bg/thunderbird-78.6.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "373bd3548f518a4ae56e8a103b64eb76c3139b984a5af8013de56b133a0d44c0";
+ sha256 = "4e2d1a02d6ef6ee123c68db8ff299037cbfa017334599f5e3ac7114ee3e8874b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/br/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/br/thunderbird-78.6.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "40934c8ec7070ad29cb0111624de431a0cdeeff9c7c01d8781444e33f65acbca";
+ sha256 = "526e73827d595452c40bcd2066885d41a9497bf7d61043a5236d600cb9202e94";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ca/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ca/thunderbird-78.6.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "fbce4213fe7564f2af3f980f5844961cac9a7ec2a30b23d7cdd4e5db6aa4ebaa";
+ sha256 = "73605bd265262a8f538b7d15b26915ecb030a76824a09192e7b2e897ac5affe5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cak/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cak/thunderbird-78.6.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "2aaf7ea23606be03f5f7168aaa4286760f236d084babd1f81540f8b62b37962c";
+ sha256 = "bbdcb9447938bc2ae8b4dc0a5a250cf82e316c7ef56abca2962f871abf9d1d4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cs/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cs/thunderbird-78.6.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "880e36431f76161674fdb9f2902c9d5487bed528a198722458b7e6e76e80e9b5";
+ sha256 = "4052bda928576a30657dc4087bdded6ea2339e271bff36194bbd37e610f55d13";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cy/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cy/thunderbird-78.6.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "eddb4dcac8063e5b245eb1c095c4ff98cb03714bf5b07f0366b89d670a9d95dd";
+ sha256 = "d3b337be4b64903d075f8e2269ff5f88831d5a88f24a56deead19ea534867d10";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/da/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/da/thunderbird-78.6.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "2425487caaab7979f504d37cf6b100c7cb030e8e5495b6723fa4f953348e4f40";
+ sha256 = "96080cee994410b59935c0baaa4d8bc0c592d1654242b00540b3b1997398951a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/de/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/de/thunderbird-78.6.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "81df3e5ba46fe5959f785c06bef0b70daa55e8f8721cfff0bf55a76f7343b32f";
+ sha256 = "46b4c8b867fbc4f5ed288f0c503a776a256c229799601d7810ac51b73685d6a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/dsb/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/dsb/thunderbird-78.6.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "995d3aaf3df22aa3166f161b98113fc25b813dc7cee2743b2bdd6913b4a620c4";
+ sha256 = "f1b8576a1c5ed9dea2b92b10b03e2f16e17207c1f5dce4f83556b11a846de754";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/el/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/el/thunderbird-78.6.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "ad5162a76dba9c37e2542fa7ed08c63edce9955600e9b50889abb03e352ddf23";
+ sha256 = "01d559767ff8a2562b81c7e42007993065b4d46319fe4890e157a2450a34875f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-CA/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-CA/thunderbird-78.6.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "c605520e5e65449855c355147f18b813f66d38dce52e8d3a23b90afbec5bcbf1";
+ sha256 = "99571e51cc28c9dbc5aab42fa5d5f7f680fdfa287f7f8b96c5548949155735a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-GB/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-GB/thunderbird-78.6.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "63b0d984ee8296c5185ed1aab279a0ef065986d989edbd0a7683b9db6a6d94bb";
+ sha256 = "e515ef917801e0fa67b9d4821f7185b21e36b35b7df8bb43b6a917851bcae753";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-US/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-US/thunderbird-78.6.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "b5404037f2678d36acbb225f43d426a86db9a4828a69b1beaf44dc3b5264ae7e";
+ sha256 = "cee59a70210f9fc8672a914179c957d67556b068d8ce9387c01636e89e54aba9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-AR/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-AR/thunderbird-78.6.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "cefe0ff79bacc9c16fe649c0d7b4f932afca6ebb10c8426fac527485e92f4422";
+ sha256 = "e30605e7460ff80a1c26107d0393d7cd12ecfd95d55f256db6f808076d03c53d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-ES/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-ES/thunderbird-78.6.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "de7c6685c4e73ee334faf83c809b2f45d55c971282ba99aecfd5d1c8b05577da";
+ sha256 = "0e2301dd592c06a2628aeba21f38fe4b422ed2690531c1487e958c6cea1b236c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/et/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/et/thunderbird-78.6.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "e5174b12c61221436a5926224f61f218bfe762086f1d5bb814af5f7708592392";
+ sha256 = "d15684c68e9bef8902e9dcdb87bacda263953cc93ba7368b69fd318739b58fdf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/eu/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/eu/thunderbird-78.6.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "66bfbb4edc775117a6f048f52084fff9828633166ac6234a7c1dc0d67311677f";
+ sha256 = "4144e7de84ce0a6b39d8c29a96221532951c76679a8ac5a85aa07a62b99680d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fa/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fa/thunderbird-78.6.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "072163a9d1a94b1f5c297c794791b4bd3e7f7e6897e7f7615df59a9dd2232a52";
+ sha256 = "028ac9a6ad5d6e7360e597d961a7422238d96cda848042975ececec6f3a06aa3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fi/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fi/thunderbird-78.6.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "9c269f267251bee9828acfd78d04bf149767dfe5247ae4f53ec5b0bd65c410ba";
+ sha256 = "ee5adee4c249edd9b61fcacc0a2150d4471a7897aa1057fe3ea04e16729de966";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fr/thunderbird-78.6.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "6ccfac2b5d96491c4d5dc7b00e4458617ca68fe07917941559534a31424c977c";
+ sha256 = "d5d0190541184198a6c628b3c79c7dc96ec911ab195ed3419f33c4817d401e01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fy-NL/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fy-NL/thunderbird-78.6.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "1b470c45c9d52a8a84c59dbb4ed0e6966d124ffdc3ea865e4d02289bd39b346f";
+ sha256 = "c7b8ee6e8b66a6948f80f10e1ebf2d61c70e5be439f197953bff91f499fa8d51";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ga-IE/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ga-IE/thunderbird-78.6.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "a1cbb9a4c1bf91f920da9e4e0e39e6ecff0a8c87413898c1930ce69dadad9a26";
+ sha256 = "32a1d8ded34b26136b2884d24f31c5b08c965c10061758b87df9510395f8dc7e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gd/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gd/thunderbird-78.6.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "909be2cc362ed839f373eb22d27c5f3c569b1c82fc2ba5aaf270d605029d336c";
+ sha256 = "a65ff1d77deb34ed46bb84ab480afad20fcf417f39c714021ccd83b4a9d3212e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gl/thunderbird-78.6.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "8ffadcffd16aca8befd4b9c230b7da750e6a694add7ee465227a0c3f31a5c655";
+ sha256 = "87660c561fc92396c1eeafb82e907fbc2670b6649e2c7f0bdc73714fefa3de55";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/he/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/he/thunderbird-78.6.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "a9242889345131a405d138d0ec8e470eb49c59ada18b1e8f78004f307ceb41b1";
+ sha256 = "1e5c7324c57de9e5e2a87dceb1d41994a74f55e108e8d97161e0fd428f6b197f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hr/thunderbird-78.6.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "eb1f5496811677e28b2ed034da40ebf1fef324673e0f3acb2c21f0db5c71f592";
+ sha256 = "cad204c16e1b8ee26809321aa27c73220e64bcd86d261474c636d088ade006e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hsb/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hsb/thunderbird-78.6.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "643a2b11a0775a71a8fa6c25097cfe297e6bc190fb29eee18ddd3d16fb61d989";
+ sha256 = "9d3e8988b5e8a3f089a0334304e255a716bc24f4ec9b08dd6594b7ddb4daa3cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hu/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hu/thunderbird-78.6.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "61d91bed542a7e014a8d11e46e1b3d97e8bef1303bba397b3d4da0585b1e68af";
+ sha256 = "f46e9d49a74ccb2172c78e6e149149ff49c0be7c93336c62f8c17b30a1b1d15f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hy-AM/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hy-AM/thunderbird-78.6.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "2e6739d14a45529ed2a68abb8ed03ad901b4e7770efebd382f6e9626c86da036";
+ sha256 = "f3f7e033489907339055d0ef02abf4a423434248b1a10623736fdcf09a3edd79";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/id/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/id/thunderbird-78.6.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "8753bc4c7292cd0c6ee382bb5572e432222e7c39ed739904d91ed1ece5a8197e";
+ sha256 = "581cbae2f96a616d29d30eda0dad30992eaa7fe71f65c20af10f528d130d83d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/is/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/is/thunderbird-78.6.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "4f624262b72fce7d258b6f7c264f7d2266ebcfdd59fce895e4e85c72fa784637";
+ sha256 = "8653b1e05517a723a4113995e0e69a73fa59196f5625e2c1b0e51d9d60561646";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/it/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/it/thunderbird-78.6.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "6298ce45c4a659e47877302d61a50dfc7e0634e7c3e7036aeec49da5a2839073";
+ sha256 = "98faf75b5216cc75c2348962769fcdaa98ff59c4f4870b44cb6e7a69b7b5e9bc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ja/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ja/thunderbird-78.6.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "85a7b01f65c79b0e13c4f8a18f3950f0a250f380fc8756b8fb1709680a148554";
+ sha256 = "ad34916c36ac06eec4c1a900ff33639c6238e01c6426693261433b9bdf44ea91";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ka/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ka/thunderbird-78.6.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "f7b18243b9985b54eb8684b62bad47b7b021eb959f467fec9876c866d92b1727";
+ sha256 = "c3468772b8667784814f6d323a74aef24f561cf3fbd2c5dfbfed16f73e7e7c6d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kab/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kab/thunderbird-78.6.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "cc8eb77d0d0ea95a1e2b13db51da4f18a9500aeacee1cbe505da67f2b6a9b979";
+ sha256 = "1ba665c91e38df62809a601223238dc3c34a50c96e42e5792b145eb9aed3aef7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kk/thunderbird-78.6.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "6999faf34774806e1e4257a139dd97dd50a889a7729fef4f51a8b41bb4ad169e";
+ sha256 = "651fda1baa62acfae3f13bb65096368719461d206ce45b84a3ff5540e09d9e24";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ko/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ko/thunderbird-78.6.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "42b0bf1ebfce252fdfca3ed8de9f227bbb054bf591e6155b716b18e9613a9cff";
+ sha256 = "49b82df2eaa66e658b4ff0f84af7b128a92eddce7e9ce129f0f28b8239367967";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/lt/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/lt/thunderbird-78.6.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "6ffe9b52189579bee34604499649901be5c8be2a026eb70a33ac9eb4e3b21880";
+ sha256 = "6d263e236457576a0e853fd0b00711182c34c32436f65c8fc952aa2810fa500d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ms/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ms/thunderbird-78.6.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "640942eb04d84d24bd28cf5e49e57497934810394b50693bad591cf3b783e1bf";
+ sha256 = "45b050930b8357e3a988701d46234ccdd43ba7b38e56b88d157dee6309c375c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nb-NO/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nb-NO/thunderbird-78.6.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "c0d35274192ae664314e91fd9364609cbbf142f8177d37210c9c49fdf8d31086";
+ sha256 = "23760a375705d8c3d22aaefab60c9a761fe73f5d6c97f3a3621312ba362f77ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nl/thunderbird-78.6.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "864ac834a0f44ce112deb107abce170802abaa63556f0aad88ee828bf3f8a98c";
+ sha256 = "8f006195886d26a519363c1a61940a53388952a67bae4fad07de50ab24ee21c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nn-NO/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nn-NO/thunderbird-78.6.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "e821eaf0388885e3b5e88001a2c4410cdf065059b79a3581c324f53d1cf59eb5";
+ sha256 = "85710ff8542c6d592a939a55300040633f5b8fa8587f5c6c0ba0c3c2c7e5e62e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pa-IN/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pa-IN/thunderbird-78.6.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "5a0afbf815683afd24c258ac66a45dc300028b4d41a9950784355645874459ed";
+ sha256 = "cc1120713915ba43b74e9a4daa5814cf83b32317bc1503061c233e5fe28f8214";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pl/thunderbird-78.6.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "cebdc0a0188edc63fce0b4fe0a4a3f22ab792ad486bd1e10e635ac8f641f1b5d";
+ sha256 = "bf3da9722d7c9602304f64c7b11aba83cb899a23c1ddd179d5eb431aca23301b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-BR/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-BR/thunderbird-78.6.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "7bbf9aa4d48bf84a7455dcebc6b7476e4c1ffa085c1771fbdf302f71d10e4825";
+ sha256 = "0104d48b2de1e26e3b66545a76b7892e2b1b17f56ebf8558353e031fb8741614";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-PT/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-PT/thunderbird-78.6.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "b84c28dfb5d677768a6e0f69c8ea63fcaf884839739789ac72f50e7b8884f8ca";
+ sha256 = "b376bc3cc3f87484c9f976f30a3049bd4873ec67982574ec570c5c96d7643285";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/rm/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/rm/thunderbird-78.6.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "f34eea430a9e929c25ad961b1c92724c5539a46cbbfb9a97a5c7edca4996115a";
+ sha256 = "d68e60b06b03b5313a1ddc42464ee5a3ead106655860e1d2c359802875276778";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ro/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ro/thunderbird-78.6.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "115cd666282822f35924d4de3b33fd0dd3d790d278bb35849ada579d43d5ac54";
+ sha256 = "051c01b3e2f69258e1d44599c6c485785c1624a67fa6548517ec242c69bf47fa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ru/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ru/thunderbird-78.6.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "961eb62e639f8f7c7c5695bd39df50fe4b3401e7aeade8281600779bb8edd374";
+ sha256 = "db0f48c765e7ec9c090e1d5f43f42faa5ac6cc9e4d593dbc6b8ff6f8f7210027";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/si/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/si/thunderbird-78.6.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "0887999609e47839a0f7600215c3083ce939fe13abc0c38cf701449224dbc87a";
+ sha256 = "fc104d206779b8b909f645a86151b193da0792c9af6360fbb4933d8224f23bb2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sk/thunderbird-78.6.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "a3b9281efc4c0cd6cb454f2c5b97567b4d2c6567076cee188e85c30a45213f98";
+ sha256 = "d08d8fe02577ad931020fdfd45b673fd2b71e41d66c1532b8025012e493c869d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sl/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sl/thunderbird-78.6.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "141e9a41dba4c2a3eee4370d2db6e14f8805fee2d70c20ecbb9865b7a0dcaa77";
+ sha256 = "6907401bb3973911ece57b9b3bd56032b02c2c140ab79ec554f4574a7e2121cc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sq/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sq/thunderbird-78.6.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "6a50fdac7993294937756a169b4b0ac7fe021611c5c6a730ea194ee7302c95dc";
+ sha256 = "bca13f569b5cd0e6a4bac8ae59a8f1b228010a95871763600080473f45ffe5a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sr/thunderbird-78.6.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "2ec4c2f367bceb3f05c75e55366cc66fae6593fc35c79d7bea57f34f93d79dba";
+ sha256 = "df9328979af4c36d553992e0928d63a6cfcf0a54541e091fe7bb57e2e934057f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sv-SE/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sv-SE/thunderbird-78.6.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "4a9027f9aa74bd9c6e3cbf02ac1918f1b9dfbda57ed0344a99fccad9fa271f79";
+ sha256 = "a310b66e76a2062354d2ec10dbe0827188610618ac87f866010b418d26032a50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/th/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/th/thunderbird-78.6.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "f394b18a364fa84ff5eeeee00c841248ba4095285833ce625b700fd500b9c0cc";
+ sha256 = "efb37f15a311d2c66678f42f13085e77eaf8819b2fe16ee52e3410dde5e85bee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/tr/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/tr/thunderbird-78.6.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "9f180c1b6b604fc597bf1ecb10e3521c70953cb70d4292105cb3bc7cbeb806c0";
+ sha256 = "4f9f9088ab91ebc3e4e022ba77cf8c168ab961c73317fccd07e987e38ec6eb57";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uk/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uk/thunderbird-78.6.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "f828ac8f52bda71f913462e60fb7ea2221de4f824063b95b85709320a820db8a";
+ sha256 = "d9c527045270007c74e84d9f77ab6cbab2f07112d8688757920f5adbc5bbdf1d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uz/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uz/thunderbird-78.6.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "8d3dd4a1bbe008e4d346c22c01bafe988dde88fa6c9919c50194b9b155bc821f";
+ sha256 = "9ea90845e8668afff622f412f571b59e03e6c02d49a4e47cb99ab93f5da822dd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/vi/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/vi/thunderbird-78.6.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "4db40b3debca281c59e926bd0f9cb4e5cd2150bf27235f1178ed8e497616a031";
+ sha256 = "ccf4bd8c6269fb8ae15413923d556ecafb808ef205688dfb78379347a5bce5f4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-CN/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-CN/thunderbird-78.6.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "399707f970a01e2f3c2eacc81f2f3bb33b1f49433c3ba6c49f4615b499f0c246";
+ sha256 = "22f0b4a72f995a9936fed178138d3e0c40fb3aefeda989c9ba83fc82a4296fcf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-TW/thunderbird-78.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-TW/thunderbird-78.6.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "27ad21908069582a4a7641dc9a7d9acc69d4842382499cef2cee2f84d0fc3856";
+ sha256 = "b8c8633732641b8ab87bfc2a2867a95b817ce6d0fd0e8f569221bc51ac23e849";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 58eae86748..2e41883b40 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -14,13 +14,15 @@
, freetype
, glib
, gnugrep
+, gnupg
, gnused
+, gpgme
, icu
, jemalloc
, lib
+, libevent
, libGL
, libGLU
-, libevent
, libjpeg
, libnotify
, libpng
@@ -71,13 +73,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "78.5.1";
+ version = "78.6.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "202s2h9fsvg4chy93rgxdf4vlavf3wbp9vqgh0nrgk5wcdhz17144vhw1bmxia8hf99snq2a3ix6haidwl8d2n6l2nfsjzcnphhxd9z";
+ "0hx9gg3ngpvgshrz9j7ni4kh3chadqd5w5fpywjjw4naj0k53d0i9jjhq4p6fyvf6rb2g825ibqq794lr9drn6nrfndh5w1yn5lw69n";
};
nativeBuildInputs = [
@@ -288,6 +290,15 @@ stdenv.mkDerivation rec {
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
'';
+ # Note on GPG support:
+ # Thunderbird's native GPG support does not yet support smartcards.
+ # The official upstream recommendation is to configure fall back to gnupg
+ # using the Thunderbird config `mail.openpgp.allow_external_gnupg`
+ # and GPG keys set up; instructions with pictures at:
+ # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/
+ # For that to work out of the box, it requires `gnupg` on PATH and
+ # `gpgme` in `LD_LIBRARY_PATH`; we do this below.
+
preFixup = ''
# Needed to find Mozilla runtime
gappsWrapperArgs+=(
@@ -297,6 +308,8 @@ stdenv.mkDerivation rec {
--set SNAP_NAME "thunderbird"
--set MOZ_LEGACY_PROFILES 1
--set MOZ_ALLOW_DOWNGRADE 1
+ --prefix PATH : "${lib.getBin gnupg}/bin"
+ --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
)
'';
@@ -325,7 +338,7 @@ stdenv.mkDerivation rec {
requiredSystemFeatures = [ "big-parallel" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A full-featured e-mail client";
homepage = "https://www.thunderbird.net";
maintainers = with maintainers; [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix
index c890329771..1d055520d1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/openbazaar/client.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openbazaar-client";
- version = "2.4.8";
+ version = "2.4.9";
src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
- sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64";
+ sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix
similarity index 86%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix
index cafba65c78..aa70f969d2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
+{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec {
pname = "deluge";
@@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [
pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
- libtorrentRasterbar.dev libtorrentRasterbar.python setuptools
+ libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
];
nativeBuildInputs = [ intltool ];
@@ -36,6 +36,7 @@ pythonPackages.buildPythonPackage rec {
description = "Torrent client";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ domenkozar ebzzry ];
+ broken = stdenv.isDarwin;
platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
similarity index 90%
rename from third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/2/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
index 2e9f08ce98..f9c421c408 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages
+{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
pythonPackages.buildPythonPackage rec {
@@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [
twisted Mako chardet pyxdg pyopenssl service-identity
- libtorrentRasterbar.dev libtorrentRasterbar.python setuptools
+ libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
setproctitle pillow rencode six zope_interface
dbus-python pygobject3 pycairo
gtk3 gobject-introspection librsvg
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 364aeac550..8ef8740f4d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "6.8.8";
+ version = "6.8.9";
pname = "frostwire";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
- sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k";
+ sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 9b6a8bd707..2e69ad23e1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,29 +1,32 @@
-{ mkDerivation, lib, fetchFromGitHub, pkgconfig
-, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
-, debugSupport ? false # Debugging
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
+, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
+, debugSupport ? false
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
+, trackerSearch ? true, python3 ? null
}:
assert guiSupport -> (dbus != null);
-with lib;
+assert trackerSearch -> (python3 != null);
+with lib;
mkDerivation rec {
pname = "qbittorrent";
- version = "4.3.0.1";
+ version = "4.3.1";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
- sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp";
+ sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
- ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support
+ buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
+ ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
+ ++ optional trackerSearch python3;
# Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
QMAKE_LRELEASE = "lrelease";
@@ -35,6 +38,12 @@ mkDerivation rec {
++ optional (!webuiSupport) "--disable-webui"
++ optional debugSupport "--enable-debug";
+ postInstall = "wrapProgram $out/bin/${
+ if guiSupport
+ then "qbittorrent"
+ else "qbittorrent-nox"
+ } --prefix PATH : ${makeBinPath [ python3 ]}";
+
enableParallelBuilding = true;
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
index 276cabfa2a..d06a4d4d41 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
, fetchFromGitHub
, python3Packages
}:
@@ -54,9 +54,12 @@ python3Packages.buildPythonApplication rec {
"--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second"
# TestScrollBarWithScrollable.test_wrapping_bug fails
"--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug"
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py"
+ "--deselect=tests/client_test/aiotransmission_test/rpc_test.py"
];
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "TUI and CLI for the BitTorrent client Transmission";
homepage = "https://github.com/rndusr/stig";
license = licenses.gpl3;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
index 5cab23ecd7..d30697a4df 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
pythonPath = [
- python3Packages.libtorrentRasterbar
+ python3Packages.libtorrent-rasterbar
python3Packages.twisted
python3Packages.netifaces
python3Packages.pycrypto
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index bbeed5b779..eb59f90e6d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -54,6 +54,17 @@ let
x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
x64suffix = "6";
x86suffix = "6";
+ homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html";
+ };
+
+ "20.12.0" = {
+ major = "20";
+ minor = "12";
+ patch = "0";
+ x64hash = "1268nriqjp27nxqqi4dvkv8r01yj3bhglxv21xd185761da2mzry";
+ x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf";
+ x64suffix = "12";
+ x86suffix = "12";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
index d906b44590..66292e20c5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "3.4.0";
+ version = "3.4.2";
variant = if withQt then "qt" else "cli";
pcap = libpcap.override { withBluez = stdenv.isLinux; };
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37";
+ sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y";
};
cmakeFlags = [
@@ -80,9 +80,6 @@ in stdenv.mkDerivation {
'' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
- substituteInPlace $out/share/applications/*.desktop \
- --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
-
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
index be255a6c14..b41178922a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
- version = "2.4.2";
+ version = "2.4.7";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
- sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a";
+ sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix
index da4551d7f5..e93b6f9a43 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "syncplay";
- version = "1.6.6";
+ version = "1.6.7";
format = "other";
@@ -10,7 +10,7 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
rev = "v${version}";
- sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09";
+ sha256 = "1hxmd13sff51lh9l3vpk33qrzf7gi58c76bc01iqimp17sxwfz3k";
};
propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls;
diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix
index cd15d3723d..d18a757f6b 100644
--- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "beamerpresenter";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
- sha256 = "12xngnhwa3haf0pdxczgvhq1j20zbsr30y2bfn9qwmlhbwklhkj2";
+ sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i";
};
nativeBuildInputs = [ qmake installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix
index 671613ddd3..acade32d74 100644
--- a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "elementary-planner";
- version = "2.5.4";
+ version = "2.5.7";
src = fetchFromGitHub {
owner = "alainm23";
repo = "planner";
rev = version;
- sha256 = "0q5zmjh0d1mapgqb2a38spss280jkkc2n835kc7grzvs9jgq1k1k";
+ sha256 = "0s2f9q7i31c2splflfnaiqviwnxbsp2zvibr70xafhbhnkmzlrsk";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
index e26081a029..d956a3b08a 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -469,11 +469,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
- name = "language-subtag-registry-2020-04-01.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";
- sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da";
+ name = "language-subtag-registry-2020-09-29.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";
+ sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";
md5 = "";
- md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2";
+ md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@@ -700,11 +700,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
- name = "pdfium-4137.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2";
- sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6";
+ name = "pdfium-4306.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2";
+ sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8";
md5 = "";
- md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2";
+ md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index dbfd249901..c9b1826471 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,8 +8,8 @@ rec {
major = "7";
minor = "0";
- patch = "3";
- tweak = "1";
+ patch = "4";
+ 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 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5";
+ sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
- sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4";
+ sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
};
# 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 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b";
+ sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
index ebd057da5c..499078611f 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
@@ -111,15 +111,9 @@ let
{
pyocr = pyocrWithUserTesseract super;
- # Paperless only supports Django 2.0
- django = customPkgs.django_2_0;
-
# Paperless is incompatible with factory_boy >= 3
factory_boy = customPkgs.factory_boy_2_12_0;
- # The current version of django_extensions is incompatible with django 2.0
- django_extensions = customPkgs.django_extensions_2_2_8;
-
# These are pre-release versions, hence they are private to this pkg
django-filter = self.callPackage ./python-modules/django-filter.nix {};
django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {};
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix
index 4c5510ebb7..e1fb227614 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix
@@ -1,24 +1,5 @@
pyPkgs: fetchFromGitHub:
{
- django_2_0 = pyPkgs.django_2.overridePythonAttrs (old: rec {
- version = "2.0.12";
- src = pyPkgs.fetchPypi {
- inherit (old) pname;
- inherit version;
- sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2";
- };
- });
-
- django_extensions_2_2_8 = pyPkgs.django_extensions.overridePythonAttrs (old: rec {
- version = "2.2.8";
- src = fetchFromGitHub {
- owner = old.pname;
- repo = old.pname;
- rev = version;
- sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj";
- };
- });
-
factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec {
version = "2.12.0";
src = pyPkgs.fetchPypi {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
index b2402aad33..e06d04ca53 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
@@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
mkDerivation rec {
pname = "gqrx";
- version = "2.14.2";
+ version = "2.14.3";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "15xlzfgmffq43wn74xjqc5p2m21i3lh28qqskd2jf2hhvanpcwcp";
+ sha256 = "10pmd2jqmw77gybjfzrch6qi8jil1g6nsjzabbd6gnbsq7320axj";
};
nativeBuildInputs = [ cmake ];
@@ -27,7 +27,7 @@ mkDerivation rec {
postInstall = ''
install -vD $src/gqrx.desktop -t "$out/share/applications/"
- install -vD $src/resources/icons/gqrx.svg -t "$out/share/icons/"
+ install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/"
'';
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
index dd8c56610c..3197a7d0cc 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
@@ -26,6 +26,7 @@ qtserialport,
qtwebsockets,
rtl-sdr,
serialdv,
+soapysdr-with-plugins,
uhd
}:
@@ -46,12 +47,13 @@ mkDerivation rec {
glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
fftwFloat codec2 cm256cc serialdv qtserialport
- libbladeRF uhd
+ libbladeRF uhd soapysdr-with-plugins
];
cmakeFlags = [
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
"-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"
+ "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
];
LD_LIBRARY_PATH = "${ocl-icd}/lib";
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix
new file mode 100644
index 0000000000..ce5811b009
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/radio/soapyaudio/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config
+, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr
+} :
+
+stdenv.mkDerivation rec {
+ pname = "soapyaudio";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "pothosware";
+ repo = "SoapyAudio";
+ rev = "soapy-audio-${version}";
+ sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ];
+
+ cmakeFlags = [
+ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/"
+ "-DUSE_HAMLIB=ON"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/pothosware/SoapyAudio";
+ description = "SoapySDR plugin for amateur radio and audio devices";
+ license = licenses.mit;
+ maintainers = with maintainers; [ numinit ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
index fde8df6104..66fc3ec600 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
@@ -1,17 +1,18 @@
{
- stdenv, extra-cmake-modules, fetchurl,
+ lib, mkDerivation, extra-cmake-modules, fetchurl,
kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio,
- knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook,
+ knewstuff, kplotting, kwidgetsaddons, kxmlgui, knotifyconfig,
- qtx11extras, qtwebsockets,
+
+ qtx11extras, qtwebsockets, qtkeychain, libsecret,
eigen, zlib,
- cfitsio, indilib, xplanet, libnova, gsl
+ cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "kstars";
version = "3.4.3";
@@ -24,23 +25,23 @@ stdenv.mkDerivation rec {
./indi-fix.patch
];
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
- knewstuff kplotting kwidgetsaddons kxmlgui
+ knewstuff kplotting kwidgetsaddons kxmlgui knotifyconfig
- qtx11extras qtwebsockets
+ qtx11extras qtwebsockets qtkeychain libsecret
eigen zlib
- cfitsio indilib xplanet libnova gsl
+ cfitsio indilib xplanet libnova libraw gsl wcslib
];
cmakeFlags = [
"-DINDI_NIX_ROOT=${indilib}"
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Virtual planetarium astronomy software";
homepage = "https://kde.org/applications/education/org.kde.kstars";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
new file mode 100644
index 0000000000..7ae3e01197
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja,
+ git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv,
+ fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg,
+ libraw, libtiff, libpng, libjpeg, libheif, ffms
+}:
+
+stdenv.mkDerivation rec {
+ pname = "siril";
+ version = "0.99.6";
+
+ src = fetchFromGitLab {
+ owner = "free-astro";
+ repo = pname;
+ rev = version;
+ sha256 = "06vh8x45gv0gwlnqjwxglf12jmpdaxkiv5sixkqh20420wabx3ha";
+ };
+
+ nativeBuildInputs = [
+ meson ninja pkg-config git criterion wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3 cfitsio gsl exiv2 gnuplot curl opencv fftwFloat librtprocess
+ libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg
+ ];
+
+ # Necessary because project uses default build dir for flatpaks/snaps
+ dontUseMesonConfigure = true;
+
+ configureScript = ''
+ ${meson}/bin/meson --buildtype release nixbld .
+ '';
+
+ postConfigure = ''
+ cd nixbld
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.siril.org/";
+ description = "Astronomical image processing tool";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ hjones2199 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix
index 6acdc53544..8f4dd77452 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "delly";
- version = "0.8.5";
+ version = "0.8.6";
src = fetchFromGitHub {
owner = "dellytools";
repo = pname;
rev = "v${version}";
- sha256 = "1af1y20hd8x2yvix0gjvx038w7chf4fiyr68ny5yvrx5b2gw0vbq";
+ sha256 = "sha256-j9klZ8qq1GQS7+zZ+vHwAwLHBYMBrWfbwqeD8QJeCuk=";
};
buildInputs = [ zlib htslib bzip2 lzma ncurses boost ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
index 0353f2e7ce..af29dd77ac 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.23.8";
+ version = "2.23.9";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2";
+ sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
index d555f2873a..776719579d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, cmake }:
+{ stdenv, fetchurl, zlib, bzip2, cmake, python3 }:
stdenv.mkDerivation rec {
pname = "SPAdes";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ zlib bzip2 ];
+ buildInputs = [ zlib bzip2 python3 ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 06053a8f35..896a2a0108 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -1,28 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
-, llvmPackages ? null
+, fmt, graphviz, llvmPackages ? null
}:
stdenv.mkDerivation rec {
- version = "2.0.0";
+ version = "3.1.9";
pname = "hal-hardware-analyzer";
src = fetchFromGitHub {
owner = "emsec";
repo = "hal";
rev = "v${version}";
- sha256 = "11xmqxnryksl645wmm1d69k1b5zwvxxf0admk4iblzaa3ggf7cv1";
+ sha256 = "0yvvlx0hq73x20va4csa8kyx3x4z648s6l6qqirzjpmxa1w91xc6";
};
# make sure bundled dependencies don't get in the way - install also otherwise
# copies them in full to the output, bloating the package
postPatch = ''
- rm -rf deps/*/*
- substituteInPlace cmake/detect_dependencies.cmake \
- --replace 'spdlog 1.4.2 EXACT' 'spdlog 1.4.2 REQUIRED'
+ shopt -s extglob
+ rm -rf deps/!(sanitizers-cmake)/*
+ shopt -u extglob
'';
nativeBuildInputs = [ cmake ninja pkgconfig ];
- buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog wrapQtAppsHook ]
+ buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ]
++ (with python3Packages; [ python pybind11 ])
++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
# the qt mkDerivation - the latter forcibly overrides this.
cmakeBuildType = "MinSizeRel";
- meta = {
+ meta = with stdenv.lib; {
description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists";
homepage = "https://github.com/emsec/hal";
- license = stdenv.lib.licenses.mit;
- platforms = with stdenv.lib.platforms; unix;
- maintainers = with stdenv.lib.maintainers; [ ris ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ ris shamilton ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix
index fe606125c5..c5e95d37b5 100644
--- a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }:
+{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
stdenv.mkDerivation rec {
pname = "gama";
- version = "2.09";
+ version = "2.12";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9";
+ sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj";
};
buildInputs = [ expat ];
- nativeBuildInputs = [ texinfo ];
+ nativeBuildInputs = [ texinfo zip ];
checkInputs = [ octave libxml2 ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cedille/Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch
new file mode 100644
index 0000000000..51f1478987
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch
@@ -0,0 +1,31 @@
+From 563f023aba1034f4f433f412302b825b059ef5a5 Mon Sep 17 00:00:00 2001
+From: Mark Barbone
+Date: Sun, 19 Jul 2020 17:24:30 -0400
+Subject: [PATCH] Fix to-string.agda to compile with Agda 2.6.1
+
+---
+Adapted from https://github.com/cedille/cedille/pull/156.
+
+ src/to-string.agda | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/to-string.agda b/src/to-string.agda
+index 2505942..051a2da 100644
+--- a/src/to-string.agda
++++ b/src/to-string.agda
+@@ -100,9 +100,9 @@ no-parens {TK} _ _ _ = tt
+ no-parens {QUALIF} _ _ _ = tt
+ no-parens {ARG} _ _ _ = tt
+
+-pattern ced-ops-drop-spine = cedille-options.options.mk-options _ _ _ _ ff _ _ _ ff _
+-pattern ced-ops-conv-arr = cedille-options.options.mk-options _ _ _ _ _ _ _ _ ff _
+-pattern ced-ops-conv-abs = cedille-options.options.mk-options _ _ _ _ _ _ _ _ tt _
++pattern ced-ops-drop-spine = cedille-options.mk-options _ _ _ _ ff _ _ _ ff _
++pattern ced-ops-conv-arr = cedille-options.mk-options _ _ _ _ _ _ _ _ ff _
++pattern ced-ops-conv-abs = cedille-options.mk-options _ _ _ _ _ _ _ _ tt _
+
+ drop-spine : cedille-options.options → {ed : exprd} → ctxt → ⟦ ed ⟧ → ⟦ ed ⟧
+ drop-spine ops @ ced-ops-drop-spine = h
+--
+2.27.0
+
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix
index 2ac96df66a..7b181790f1 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix
@@ -10,17 +10,21 @@
}:
stdenv.mkDerivation rec {
- version = "1.1.1";
+ version = "1.1.2";
pname = "cedille";
src = fetchFromGitHub {
owner = "cedille";
repo = "cedille";
rev = "v${version}";
- sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb";
+ sha256 = "1j745q9sd32fhcb96wjq6xvyqq1k6imppjnya6x0n99fyfnqzvg9";
fetchSubmodules = true;
};
+ patches = [
+ ./Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch
+ ];
+
nativeBuildInputs = [ alex happy ];
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index dc9e40912d..2ebe75d3bc 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
@@ -36,6 +36,8 @@ let
"8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa";
"8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz";
"8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q";
+ "8.12.2" = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n";
+ "8.13+beta1" = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
@@ -118,7 +120,9 @@ self = stdenv.mkDerivation {
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
- propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
+ propagatedBuildInputs =
+ stdenv.lib.optional (versionAtLeast "8.13") ocamlPackages.zarith
+ ++ stdenv.lib.optional (coq-version == "8.12") ocamlPackages.num;
postPatch = ''
UNAME=$(type -tp uname)
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
index 28295ea289..78861786de 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cryptoverif";
- version = "2.03pl1";
+ version = "2.04";
src = fetchurl {
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
- sha256 = "0q7qa1qm7mbky3m36445gdmgmkb9mrhrdsk7mmwn8fzw0rfc6z00";
+ sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s";
};
buildInputs = [ ocaml ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
** from under $out/libexec. By default, it expects to find the files
** in $CWD which doesn't work. */
patchPhase = ''
- substituteInPlace ./src/settings.ml \
+ substituteInPlace ./src/syntax.ml \
--replace \"default\" \"$out/libexec/default\"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
index ea9c921f19..b090274919 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
@@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
- version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade
+ version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade
src = fetchurl {
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
- sha256 = "1b9khiv0mk2xzw1rblm2jy6qsf8y6f9k7qy15sxpb21d72hzzbl2";
+ sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv";
};
patches = stdenv.lib.optionals (!enableGUI) [
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
index 8ec6ac5048..896983ce15 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
@@ -8,22 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
- version = "12.1.1";
+ version = "12.2.0";
lang = "en";
language = "English";
- sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd";
- }
- {
- version = "12.1.0";
- lang = "en";
- language = "English";
- sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7";
- }
- {
- version = "12.0.0";
- lang = "en";
- language = "English";
- sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7";
+ sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7";
}
{
version = "11.3.0";
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix
index 1bf7d16f29..cdc81a8764 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix
@@ -87,6 +87,10 @@ stdenv.mkDerivation ({
enableParallelBuilding = true;
+ passthru = {
+ ecl = ecl;
+ };
+
meta = {
description = "Computer algebra system";
homepage = "http://maxima.sourceforge.net";
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix
index 76e7c796a1..94b7ad266c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "27r1";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
- sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww";
+ sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn";
};
outputs = [ "out" "dev" ];
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
index a3e2f99ab2..7ec42d11ab 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
version = "2.11.4";
src = fetchurl {
- url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
+ # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz
+ url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix
index 87fb205174..e3474d865e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchurl
, autoreconfHook
, pkgconfig
, flint
@@ -33,6 +34,14 @@ stdenv.mkDerivation rec {
pkgconfig
];
+ patches = [
+ (fetchurl {
+ name = "py_ssize_t_clean.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/py_ssize_t_clean.patch?h=9.2";
+ sha256 = "0l3gbg9hc4v671zf4w376krnk3wh8hj3649610nlvzzxckcryzab";
+ })
+ ];
+
meta = with stdenv.lib; {
description = "Python is Not a CAS -- modified version of Ginac";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix
index caf51c3da2..416f2b957b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix
@@ -9,31 +9,13 @@
let
inherit (pkgs) symlinkJoin callPackage nodePackages;
- # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
- python = pkgs.python2.override {
+ python3 = pkgs.python3.override {
packageOverrides = self: super: {
- # python packages that appear unmaintained and were not accepted into the nixpkgs
- # tree because of that. These packages are only dependencies of the more-or-less
- # deprecated sagenb. However sagenb is still a default dependency and the doctests
- # depend on it.
- # See https://github.com/NixOS/nixpkgs/pull/38787 for a discussion.
- # The dependency on the sage notebook (and therefore these packages) will be
- # removed in the future:
- # https://trac.sagemath.org/ticket/25837
- flask-oldsessions = self.callPackage ./flask-oldsessions.nix {};
- flask-openid = self.callPackage ./flask-openid.nix {};
- python-openid = self.callPackage ./python-openid.nix {};
- sagenb = self.callPackage ./sagenb.nix {
- mathjax = nodePackages.mathjax;
- };
-
- # Package with a cyclic dependency with sage
- pybrial = self.callPackage ./pybrial.nix {};
-
# `sagelib`, i.e. all of sage except some wrappers and runtime dependencies
sagelib = self.callPackage ./sagelib.nix {
- inherit flint ecl arb;
+ inherit flint arb;
inherit sage-src env-locations pynac singular;
+ ecl = maxima-ecl.ecl;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
@@ -59,9 +41,10 @@ let
# A bash script setting various environment variables to tell sage where
# the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix {
- inherit pari_data ecl;
+ inherit pari_data;
inherit singular maxima-ecl;
- cysignals = python.pkgs.cysignals;
+ ecl = maxima-ecl.ecl;
+ cysignals = python3.pkgs.cysignals;
three = nodePackages.three;
mathjax = nodePackages.mathjax;
};
@@ -69,21 +52,22 @@ let
# The shell file that gets sourced on every sage start. Will also source
# the env-locations file.
sage-env = callPackage ./sage-env.nix {
- sagelib = python.pkgs.sagelib;
+ sagelib = python3.pkgs.sagelib;
inherit env-locations;
- inherit python ecl singular palp flint pynac pythonEnv maxima-ecl;
+ inherit python3 singular palp flint pynac pythonEnv maxima-ecl;
+ ecl = maxima-ecl.ecl;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
# The documentation for sage, building it takes a lot of ram.
sagedoc = callPackage ./sagedoc.nix {
inherit sage-with-env;
- inherit python maxima-ecl;
+ inherit python3 maxima-ecl;
};
# sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run.
sage-with-env = callPackage ./sage-with-env.nix {
- inherit pythonEnv;
+ inherit python3 pythonEnv;
inherit sage-env;
inherit pynac singular maxima-ecl;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
@@ -100,10 +84,8 @@ let
sage-src = callPackage ./sage-src.nix {};
- pythonRuntimeDeps = with python.pkgs; [
+ pythonRuntimeDeps = with python3.pkgs; [
sagelib
- pybrial
- sagenb
cvxopt
networkx
service-identity
@@ -116,11 +98,10 @@ let
ipywidgets
rpy2
sphinx
- typing
pillow
];
- pythonEnv = python.buildEnv.override {
+ pythonEnv = python3.buildEnv.override {
extraLibs = pythonRuntimeDeps;
ignoreCollisions = true;
} // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible
@@ -129,8 +110,21 @@ let
singular = pkgs.singular.override { inherit flint; };
- # https://trac.sagemath.org/ticket/26625
- maxima-ecl = pkgs.maxima-ecl;
+ maxima-ecl = pkgs.maxima-ecl.override {
+ ecl = pkgs.ecl.override {
+ # "echo syntax error | ecl > /dev/full 2>&1" segfaults in
+ # ECL. We apply a patch to fix it (write_error.patch), but it
+ # only works if threads are disabled. sage 9.2 tests this
+ # (src/sage/interfaces/tests.py) and ships ecl like so.
+ # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1#note_1657275
+ threadSupport = false;
+
+ # if we don't use the system boehmgc, sending a SIGINT to ecl
+ # can segfault if we it happens during memory allocation.
+ # src/sage/libs/ecl.pyx would intermittently fail in this case.
+ useBoehmgc = true;
+ };
+ };
# *not* to confuse with the python package "pynac"
pynac = pkgs.pynac.override { inherit singular flint; };
@@ -161,9 +155,6 @@ let
pari-seadata-small
];
};
-
- # https://trac.sagemath.org/ticket/22191
- ecl = pkgs.ecl_16_1_2;
in
# A wrapper around sage that makes sure sage finds its docs (if they were build).
callPackage ./sage.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
index bda2d23b9e..b1ad0aad9c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
@@ -44,6 +44,6 @@ writeTextFile rec {
export JSMOL_DIR="${jmol}/share/jsmol"
export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
export THREEJS_DIR="${three}/lib/node_modules/three"
- export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages"
+ export SAGE_INCLUDE_DIRECTORIES="${cysignals}/${cysignals.pythonModule.sitePackages}"
'';
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-oldsessions.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-oldsessions.nix
deleted file mode 100644
index 86fe9912c1..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-oldsessions.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, python
-, flask
-}:
-
-buildPythonPackage rec {
- pname = "Flask-OldSessions";
- version = "0.10";
-
- # no artifact on pypi: https://github.com/mitsuhiko/flask-oldsessions/issues/1
- src = fetchFromGitHub {
- owner = "mitsuhiko";
- repo = "flask-oldsessions";
- rev = version;
- sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn";
- };
-
- propagatedBuildInputs = [
- flask
- ];
-
- # missing module flask.testsuite, probably assumes an old version of flask
- doCheck = false;
- checkPhase = ''
- ${python.interpreter} run-tests.py
- '';
-
- meta = with stdenv.lib; {
- description = "Provides a session class that works like the one in Flask before 0.10.";
- license = licenses.bsd2;
- maintainers = teams.sage.members;
- homepage = "https://github.com/mitsuhiko/flask-oldsessions";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-openid.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-openid.nix
deleted file mode 100644
index 900b033429..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/flask-openid.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, flask
-, python-openid
-}:
-
-buildPythonPackage rec {
- pname = "Flask-OpenID";
- version = "1.2.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1aycwmwi7ilcaa5ab8hm0bp6323zl8z25q9ha0gwrl8aihfgx3ss";
- };
-
- propagatedBuildInputs = [
- flask
- python-openid
- ];
-
- meta = with stdenv.lib; {
- description = "Adds openid support to flask applications";
- license = licenses.bsd2;
- maintainers = teams.sage.members;
- homepage = "https://pythonhosted.org/Flask-OpenID/";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
index 8cd80281d0..d5c19a54fd 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
@@ -1,17 +1,17 @@
-From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001
+From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann
Date: Sun, 21 Oct 2018 17:52:40 +0200
Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested
---
- src/sage/doctest/control.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ src/sage/doctest/control.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
-index bf18df8b2b..935c67abf7 100644
+index 2d93841e50..6d156e29a1 100644
--- a/src/sage/doctest/control.py
+++ b/src/sage/doctest/control.py
-@@ -362,7 +362,8 @@ class DocTestController(SageObject):
+@@ -375,7 +375,8 @@ class DocTestController(SageObject):
if not optionaltag_regex.search(o):
raise ValueError('invalid optional tag {!r}'.format(o))
@@ -21,15 +21,6 @@ index bf18df8b2b..935c67abf7 100644
self.options = options
-@@ -765,7 +766,7 @@ class DocTestController(SageObject):
- sage: DC = DocTestController(DD, [dirname])
- sage: DC.expand_files_into_sources()
- sage: sorted(DC.sources[0].options.optional) # abs tol 1
-- ['guava', 'magma', 'py2']
-+ ['guava', 'magma']
-
- We check that files are skipped appropriately::
-
--
-2.18.1
+2.28.0
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
index 3f844e1b1e..9817592023 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch
@@ -1,17 +1,17 @@
diff --git a/src/sage/env.py b/src/sage/env.py
-index 061b94f3f1..67cd091540 100644
+index 1ddfc7cfb9..45033d6328 100644
--- a/src/sage/env.py
+++ b/src/sage/env.py
-@@ -189,88 +189,13 @@ var('MAXIMA_FAS')
+@@ -203,97 +203,13 @@ var('ARB_LIBRARY', 'arb')
var('SAGE_BANNER', '')
var('SAGE_IMPORTALL', 'yes')
-
-def _get_shared_lib_filename(libname, *additional_libnames):
- """
-- Return the full path to a shared library file installed in the standard
-- location for the system within the ``LIBDIR`` prefix (or
-- ``$SAGE_LOCAL/lib`` in the case of manual build of Sage).
+- Return the full path to a shared library file installed in
+- ``$SAGE_LOCAL/lib`` or the directories associated with the
+- Python sysconfig.
-
- This can also be passed more than one library name (e.g. for cases where
- some library may have multiple names depending on the platform) in which
@@ -25,7 +25,7 @@ index 061b94f3f1..67cd091540 100644
- For distributions like Debian that use a multiarch layout, we also try the
- multiarch lib paths (i.e. ``/usr/lib//``).
-
-- Returns ``None`` if the file does not exist.
+- This returns ``None`` if the file does not exist.
-
- EXAMPLES::
-
@@ -48,11 +48,17 @@ index 061b94f3f1..67cd091540 100644
-
- for libname in (libname,) + additional_libnames:
- if sys.platform == 'cygwin':
-- bindir = sysconfig.get_config_var('BINDIR')
+- # Later down we take the last matching DLL found, so search
+- # SAGE_LOCAL second so that it takes precedence
+- bindirs = [
+- sysconfig.get_config_var('BINDIR'),
+- os.path.join(SAGE_LOCAL, 'bin')
+- ]
- pats = ['cyg{}.dll'.format(libname), 'cyg{}-*.dll'.format(libname)]
- filenames = []
-- for pat in pats:
-- filenames += glob.glob(os.path.join(bindir, pat))
+- for bindir in bindirs:
+- for pat in pats:
+- filenames += glob.glob(os.path.join(bindir, pat))
-
- # Note: This is not very robust, since if there are multi DLL
- # versions for the same library this just selects one more or less
@@ -66,10 +72,13 @@ index 061b94f3f1..67cd091540 100644
- else:
- ext = 'so'
-
-- libdirs = [sysconfig.get_config_var('LIBDIR')]
+- libdirs = [
+- os.path.join(SAGE_LOCAL, 'lib'),
+- sysconfig.get_config_var('LIBDIR')
+- ]
- multilib = sysconfig.get_config_var('MULTILIB')
- if multilib:
-- libdirs.insert(0, os.path.join(libdirs[0], multilib))
+- libdirs.insert(1, os.path.join(libdirs[0], multilib))
-
- for libdir in libdirs:
- basename = 'lib{}.{}'.format(libname, ext)
@@ -89,7 +98,7 @@ index 061b94f3f1..67cd091540 100644
# locate libgap shared object
-GAP_SO= _get_shared_lib_filename('gap','')
-+GAP_SO= '/default'
++GAP_SO = '/default'
var('GAP_SO', GAP_SO)
# post process
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.15.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.15.patch
deleted file mode 100644
index 63f5d2e146..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
-index 4849c2bffa..76b7bc8602 100644
---- a/src/sage/misc/sphinxify.py
-+++ b/src/sage/misc/sphinxify.py
-@@ -25,6 +25,7 @@ from __future__ import absolute_import, print_function
- import os
- import re
- import shutil
-+import warnings
- from tempfile import mkdtemp
- from sphinx.application import Sphinx
-
-@@ -120,7 +121,10 @@ smart_quotes = no""")
- # buildername, confoverrides, status, warning, freshenv).
- sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format,
- confoverrides, None, None, True)
-- sphinx_app.build(None, [rst_name])
-+ with warnings.catch_warnings():
-+ # Quick and dirty workaround for https://trac.sagemath.org/ticket/28856#comment:19
-+ warnings.simplefilter("ignore")
-+ sphinx_app.build(None, [rst_name])
- sys.path = old_sys_path
-
- # We need to remove "_" from __builtin__ that the gettext module installs
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
index 11ca748196..a91ee319b8 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
@@ -1,24 +1,24 @@
diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
-index bd6b76ab82..ccf1203dec 100644
+index 6e034dcb5a..8ec60ec72b 100644
--- a/src/sage/tests/cmdline.py
+++ b/src/sage/tests/cmdline.py
-@@ -837,8 +837,6 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
+ sage: with open(input, 'w') as F:
+ ....: _ = F.write(s)
+ sage: L = ["sage", "--rst2ipynb", input, output]
+- sage: test_executable(L) # optional - rst2ipynb
+- ('', '', 0)
++ sage: test_executable(L)[2] # optional - rst2ipynb
++ 0
+ sage: import json # optional - rst2ipynb
+ sage: d = json.load(open(output,'r')) # optional - rst2ipynb
+ sage: type(d) # optional - rst2ipynb
+@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
///
4
}}}
-- sage: err # py2
+- sage: err # py2 # optional -- sagenb
- ''
- sage: ret
+ sage: ret # py2 # optional -- sagenb
0
-@@ -871,8 +869,8 @@ def test_executable(args, input="", timeout=100.0, **kwds):
- sage: output = tmp_filename(ext='.sws')
- sage: with open(input, 'w') as F:
- ....: _ = F.write(s)
-- sage: test_executable(["sage", "--rst2sws", input, output]) # py2
-- ('', '', 0)
-+ sage: test_executable(["sage", "--rst2sws", input, output])[2] # py2
-+ 0
- sage: import tarfile # py2
- sage: f = tarfile.open(output, 'r') # py2
- sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
deleted file mode 100644
index c5f95b498d..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/sage/all.py b/src/sage/all.py
-index c87c9372e9..862fca4fcc 100644
---- a/src/sage/all.py
-+++ b/src/sage/all.py
-@@ -306,6 +306,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0))
- # Ignore all deprecations from IPython etc.
- warnings.filterwarnings('ignore', category=DeprecationWarning,
- module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
-+warnings.filterwarnings('ignore', category=DeprecationWarning, message=r".*The import 'werkzeug.ImmutableDict' is deprecated")
- # Ignore collections.abc warnings, there are a lot of them but they are
- # harmless.
- warnings.filterwarnings('ignore', category=DeprecationWarning,
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
deleted file mode 100644
index 49cdfd189b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py
-index 6bdc9a0..31fc780 100644
---- a/src/sage/doctest/parsing.py
-+++ b/src/sage/doctest/parsing.py
-@@ -40,6 +40,7 @@ from .external import available_software
-
- float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)')
- optional_regex = re.compile(r'(py2|py3|long time|not implemented|not tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))')
-+pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack size to )\d+\.')
- find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M)
- find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M)
- random_marker = re.compile('.*random', re.I)
-@@ -935,6 +936,7 @@ class SageOutputChecker(doctest.OutputChecker):
-
- """
- got = self.human_readable_escape_sequences(got)
-+ got = pari_stack_warning_regex.sub('', got)
- if isinstance(want, MarkedOutput):
- if want.random:
- return True
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch
new file mode 100644
index 0000000000..19d6155226
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch
@@ -0,0 +1,39 @@
+diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py
+index d7d00b0..cd1607a 100644
+--- a/src/sage/repl/image.py
++++ b/src/sage/repl/image.py
+@@ -77,7 +77,7 @@ class Image(SageObject):
+
+ - ``size`` -- 2-tuple, containing (width, height) in pixels.
+
+- - ``color`` -- string or tuple of numeric. What colour to use
++ - ``color`` -- string, numeric or tuple of numeric. What colour to use
+ for the image. Default is black. If given, this should be a
+ a tuple with one value per band. When creating RGB images,
+ you can also use colour strings as supported by the
+@@ -91,9 +91,15 @@ class Image(SageObject):
+ EXAMPLES::
+
+ sage: from sage.repl.image import Image
+- sage: Image('P', (16, 16), (13,))
++ sage: Image('P', (16, 16), 13)
+ 16x16px 8-bit Color image
+ """
++ # pillow does not support Sage integers as color
++ from sage.rings.integer import Integer
++ if isinstance(color, Integer):
++ color = int(color)
++ elif isinstance(color, tuple):
++ color = tuple(int(i) if isinstance(i, Integer) else i for i in color)
+ self._pil = PIL.Image.new(mode, size, color)
+
+ @property
+@@ -233,7 +239,7 @@ class Image(SageObject):
+ EXAMPLES::
+
+ sage: from sage.repl.image import Image
+- sage: img = Image('P', (12, 34), (13,))
++ sage: img = Image('P', (12, 34), 13)
+ sage: filename = tmp_filename(ext='.png')
+ sage: img.save(filename)
+ sage: with open(filename, 'rb') as f:
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
deleted file mode 100644
index 1b64f39fe6..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/sage/all.py b/src/sage/all.py
-index ca309ef..be3186b 100644
---- a/src/sage/all.py
-+++ b/src/sage/all.py
-@@ -298,6 +298,23 @@ warnings.filterwarnings('ignore', module='matplotlib[.]font_manager')
- warnings.filterwarnings('default',
- '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.')
-
-+# Hotpatch around https://bugs.python.org/issue5755 which won't be fixed for
-+# python 2.7. Idea by https://stackoverflow.com/a/36293331.
-+from distutils.command.build_ext import build_ext
-+from distutils.sysconfig import customize_compiler
-+
-+_build_extensions = build_ext.build_extensions
-+
-+def build_extensions_patched(self):
-+ customize_compiler(self.compiler)
-+ try:
-+ self.compiler.compiler_so.remove("-Wstrict-prototypes")
-+ except (AttributeError, ValueError):
-+ pass
-+ _build_extensions(self)
-+
-+build_ext.build_extensions = build_extensions_patched
-+
-
- # Set a new random number seed as the very last thing
- # (so that printing initial_seed() and using that seed
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch
new file mode 100644
index 0000000000..83bd83a6d3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch
@@ -0,0 +1,36 @@
+diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
+index cb3667659e..867f547d71 100644
+--- a/src/sage/doctest/forker.py
++++ b/src/sage/doctest/forker.py
+@@ -200,6 +200,15 @@ def init_sage(controller=None):
+ from sage.cpython._py2_random import Random
+ sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random
+
++ # IPython's pretty printer sorts the repr of dicts by their keys by default
++ # (or their keys' str() if they are not otherwise orderable). However, it
++ # disables this for CPython 3.6+ opting to instead display dicts' "natural"
++ # insertion order, which is preserved in those versions).
++ # However, this order is random in some instances.
++ # Also modifications of code may affect the order.
++ # So here we fore sorted dict printing.
++ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
++
+ if controller is None:
+ import sage.repl.ipython_kernel.all_jupyter
+ else:
+@@ -222,15 +231,6 @@ def init_sage(controller=None):
+ from sage.repl.rich_output.backend_doctest import BackendDoctest
+ dm.switch_backend(BackendDoctest())
+
+- # IPython's pretty printer sorts the repr of dicts by their keys by default
+- # (or their keys' str() if they are not otherwise orderable). However, it
+- # disables this for CPython 3.6+ opting to instead display dicts' "natural"
+- # insertion order, which is preserved in those versions).
+- # However, this order is random in some instances.
+- # Also modifications of code may affect the order.
+- # So here we fore sorted dict printing.
+- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
+-
+ # Switch on extra debugging
+ from sage.structure.debug_options import debug
+ debug.refine_category_hash_check = True
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
deleted file mode 100644
index 9f502a6695..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sagenb/__init__.py b/sagenb/__init__.py
-index 4db0d2cb..2fc5f01e 100644
---- a/sagenb/__init__.py
-+++ b/sagenb/__init__.py
-@@ -1,3 +1,8 @@
- # -*- coding: utf-8 -*
- # init
-+import warnings
- from . import storage
-+
-+# deprecation in attrs, needs to be fixed in twisted
-+warnings.filterwarnings('ignore', category=DeprecationWarning,
-+ message=r'The usage of `cmp` is deprecated and will be removed.*')
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch
new file mode 100644
index 0000000000..2ee5db3e29
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx
+index 9041238f1d..469befbc66 100644
+--- a/src/sage/interfaces/sagespawn.pyx
++++ b/src/sage/interfaces/sagespawn.pyx
+@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess):
+ Check that the process eventually dies after calling
+ ``terminate_async``::
+
+- sage: s.ptyproc.terminate_async(interval=0.2)
++ sage: s.ptyproc.terminate_async(interval=float(0.2))
+ sage: while True:
+ ....: try:
+ ....: os.kill(s.pid, 0)
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
index 56f0927962..661077cfa8 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -36,7 +36,7 @@ index 73a078e619..059125c59f 100644
# Run Sphinx with Sage's special logger
- sys.argv = ["sphinx-build"] + build_command.split()
- from .sphinxbuild import runsphinx
-+ args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split()
++ args = "python3 -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split()
try:
- runsphinx()
+ subprocess.check_call(args)
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
index 20020d610f..d71f3acbc7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sympow-cache.patch
@@ -1,5 +1,5 @@
diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py
-index 1640ac4f6a..03578be7b8 100644
+index 92cb01fd73..b123e6accc 100644
--- a/src/sage/lfunctions/sympow.py
+++ b/src/sage/lfunctions/sympow.py
@@ -50,6 +50,7 @@ from __future__ import print_function, absolute_import
@@ -8,14 +8,14 @@ index 1640ac4f6a..03578be7b8 100644
+from sage.env import DOT_SAGE
from sage.structure.sage_object import SageObject
- from sage.misc.all import pager, verbose
- import sage.rings.all
-@@ -76,7 +77,7 @@ class Sympow(SageObject):
+ from sage.misc.all import pager
+ from sage.misc.verbose import verbose
+@@ -78,7 +79,7 @@ class Sympow(SageObject):
"""
Used to call sympow with given args
"""
-- cmd = 'sympow %s'%args
+- cmd = 'sympow %s' % args
+ cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args)
- v = os.popen(cmd).read().strip()
+ with os.popen(cmd) as f:
+ v = f.read().strip()
verbose(v, level=2)
- return v
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix
deleted file mode 100644
index 5fc8a4aa6f..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/pybrial.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, buildPythonPackage
-, brial
-}:
-# This has a cyclic dependency with sage. I don't include sage in the
-# buildInputs and let python figure it out at runtime. Because of this,
-# I don't include the package in the main nipxkgs tree. It wouldn't be useful
-# outside of sage anyways (as you could just directly depend on sage and use
-# it).
-buildPythonPackage rec {
- pname = "pyBRiAl";
- version = brial.version;
-
- # included with BRiAl source
- src = brial.src;
-
- sourceRoot = "source/sage-brial";
-
- meta = with stdenv.lib; {
- description = "python implementation of BRiAl";
- license = licenses.gpl2;
- maintainers = teams.sage.members;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-openid.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/python-openid.nix
deleted file mode 100644
index 1e8a908ac7..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-openid.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, django
-, nose
-, twill
-, pycrypto
-}:
-
-buildPythonPackage rec {
- pname = "python-openid";
- version = "2.2.5";
-
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
- };
-
- propagatedBuildInputs = [
- pycrypto
- ];
-
- # Cannot access the djopenid example module.
- # I don't know how to fix that (adding the examples dir to PYTHONPATH doesn't work)
- doCheck = false;
- checkInputs = [ nose django twill ];
- checkPhase = ''
- nosetests
- '';
-
- meta = with stdenv.lib; {
- description = "OpenID library for Python";
- license = licenses.asl20;
- maintainers = teams.sage.members;
- homepage = "https://github.com/openid/python-openid/";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
index ba7f6ccd18..568a4a39f3 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, writeTextFile
-, python
, sagelib
, env-locations
, gfortran
@@ -67,11 +66,6 @@ let
"@sage-local@"
"@sage-local@/build"
pythonEnv
- # empty python env to add python wrapper that clears PYTHONHOME (see
- # wrapper.nix). This is necessary because sage will call the python3 binary
- # (from python2 code). The python2 PYTHONHOME (again set in wrapper.nix)
- # will then confuse python3, if it is not overwritten.
- python3.buildEnv
gfortran # for inline fortran
stdenv.cc # for cython
bash
@@ -129,8 +123,21 @@ writeTextFile rec {
]
}'
export SAGE_ROOT='${sagelib.src}'
- export SAGE_LOCAL='@sage-local@'
+ '' +
+ # TODO: is using pythonEnv instead of @sage-local@ here a good
+ # idea? there is a test in src/sage/env.py that checks if the values
+ # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py.
+ # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not
+ # have access to sage-with-env), but env.py autodetects
+ # SAGE_LOCAL to be pythonEnv.
+ # setting SAGE_LOCAL to pythonEnv also avoids having to create
+ # python3, ipython, ipython3 and jupyter symlinks in
+ # sage-with-env.nix.
+ ''
+ export SAGE_LOCAL='${pythonEnv}'
+
export SAGE_SHARE='${sagelib}/share'
+ export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand
orig_path="$PATH"
export PATH='${runtimepath}'
@@ -177,9 +184,9 @@ writeTextFile rec {
])
}'
- export SAGE_LIB='${sagelib}/${python.sitePackages}'
+ export SAGE_LIB='${sagelib}/${python3.sitePackages}'
- export SAGE_EXTCODE='${sagelib.src}/src/ext'
+ export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data'
# for find_library
export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 4791d12450..8948621a02 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
@@ -10,44 +10,23 @@
# all get the same sources with the same patches applied.
stdenv.mkDerivation rec {
- version = "8.9";
+ version = "9.2";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
- sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a";
+ sha256 = "103j8d5x6szl9fxaz0dvdi4y47q1af9h9y5hmjh2xayi62qmp5ql";
};
# Patches needed because of particularities of nix or the way this is packaged.
# The goal is to upstream all of them and get rid of this list.
nixPatches = [
- # https://trac.sagemath.org/ticket/25358
- (fetchpatch {
- name = "safe-directory-test-without-patch.patch";
- url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463";
- sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7";
- })
-
- # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations
- # https://trac.sagemath.org/ticket/29297 should be included in 9.1
- (fetchpatch {
- name = "is_unitary-special-case.patch";
- url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a";
- sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay";
- })
-
- # Unfortunately inclusion in upstream sage was rejected. Instead the bug was
- # fixed in python, but of course not backported to 2.7. So we'll probably
- # have to keep this around until 2.7 is deprecated.
- # https://trac.sagemath.org/ticket/25316
- # https://github.com/python/cpython/pull/7476
- ./patches/python-5755-hotpatch.patch
-
# Make sure py2/py3 tests are only run when their expected context (all "sage"
# tests) are also run. That is necessary to test dochtml individually. See
# https://trac.sagemath.org/ticket/26110 for an upstream discussion.
+ # TODO: Determine if it is still necessary.
./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
# Fixes a potential race condition which can lead to transient doctest failures.
@@ -61,10 +40,17 @@ stdenv.mkDerivation rec {
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch
- # Fix doctest failures with docutils 0.15:
- # https://nix-cache.s3.amazonaws.com/log/dzmzrb2zvardsmpy7idg7djkizmkzdhs-sage-tests-8.9.drv
- # https://trac.sagemath.org/ticket/28856#comment:19
- ./patches/docutils-0.15.patch
+ # Sage's workaround to pretty print dicts (in
+ # src/sage/doctest/forker.py:init_sage) runs too late (after
+ # controller.load_environment(), which imports sage.all.*) to to
+ # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer.
+ # Due to the sandpiles module being lazily loaded, this only
+ # affects the first run (subsequent runs read from an import cache
+ # at ~/.sage/cache and are not affected), which is probably why
+ # other distributions don't hit this bug. This breaks two sandpile
+ # tests, so do the workaround a little bit earlier.
+ # https://trac.sagemath.org/ticket/31053
+ ./patches/register-pretty-printer-earlier.patch
];
# Since sage unfortunately does not release bugfix releases, packagers must
@@ -74,6 +60,17 @@ stdenv.mkDerivation rec {
# To help debug the transient error in
# https://trac.sagemath.org/ticket/23087 when it next occurs.
./patches/configurationpy-error-verbose.patch
+
+ # fix intermittent errors in Sage 9.2's psage.py (this patch is
+ # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730
+ (fetchpatch {
+ name = "fix-psage-is-locked.patch";
+ url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9";
+ sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q";
+ })
+
+ # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
+ ./patches/sagespawn-implicit-casting.patch
];
# Patches needed because of package updates. We could just pin the versions of
@@ -96,55 +93,16 @@ stdenv.mkDerivation rec {
} // builtins.removeAttrs args [ "rev" "base" ])
);
in [
- # New glpk version has new warnings, filter those out until upstream sage has found a solution
- # Should be fixed with glpk > 4.65.
- # https://trac.sagemath.org/ticket/24824
- ./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply
- (fetchpatch {
- url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch";
- sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp";
- stripLen = 1;
- })
-
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
# now set the cache dir to be withing the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
- # https://trac.sagemath.org/ticket/28472
- (fetchpatch {
- name = "eclib-20190909.patch";
- url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d";
- sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3";
- })
-
# ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests
./patches/ignore-cmp-deprecation.patch
- # Werkzeug has deprecated ImmutableDict, but it is still used in legacy
- # sagenb. That's no big issue since sagenb will be removed soon anyways.
- ./patches/ignore-werkzeug-immutable-dict-deprecation.patch
-
- # threejs r109 (#28560)
- (fetchpatch {
- name = "threejs-r109.patch";
- url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da";
- sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc";
- })
-
- # https://trac.sagemath.org/ticket/28911
- (fetchpatch {
- name = "sympy-1.5.patch";
- url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
- sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
- })
-
- # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux)
- (fetchpatch {
- name = "pari-2.11.3.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43";
- sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2";
- })
+ # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
+ ./patches/pillow-update.patch
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
@@ -152,16 +110,16 @@ stdenv.mkDerivation rec {
postPatch = ''
# make sure shebangs etc are fixed, but sage-python23 still works
find . -type f -exec sed \
- -e 's/sage-python23/python/g' \
+ -e 's/sage-python23/python3/g' \
-i {} \;
echo '#!${runtimeShell}
- python "$@"' > build/bin/sage-python23
+ python3 "$@"' > build/bin/sage-python23
# Make sure sage can at least be imported without setting any environment
# variables. It won't be close to feature complete though.
sed -i \
- "s|var('SAGE_LOCAL',.*|var('SAGE_LOCAL', '$out/src')|" \
+ "s|var('SAGE_ROOT'.*|var('SAGE_ROOT', '$out')|" \
src/sage/env.py
# Do not use sage-env-config (generated by ./configure).
@@ -169,7 +127,39 @@ stdenv.mkDerivation rec {
echo '# do nothing' > src/bin/sage-env-config
'';
- configurePhase = "# do nothing";
+ # Test src/doc/en/reference/spkg/conf.py will fail if
+ # src/doc/en/reference/spkg/index.rst is not generated. It is
+ # generated by src/doc/bootstrap, so I've copied the relevant part
+ # here. An alternative would be to create an empty
+ # src/doc/en/reference/spkg/index.rst file.
+ configurePhase = ''
+ OUTPUT_DIR="src/doc/en/reference/spkg"
+ mkdir -p "$OUTPUT_DIR"
+ OUTPUT_INDEX="$OUTPUT_DIR"/index.rst
+ cat > "$OUTPUT_INDEX" <> "$OUTPUT_INDEX" " $PKG_BASE"
+ fi
+ fi
+ done
+ cat >> "$OUTPUT_INDEX" < some_pkg-1.0
+ # python3.8-some-pkg-1.0 -> some_pkg-1.0
pkg_to_spkg_name = pkg: patch_names: let
parts = lib.splitString "-" pkg.name;
- # remove python2.7-
- stripped_parts = if (builtins.head parts) == python2.libPrefix then builtins.tail parts else parts;
+ # remove python3.8-
+ stripped_parts = if (builtins.head parts) == python3.libPrefix then builtins.tail parts else parts;
version = lib.last stripped_parts;
orig_pkgname = lib.init stripped_parts;
pkgname = patch_names (lib.concatStringsSep "_" orig_pkgname);
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix
index a21bffea14..e2acef7b8e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- broken = true;
description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
license = licenses.gpl2;
maintainers = teams.sage.members;
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
index bf618fe64f..a10672f3a0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix
@@ -1,6 +1,6 @@
{ stdenv
, sage-with-env
-, python
+, python3
, maxima-ecl
, tachyon
, jmol
@@ -17,16 +17,15 @@ stdenv.mkDerivation rec {
# modules are imported and because matplotlib is used to produce plots.
buildInputs = [
sage-with-env.env.lib
- python
+ python3
maxima-ecl
tachyon
jmol
cddlib
- ] ++ (with python.pkgs; [
+ ] ++ (with python3.pkgs; [
psutil
future
sphinx
- sagenb
scipy
sympy
matplotlib
@@ -35,8 +34,6 @@ stdenv.mkDerivation rec {
ipykernel
ipywidgets
jupyter_client
- typing
- pybrial
]);
unpackPhase = ''
@@ -47,13 +44,26 @@ stdenv.mkDerivation rec {
chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE"
'';
+ postPatch = ''
+ # src/doc/bootstrap generates installation instructions for
+ # arch, debian, fedora, cygwin and homebrew. as a hack, disable
+ # including the generated files.
+ sed -i "/literalinclude/d" $SAGE_DOC_SRC_OVERRIDE/en/installation/source.rst
+ '';
+
buildPhase = ''
export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
export HOME="$TMPDIR/sage_home"
mkdir -p "$HOME"
# needed to link them in the sage docs using intersphinx
- export PPLPY_DOCS=${python.pkgs.pplpy.doc}/share/doc/pplpy
+ export PPLPY_DOCS=${python3.pkgs.pplpy.doc}/share/doc/pplpy
+
+ # adapted from src/doc/bootstrap
+ OUTPUT_DIR="$SAGE_DOC_SRC_OVERRIDE/en/reference/repl"
+ mkdir -p "$OUTPUT_DIR"
+ OUTPUT="$OUTPUT_DIR/options.txt"
+ ${sage-with-env}/bin/sage -advanced > "$OUTPUT"
${sage-with-env}/bin/sage -python -m sage_setup.docbuild \
--mathjax \
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
index 830d806a8b..1c2235bf71 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
@@ -15,6 +15,7 @@
, ecm
, flint
, gd
+, giac
, givaro
, glpk
, gsl
@@ -51,6 +52,7 @@
, libbraiding
, gmpy2
, pplpy
+, sqlite
}:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -94,6 +96,7 @@ buildPythonPackage rec {
ecm
fflas-ffpack
flint
+ giac
givaro
glpk
gsl
@@ -124,6 +127,7 @@ buildPythonPackage rec {
libbraiding
gmpy2
pplpy
+ sqlite
];
buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagenb.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagenb.nix
deleted file mode 100644
index ad5c53b6c1..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagenb.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, python
-, buildPythonPackage
-, fetchFromGitHub
-, mathjax
-, twisted
-, flask
-, flask-oldsessions
-, flask-openid
-, flask-autoindex
-, flask-babel
-}:
-
-# Has a cyclic dependency with sage (not expressed here) and is not useful outside of sage.
-# Deprecated, hopefully soon to be removed. See
-# https://trac.sagemath.org/ticket/25837
-
-buildPythonPackage rec {
- pname = "sagenb";
- version = "1.1.2";
-
- src = fetchFromGitHub {
- owner = "sagemath";
- repo = "sagenb";
- rev = version;
- sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs";
- };
-
- patches = [
- # cmp deprecation in attrs needs to be handled in twisted
- ./patches/sagenb-cmp-deprecation.patch
- ];
-
- propagatedBuildInputs = [
- twisted
- flask
- flask-oldsessions
- flask-openid
- flask-autoindex
- flask-babel
- ];
-
- # tests depend on sage
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "Sage Notebook";
- license = licenses.gpl3Plus;
- maintainers = teams.sage.members;
- };
-
- # let sagenb use mathjax
- postInstall = ''
- mkdir -p "$out/${python.sitePackages}/sagenb/data"
- ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax"
- '';
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
index 0ba1cd0d2f..11d7309583 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix
@@ -18,14 +18,14 @@ in
stdenv.mkDerivation rec {
pname = "simgrid";
- version = "3.25";
+ version = "3.26";
src = fetchFromGitLab {
domain = "framagit.org";
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "019fgryfwpcrkv1f3271v7qxk0mfw2w990vgnk1cqhmr9i1f17gs";
+ sha256 = "0kwiggdjqjhjvmwb1m7hb9clvm3xz948fy5ia67dif2pakwad754";
};
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix
index a71ddc874c..8e7c5bddd9 100644
--- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
- version = "1.8.29";
+ version = "1.8.30";
src = fetchPypi {
inherit pname version;
- sha256 = "8f5900dc0a404ab9cf5a00155f83e9aaeab18161ce21a352dfdcf2d7abf5d78e";
+ sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
index b6a93aefb5..2fa03a97e8 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.19.2";
+ version = "0.19.3";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi";
+ sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix
new file mode 100644
index 0000000000..35b2500c7c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -0,0 +1,86 @@
+{ rustPlatform
+, lib
+, fetchFromGitHub
+
+, pkg-config
+, fontconfig
+, python3
+, openssl
+, perl
+
+, dbus
+, libX11
+, xcbutil
+, libxcb
+, xcbutilkeysyms
+, xcbutilwm # contains xcb-ewmh among others
+, libxkbcommon
+, libglvnd # libEGL.so.1
+, egl-wayland
+, wayland
+, libGLU
+, libGL
+, freetype
+, zlib
+}:
+let
+ runtimeDeps = [
+ libX11
+ xcbutil
+ libxcb
+ xcbutilkeysyms
+ xcbutilwm
+ libxkbcommon
+ dbus
+ libglvnd
+ zlib
+ egl-wayland
+ wayland
+ libGLU
+ libGL
+ fontconfig
+ freetype
+ ];
+ pname = "wezterm";
+in
+
+rustPlatform.buildRustPackage {
+ inherit pname;
+ version = "unstable-2020-11-22";
+
+ src = fetchFromGitHub {
+ owner = "wez";
+ repo = pname;
+ rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
+ sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
+ fetchSubmodules = true;
+ };
+ cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
+
+ nativeBuildInputs = [
+ pkg-config
+ python3
+ openssl.dev
+ perl
+ ];
+
+ buildInputs = runtimeDeps;
+
+ installPhase = ''
+ for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
+ patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
+ install -D $releaseDir/$artifact -t $out/bin
+ done
+ '';
+
+ # prevent further changes to the RPATH
+ dontPatchELF = true;
+
+ meta = with lib; {
+ description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
+ homepage = "https://wezfurlong.org/wezterm";
+ license = licenses.mit;
+ maintainers = with maintainers; [ steveej ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
index 6aa4bcc52b..ded8f7ba69 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "bumpver";
- version = "2020.1107";
+ version = "2020.1108";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "75704333a8d1699e2cadcf1fcd3027a2cab6837ae343af10a61c6eef4e0313d7";
+ sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
index f8ad81c605..6d39ae0931 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "fossil";
- version = "2.12.1";
+ version = "2.13";
src = fetchurl {
urls =
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${pname}-${version}.tar.gz";
- sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2";
+ sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr";
};
nativeBuildInputs = [ installShellFiles tcl ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
index bf6591a8cb..d019fcbae5 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
@@ -201,6 +201,7 @@ let
gitui = callPackage ./gitui {
inherit (darwin.apple_sdk.frameworks) Security AppKit;
+ inherit (pkgs) openssl perl;
};
glab = callPackage ./glab { };
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
index f667a7b6d8..0fa3065117 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "1ng22g9h1l1v2yav8zh6w4nn6ifv8sfz8566m8155d0cza2iimw6";
+ sha256 = "0rh902h76pn7ja5zizlfklmwcyyki4b0v4irw1j40cjjnah75ljp";
};
- cargoSha256 = "0b3qv1ksk8fmpawih2qrz29wlpj1gvq9hw4yqm7hdk6awl5h8lvv";
+ cargoSha256 = "1rniihx1rb18n2bp4b2yhn4ayih5cbcyqmiv6jckas7jwrgk6wra";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 830d189665..7ba8a652d8 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "1j1nyx4ly87g0hk3hfw3qbykb64hrg3vg4r52z1w146v6ln7lm7h";
+ sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl";
};
- vendorSha256 = "19gv7ggbry46h40d9sc5cqba95vjfknzdd1cn3xa5409qaczg9lg";
+ vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index dac3c54a16..3fb8b2f35e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "2.15.7";
+ version = "2.15.9";
src = fetchPypi {
inherit pname version;
- sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr";
+ sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
index 21e382a44b..f89349aaea 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }:
+{ stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec {
pname = "gitui";
- version = "0.10.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
- sha256 = "1ifwbi6nydh66z6cprjmz2qvy9z52rj9jg2xf054i249gy955hah";
+ sha256 = "0yq98jslbac87zdzlwqc2kcd6hqy2wnza3l8n3asss1iaqcb0ilh";
};
- cargoSha256 = "1454dn7k1fc4yxhbcmx0z3hj9d9srnlc2k1qp707h1vq46ib1rsf";
+ cargoSha256 = "16riggrhk1f6lg8y46wn89ab5b1iz6lw00ngid20x4z32d2ww70f";
- nativeBuildInputs = [ python3 ];
- buildInputs = [ ]
- ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb
+ nativeBuildInputs = [ python3 perl ];
+ buildInputs = [ openssl ]
+ ++ stdenv.lib.optional stdenv.isLinux xclip
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
new file mode 100644
index 0000000000..f7b6aa1531
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }:
+
+let
+ pname = "radicle-upstream";
+ version = "0.1.5";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
+ sha256 = "1q5p6bvzi5awxd9a3xvvdhy26bz0dx8drb1z0zzqdvqqcxxyydq7";
+ };
+
+ contents = appimageTools.extractType2 { inherit name src; };
+
+ git-remote-rad = stdenv.mkDerivation rec {
+ pname = "git-remote-rad";
+ inherit version;
+ src = contents;
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ zlib ];
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad
+ '';
+ };
+in
+
+# FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros
+# v0.1.0) uses unstable rust features, making a from source build impossible at
+# this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674
+appimageTools.wrapType2 {
+ inherit name src;
+
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
+
+ extraInstallCommands = ''
+ mv $out/bin/${name} $out/bin/${pname}
+
+ # this automatically adds the git-remote-rad binary to the users `PATH` so
+ # they don't need to mess around with shell profiles...
+ ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad
+
+ # desktop item
+ install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+
+ # icon
+ install -m 444 -D ${contents}/${pname}.png \
+ $out/share/icons/hicolor/512x512/apps/${pname}.png
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A decentralized app for code collaboration";
+ homepage = "https://radicle.xyz/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ xwvvvvwx ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
index bd6c5f5cc6..d624981820 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
- version = "2.12.1";
+ version = "2.13.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "1x8s1w8yqhj5nm20knr2gkb59rwzx220nf099lgd62cajzsdpjx5";
+ sha256 = "0n4gi7sh6d1maqwp12fsznrky9xwkk2jrmxfwa2hnk8wb2rhvlrm";
};
goPackagePath = "github.com/git-lfs/git-lfs";
@@ -30,7 +30,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "Git extension for versioning large files";
homepage = "https://git-lfs.github.com/";
- changelog = "https://github.com/git-lfs/git-lfs/releases/tag/v${version}";
+ changelog = "https://github.com/git-lfs/git-lfs/blob/v${version}/CHANGELOG.md";
license = [ licenses.mit ];
maintainers = [ maintainers.twey maintainers.marsam ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
index 0f7e2bc948..1439f79224 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
- version = "1.0.0-alpha.17";
+ version = "1.0.0-alpha.24";
src = fetchCrate {
inherit version pname;
- sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv";
+ sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s";
};
- cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn";
+ cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44";
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix
index 37fd805566..3a45d12620 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
- install -Dt $out/bin $src/yadm
- install -Dt $out/share/man/man1 $src/yadm.1
- install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
- install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
+ install -Dt $out/bin yadm
+ install -Dt $out/share/man/man1 yadm.1
+ install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
+ install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
runHook postInstall
'';
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
* Supplies a method of encrypting confidential data so it can safely be stored in your repository.
'';
license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ abathur ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/bomi/default.nix b/third_party/nixpkgs/pkgs/applications/video/bomi/default.nix
deleted file mode 100644
index d812ac4887..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/bomi/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ mkDerivation, config, stdenv, fetchFromGitHub
-, fetchpatch, pkgconfig, perl, python, which
-, libX11, libxcb, libGLU, libGL
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
-, libchardet
-, ffmpeg
-
-, mpg123
-, libass
-, libdvdread
-, libdvdnav
-, icu
-, libquvi
-, alsaLib
-, libvdpau, libva
-, libbluray
-, jackSupport ? false, jack ? null
-, portaudioSupport ? false, portaudio ? null
-, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
-, cddaSupport ? false, libcdda ? null
-, youtubeSupport ? true, youtube-dl ? null
-}:
-
-with stdenv.lib;
-
-assert jackSupport -> jack != null;
-assert portaudioSupport -> portaudio != null;
-assert pulseSupport -> libpulseaudio != null;
-assert cddaSupport -> libcdda != null;
-assert youtubeSupport -> youtube-dl != null;
-
-mkDerivation rec {
- pname = "bomi";
- version = "0.9.11";
-
- src = fetchFromGitHub {
- owner = "xylosper";
- repo = "bomi";
- rev = "v${version}";
- sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h";
- };
-
- patches = [
- (fetchpatch rec {
- name = "bomi-compilation-fix.patch";
- url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725";
- sha256 = "1dwryya5ljx35dbx6ag9d3rjjazni2mfn3vwirjdijdy6yz22jm6";
- })
- (fetchpatch rec {
- name = "bomi-fix-expected-unqualified-id-before-numeric-constant-unix.patch";
- url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725";
- sha256 = "0n3xsrdrggimzw30gxlnrr088ndbdjqlqr46dzmfv8zan79lv5ri";
- })
- ];
-
- buildInputs = with stdenv.lib;
- [ libX11
- libxcb
- libGLU libGL
- qtbase
- qtx11extras
- qtdeclarative
- qtquickcontrols
- ffmpeg
- libchardet
-
- mpg123
- libass
- libdvdread
- libdvdnav
- icu
- libquvi
- alsaLib
- libvdpau
- libva
- libbluray
- ]
- ++ optional jackSupport jack
- ++ optional portaudioSupport portaudio
- ++ optional pulseSupport libpulseaudio
- ++ optional cddaSupport libcdda
- ;
-
- preConfigure = ''
- patchShebangs configure
- '';
-
- preBuild = ''
- patchShebangs src/mpv/waf
- patchShebangs build-mpv
- '';
-
- dontWrapQtApps = true;
- postInstall = ''
- wrapQtApp $out/bin/bomi \
- ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
- '';
-
- dontUseQmakeConfigure = true;
-
- configureFlags = with stdenv.lib;
- [ "--qmake=qmake" ]
- ++ optional jackSupport "--enable-jack"
- ++ optional portaudioSupport "--enable-portaudio"
- ++ optional pulseSupport "--enable-pulseaudio"
- ++ optional cddaSupport "--enable-cdda"
- ;
-
- nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
-
- meta = with stdenv.lib; {
- description = "Powerful and easy-to-use multimedia player";
- homepage = "https://bomi-player.github.io/";
- license = licenses.gpl2Plus;
- maintainers = [ maintainers.abbradar ];
- platforms = platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix
index 89c2eb425c..8dd10fff89 100644
--- a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-chromecast";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "vishen";
repo = pname;
rev = "v${version}";
- sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg";
+ sha256 = "0frvj1van1qn7hi96m0l7pzm4jf0v49xl4r4fi2lh1yqzgsgzy9f";
};
- vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r";
+ vendorSha256 = "0vgbmgk07kqmhhmcssy1ibr2hzk07hf32kkdyj2b9jqj9sb49p49";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
index 6863ef9ca6..12c16a744b 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
@@ -467,7 +467,7 @@ let self = rec {
propagatedBuildInputs = [
simpleplugin
python2Packages.requests
- python2Packages.libtorrentRasterbar
+ python2Packages.libtorrent-rasterbar
];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
index 6a0b1cbdf7..d0a7ed5e23 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
@@ -19,7 +19,7 @@ in buildEnv {
--prefix KODI_HOME : $out/share/kodi \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
(stdenv.lib.concatMap
- (plugin: plugin.extraRuntimeDependencies) plugins)}"
+ (plugin: plugin.extraRuntimeDependencies or []) plugins)}"
done
'';
diff --git a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix
index 7320deaf4c..003da6e6a9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mapmap/default.nix
@@ -46,6 +46,11 @@ mkDerivation rec {
url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
})
+ # fix build with libsForQt515
+ (fetchpatch {
+ url = "https://github.com/mapmapteam/mapmap/pull/518/commits/ac49acc1e2ec839832b86838e93a8c13030affeb.patch";
+ sha256 = "sha256-tSLbyIDv5mSejnw9oru5KLAyQqjgJLLREKQomEUcGt8=";
+ })
];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
index d7dc865c16..2b9605aa3c 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
@@ -196,6 +196,8 @@ in stdenv.mkDerivation rec {
cp TOOLS/mpv_identify.sh $out/bin
cp TOOLS/umpv $out/bin
+ cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
+ sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop
'' + optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -r build/mpv.app $out/Applications
diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
index 58df85332e..1c52a89e98 100644
--- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
@@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq";
};
+ patches = [
+ # Couldn't find an upstream version of this patch
+ # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1
+ ./fix-missing-includes-with-qt-5.15.patch
+ ];
+
# VLC uses a *ton* of libraries for various pieces of functionality, many of
# which are not included here for no other reason that nobody has mentioned
# needing them
@@ -99,6 +105,5 @@ stdenv.mkDerivation rec {
homepage = "http://www.videolan.org/vlc/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
- broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/third_party/nixpkgs/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch
new file mode 100644
index 0000000000..d980fd2f6d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch
@@ -0,0 +1,37 @@
+Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp
++++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
+@@ -25,6 +25,7 @@
+ #include "qt.hpp"
+
+ #include
++#include
+
+ class TimeTooltip : public QWidget
+ {
+Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp
++++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
+@@ -27,6 +27,7 @@
+ #include "input_manager.hpp" /* THEMIM */
+
+ #include
++#include
+ #include
+ #include
+ #include
+Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
+===================================================================
+--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp
++++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
+@@ -53,6 +53,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
index d2f1f2debe..e143ebcca7 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
@@ -9,20 +9,25 @@
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.0.21";
+ version = "2.0.22";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23";
+ sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
- installFlags = [ "PREFIX=$(out)" ];
+ # manpage requires building the vendored go-md2man
+ makeFlags = [ "bin/conmon" ];
+
+ installPhase = ''
+ install -D bin/conmon -t $out/bin
+ '';
passthru.tests = { inherit (nixosTests) cri-o podman; };
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix
index 84e0135f66..9ba7ff5d66 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
- version = "1.32.0";
+ version = "1.33.0";
goPackagePath = "github.com/docker-slim/docker-slim";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
- sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h";
+ sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
@@ -39,6 +39,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "Minify and secure Docker containers";
homepage = "https://dockersl.im/";
+ changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
index 5e1bc9489d..3d4df33300 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dumb-init";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
- sha256 = "1ws944y8gch6h7iqvznfwlh9hnmdn36aqh9w6cbc7am8vbyq0ffa";
+ sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
};
buildInputs = [ glibc.static ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
index 464fe46b49..ce08428eba 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, glibc }:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "vpcs";
- version = "0.8";
+ version = "0.8.1";
- src = fetchurl {
- name = "${pname}-${version}.tar.bz2";
- url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
- sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
+ src = fetchFromGitHub {
+ owner = "GNS3";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak";
};
- patches = [ ./vpcs-0.8-glibc-2.26.patch ];
-
- buildInputs = [ glibc.static ];
-
buildPhase = ''(
cd src
./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
@@ -27,13 +24,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "Virtual PC simulator";
+ description = "A simple virtual PC simulator";
longDescription = ''
- The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or
- ping/traceroute the other hosts/routers from the VPCS when you study the
- Cisco routers in the dynamips.
+ The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can
+ ping/traceroute them, or ping/traceroute the other hosts/routers from the
+ VPCS when you study the Cisco routers in the dynamips.
'';
- homepage = "https://sourceforge.net/projects/vpcs/";
+ inherit (src.meta) homepage;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch b/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
deleted file mode 100644
index d94a39ccd6..0000000000
--- a/third_party/nixpkgs/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/getopt.h b/src/getopt.h
-index 4394aa2..bf59e10 100644
---- a/src/getopt.h
-+++ b/src/getopt.h
-@@ -49,9 +49,6 @@ extern int optind;
- extern int opterr;
- extern int optopt;
-
--#ifndef FreeBSD
--int getopt(int argc, char** argv, char* optstr);
--#endif
- int arg_to_int(const char* arg, int min, int max, int defalt);
-
- #ifdef __cplusplus
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix
index 755ceb4216..10f86132ea 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/gaps.nix
@@ -20,7 +20,7 @@ i3.overrideAttrs (oldAttrs : rec {
homepage = "https://github.com/Airblader/i3";
maintainers = with maintainers; [ fmthoma ];
license = licenses.bsd3;
- platforms = platforms.all;
+ platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd;
longDescription = ''
Fork of i3wm, a tiling window manager primarily targeted at advanced users
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-resurrect.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-resurrect.nix
new file mode 100644
index 0000000000..a765d2e298
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-resurrect.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonApplication, click, i3ipc, psutil, natsort, fetchPypi, xprop, xdotool, importlib-metadata }:
+
+buildPythonApplication rec {
+ pname = "i3-resurrect";
+ version = "1.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0h181frdwpqfj9agw43qgicdvzv1i7xwky0vs0ksd8h18qxqp4hr";
+ };
+
+ propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ];
+ doCheck = false; # no tests
+
+ meta = with lib; {
+ homepage = "https://github.com/JonnyHaystack/i3-resurrect";
+ description = "A simple but flexible solution to saving and restoring i3 workspaces";
+ license = licenses.gpl3;
+ platforms= platforms.linux;
+ maintainers = with maintainers; [ magnetophon ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
index a64e5ea336..f07a1926f6 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
@@ -55,8 +55,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
- # Needs the SSE2 instruction set. See upstream issue
- # https://github.com/chrjguill/i3lock-color/issues/44
- platforms = platforms.x86;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix
index 494bb9ff1b..a00462e811 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "notion";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "raboof";
repo = pname;
rev = version;
- sha256 = "1s0fyacygvc9iz7b9v3b2cmzzqc02nh4g1p9bfcxbg254iscd502";
+ sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv";
};
nativeBuildInputs = [ pkgconfig makeWrapper groff ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix
new file mode 100644
index 0000000000..6c22227c0c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix
@@ -0,0 +1,23 @@
+{ newScope, wayfirePlugins }:
+
+let
+ self = with self; {
+ inherit wayfirePlugins;
+
+ callPackage = newScope self;
+
+ wayfire = callPackage ./. { };
+
+ wcm = callPackage ./wcm.nix {
+ inherit (wayfirePlugins) wf-shell;
+ };
+
+ wrapWayfireApplication = callPackage ./wrapper.nix { };
+
+ withPlugins = selector: self // {
+ wayfire = wrapWayfireApplication wayfire selector;
+ wcm = wrapWayfireApplication wcm selector;
+ };
+ };
+in
+self
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix
new file mode 100644
index 0000000000..513784b8b5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git
+, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
+, wayland-protocols, wf-config, wlroots
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wayfire";
+ version = "0.6.0";
+
+ src = fetchurl {
+ url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz";
+ sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config wayland ];
+ buildInputs = [
+ cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland
+ wayland-protocols wf-config wlroots
+ ];
+
+ mesonFlags = [ "--sysconfdir" "/etc" ];
+
+ meta = with lib; {
+ homepage = "https://wayfire.org/";
+ description = "3D wayland compositor";
+ license = licenses.mit;
+ maintainers = with maintainers; [ qyliss wucke13 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix
new file mode 100644
index 0000000000..830a918fcb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix
@@ -0,0 +1,12 @@
+{ newScope, wayfire }:
+
+let
+ self = with self; {
+ inherit wayfire;
+
+ callPackage = newScope self;
+
+ wf-shell = callPackage ./wf-shell.nix { };
+ };
+in
+self
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix
new file mode 100644
index 0000000000..7c4b546c68
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook
+, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wcm";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "WayfireWM";
+ repo = "wcm";
+ rev = "v${version}";
+ sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
+ buildInputs = [
+ gnome3.gtk libevdev libxml2 wayfire wayland
+ wayland-protocols wf-config wf-shell
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/WayfireWM/wcm";
+ description = "Wayfire Config Manager";
+ license = licenses.mit;
+ maintainers = with maintainers; [ qyliss wucke13 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix
new file mode 100644
index 0000000000..00a4404c1d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }:
+
+stdenv.mkDerivation rec {
+ pname = "wf-config";
+ version = "0.6.0";
+
+ src = fetchurl {
+ url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz";
+ sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+ buildInputs = [ libevdev libxml2 ];
+ propagatedBuildInputs = [ glm ];
+
+ meta = with lib; {
+ homepage = "https://github.com/WayfireWM/wf-config";
+ description = "Library for managing configuration files, written for Wayfire";
+ license = licenses.mit;
+ maintainers = with maintainers; [ qyliss wucke13 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix
new file mode 100644
index 0000000000..6e5f189275
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
+, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "wf-shell";
+ version = "0.6.1";
+
+ # > Note to packagers: do not use the autogenerated "Source code"
+ # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file.
+ src = fetchurl {
+ url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz";
+ sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config wayland ];
+ buildInputs = [
+ alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
+ ];
+
+ mesonFlags = [ "--sysconfdir" "/etc" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/WayfireWM/wf-shell";
+ description = "GTK3-based panel for Wayfire";
+ license = licenses.mit;
+ maintainers = with maintainers; [ qyliss wucke13 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix
new file mode 100644
index 0000000000..6229289854
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix
@@ -0,0 +1,39 @@
+{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }:
+
+let
+ inherit (lib) escapeShellArg makeBinPath;
+
+ xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell";
+
+ makePluginPath = lib.makeLibraryPath;
+ makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath;
+in
+
+application:
+
+choosePlugins:
+
+let
+ plugins = choosePlugins wayfirePlugins;
+in
+
+runCommandNoCC "${application.name}-wrapped" {
+ nativeBuildInputs = [ makeWrapper ];
+
+ passthru = application.passthru // {
+ unwrapped = application;
+ };
+
+ inherit (application) meta;
+} ''
+ mkdir -p $out/bin
+ for bin in ${application}/bin/*
+ do
+ makeWrapper "$bin" $out/bin/''${bin##*/} \
+ --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \
+ --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \
+ --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)}
+ done
+ find ${application} -mindepth 1 -maxdepth 1 -not -name bin \
+ -exec ln -s '{}' $out ';'
+''
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 3a3c9e932f..b40569a479 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -1,20 +1,27 @@
-{ callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }:
-
-let buildFHSEnv = callPackage ./env.nix { }; in
+{ lib, callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }:
args @ {
- name,
- runScript ? "bash",
- extraInstallCommands ? "",
- meta ? {},
- passthru ? {},
- ...
+ name
+, runScript ? "bash"
+, extraInstallCommands ? ""
+, meta ? {}
+, passthru ? {}
+, unshareUser ? true
+, unshareIpc ? true
+, unsharePid ? true
+, unshareNet ? false
+, unshareUts ? true
+, unshareCgroup ? true
+, ...
}:
with builtins;
let
+ buildFHSEnv = callPackage ./env.nix { };
+
env = buildFHSEnv (removeAttrs args [
"runScript" "extraInstallCommands" "meta" "passthru"
+ "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
]);
chrootenv = callPackage ./chrootenv {};
@@ -92,8 +99,12 @@ let
--dev-bind /dev /dev
--proc /proc
--chdir "$(pwd)"
- --unshare-all
- --share-net
+ ${lib.optionalString unshareUser "--unshare-user"}
+ ${lib.optionalString unshareIpc "--unshare-ipc"}
+ ${lib.optionalString unsharePid "--unshare-pid"}
+ ${lib.optionalString unshareNet "--unshare-net"}
+ ${lib.optionalString unshareUts "--unshare-uts"}
+ ${lib.optionalString unshareCgroup "--unshare-cgroup"}
--die-with-parent
--ro-bind /nix /nix
${etcBindFlags}
diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index 09cef8b867..0855c27eff 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
@@ -76,10 +76,14 @@ let
cannonlake = versionAtLeast ccVersion "8.0";
icelake-client = versionAtLeast ccVersion "8.0";
icelake-server = versionAtLeast ccVersion "8.0";
+ cascadelake = versionAtLeast ccVersion "9.0";
+ cooperlake = versionAtLeast ccVersion "10.0";
+ tigerlake = versionAtLeast ccVersion "10.0";
knm = versionAtLeast ccVersion "8.0";
# AMD
znver1 = versionAtLeast ccVersion "6.0";
znver2 = versionAtLeast ccVersion "9.0";
+ znver3 = versionAtLeast ccVersion "11.0";
}.${arch} or true
else if isClang then
{ # Intel
@@ -437,7 +441,7 @@ stdenv.mkDerivation {
'' + optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString cc.langAda or false ''
- hardening_unsupported_flags+=" stackprotector strictoverflow"
+ hardening_unsupported_flags+=" format stackprotector strictoverflow"
'' + optionalString cc.langD or false ''
hardening_unsupported_flags+=" format"
'' + optionalString targetPlatform.isWasm ''
diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
index b30ac5c776..276c7cd1bd 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
@@ -58,15 +58,12 @@ let
done;
'';
- # Map nixpkgs architecture to Docker notation
- # Reference: https://github.com/docker-library/official-images#architectures-other-than-amd64
- getArch = nixSystem: {
- aarch64-linux = "arm64v8";
- armv7l-linux = "arm32v7";
- x86_64-linux = "amd64";
- powerpc64le-linux = "ppc64le";
- i686-linux = "i386";
- }.${nixSystem} or "Can't map Nix system ${nixSystem} to Docker architecture notation. Please check that your input and your requested build are correct or update the mapping in Nixpkgs.";
+ # The OCI Image specification recommends that configurations use values listed
+ # in the Go Language document for GOARCH.
+ # Reference: https://github.com/opencontainers/image-spec/blob/master/config.md#properties
+ # For the mapping from Nixpkgs system parameters to GOARCH, we can reuse the
+ # mapping from the go package.
+ defaultArch = go.GOARCH;
in
rec {
@@ -84,7 +81,7 @@ rec {
, imageDigest
, sha256
, os ? "linux"
- , arch ? getArch system
+ , arch ? defaultArch
# This is used to set name to the pulled image
, finalImageName ? imageName
@@ -500,7 +497,7 @@ rec {
baseJson = let
pure = writeText "${baseName}-config.json" (builtins.toJSON {
inherit created config;
- architecture = getArch system;
+ architecture = defaultArch;
os = "linux";
});
impure = runCommand "${baseName}-config.json"
@@ -754,7 +751,7 @@ rec {
streamScript = writePython3 "stream" {} ./stream_layered_image.py;
baseJson = writeText "${name}-base.json" (builtins.toJSON {
inherit config;
- architecture = getArch system;
+ architecture = defaultArch;
os = "linux";
});
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
index e6f6c23e44..214aed9c3f 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
@@ -7,9 +7,18 @@ with lib;
{ pname
, version
, src
+, meta ? {}
, ...
}@args:
+let
+
+ defaultMeta = {
+ homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html";
+ };
+
+in
+
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
phases = "installPhase fixupPhase distPhase";
@@ -23,6 +32,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
runHook postInstall
'';
+
+ meta = defaultMeta // meta;
}
// removeAttrs args [ "files" "fileSpecs"
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix b/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
index 956787ad59..588699517b 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
@@ -60,10 +60,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
- postInstall = ''
- find $out/share/emacs -type f -name '*.el' -print0 | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c "emacs --batch -f batch-native-compile {} || true"
- '';
+ addEmacsNativeLoadPath = true;
+ postInstall = ''
+ find $out/share/emacs -type f -name '*.el' -print0 \
+ | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \
+ "emacs --batch --eval=\"(add-to-list 'comp-eln-load-path \\\"$out/share/emacs/native-lisp/\\\")\" -f batch-native-compile {} || true"
+ '';
}
// removeAttrs args [ "buildInputs" "packageRequires"
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
index e2ec84c75e..d6fe308583 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
@@ -23,7 +23,7 @@ with lib;
let
defaultMeta = {
- homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}";
+ homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}";
};
in
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/emacs/setup-hook.sh
index 83e995631b..f6f2331b8e 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/setup-hook.sh
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/setup-hook.sh
@@ -7,9 +7,20 @@ addToEmacsLoadPath() {
fi
}
+addToEmacsNativeLoadPath() {
+ local nativeDir="$1"
+ if [[ -d $nativeDir && ${EMACSNATIVELOADPATH-} != *"$nativeDir":* ]]; then
+ export EMACSNATIVELOADPATH="$nativeDir:${EMACSNATIVELOADPATH-}"
+ fi
+}
+
addEmacsVars () {
addToEmacsLoadPath "$1/share/emacs/site-lisp"
+ if [ -n "${addEmacsNativeLoadPath:-}" ]; then
+ addToEmacsNativeLoadPath "$1/share/emacs/native-lisp"
+ fi
+
# Add sub paths to the Emacs load path if it is a directory
# containing .el files. This is necessary to build some packages,
# e.g., using trivialBuild.
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
index 1f2fbd8068..a313683912 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
@@ -34,7 +34,15 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
{ lib, lndir, makeWrapper, runCommand }: self:
-with lib; let inherit (self) emacs; in
+with lib;
+
+let
+
+ inherit (self) emacs;
+
+ nativeComp = emacs.nativeComp or false;
+
+in
packagesFun: # packages explicitly requested by the user
@@ -95,6 +103,9 @@ runCommand
}
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
+ ${optionalString nativeComp ''
+ mkdir -p $out/share/emacs/native-lisp
+ ''}
local requires
for pkg in $explicitRequires; do
@@ -116,6 +127,9 @@ runCommand
linkEmacsPackage() {
linkPath "$1" "bin" "bin"
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
+ ${optionalString nativeComp ''
+ linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp"
+ ''}
}
# Iterate over the array of inputs (avoiding nix's own interpolation)
@@ -138,12 +152,21 @@ runCommand
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin")
+ ${optionalString nativeComp ''
+ (add-to-list 'comp-eln-load-path "$out/share/emacs/native-lisp/")
+ ''}
EOF
# Link subdirs.el from the emacs distribution
ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
# Byte-compiling improves start-up time only slightly, but costs nothing.
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
+
+ ${optionalString nativeComp ''
+ $emacs/bin/emacs --batch \
+ --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \
+ -f batch-native-compile "$siteStart" "$subdirs"
+ ''}
'';
inherit (emacs) meta;
@@ -155,8 +178,13 @@ runCommand
for prog in $emacs/bin/*; do # */
local progname=$(basename "$prog")
rm -f "$out/bin/$progname"
- makeWrapper "$prog" "$out/bin/$progname" \
- --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"
+
+ substitute ${./wrapper.sh} $out/bin/$progname \
+ --subst-var-by bash ${emacs.stdenv.shell} \
+ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
+ --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
+ --subst-var prog
+ chmod +x $out/bin/$progname
done
# Wrap MacOS app
@@ -168,8 +196,17 @@ runCommand
$emacs/Applications/Emacs.app/Contents/PkgInfo \
$emacs/Applications/Emacs.app/Contents/Resources \
$out/Applications/Emacs.app/Contents
+
+
+ substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
+ --subst-var-by bash ${emacs.stdenv.shell} \
+ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
+ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
+ chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
+
makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \
- --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"
+ --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \
+ --suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:"
fi
mkdir -p $out/share
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.sh b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.sh
new file mode 100644
index 0000000000..e8eecb8c86
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.sh
@@ -0,0 +1,47 @@
+#!@bash@
+
+IFS=:
+
+newLoadPath=()
+newNativeLoadPath=()
+added=
+
+if [[ -n $EMACSLOADPATH ]]
+then
+ while read -rd: entry
+ do
+ if [[ -z $entry && -z $added ]]
+ then
+ newLoadPath+=(@wrapperSiteLisp@)
+ added=1
+ fi
+ newLoadPath+=("$entry")
+ done <<< "$EMACSLOADPATH:"
+else
+ newLoadPath+=(@wrapperSiteLisp@)
+ newLoadPath+=("")
+fi
+
+if [[ -n $EMACSNATIVELOADPATH ]]
+then
+ while read -rd: entry
+ do
+ if [[ -z $entry && -z $added ]]
+ then
+ newNativeLoadPath+=(@wrapperSiteLispNative@)
+ added=1
+ fi
+ newNativeLoadPath+=("$entry")
+ done <<< "$EMACSNATIVELOADPATH:"
+else
+ newNativeLoadPath+=(@wrapperSiteLispNative@)
+ newNativeLoadPath+=("")
+fi
+
+export EMACSLOADPATH="${newLoadPath[*]}"
+export emacsWithPackages_siteLisp=@wrapperSiteLisp@
+
+export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}"
+export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
+
+exec @prog@ "$@"
diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix
index 4b7c68484d..9efe9197d6 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix
@@ -1,16 +1,20 @@
{stdenv, lib, coreutils, unzip, jq, zip, fetchurl,writeScript, ...}:
-{ name
+
+{
+ name
, url
, md5 ? ""
, sha1 ? ""
, sha256 ? ""
, sha512 ? ""
+, fixedExtid ? null
, hash ? ""
}:
+
stdenv.mkDerivation rec {
inherit name;
- extid = "${src.outputHash}@${name}";
+ extid = if fixedExtid == null then "nixos@${name}" else fixedExtid;
passthru = {
exitd=extid;
};
@@ -35,4 +39,3 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ coreutils unzip zip jq ];
}
-
diff --git a/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix
index 42ad7603a8..42162638e7 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/fetchmavenartifact/default.nix
@@ -3,10 +3,10 @@
{ fetchurl, stdenv }:
let
defaultRepos = [
- "http://repo1.maven.org/maven2"
- "http://oss.sonatype.org/content/repositories/releases"
- "http://oss.sonatype.org/content/repositories/public"
- "http://repo.typesafe.com/typesafe/releases"
+ "https://repo1.maven.org/maven2"
+ "https://oss.sonatype.org/content/repositories/releases"
+ "https://oss.sonatype.org/content/repositories/public"
+ "https://repo.typesafe.com/typesafe/releases"
];
in
@@ -50,7 +50,7 @@ let
(replaceChars ["."] ["/"] groupId)
artifactId
version
- "${artifactId}-${version}-${optionalString (!isNull classifier) "-${classifier}"}.jar"
+ "${artifactId}-${version}${optionalString (!isNull classifier) "-${classifier}"}.jar"
];
urls_ =
if url != "" then [url]
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/initrd-compressor-meta.nix b/third_party/nixpkgs/pkgs/build-support/kernel/initrd-compressor-meta.nix
new file mode 100644
index 0000000000..443e599a23
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/initrd-compressor-meta.nix
@@ -0,0 +1,53 @@
+rec {
+ cat = {
+ executable = pkgs: "cat";
+ ubootName = "none";
+ extension = ".cpio";
+ };
+ gzip = {
+ executable = pkgs: "${pkgs.gzip}/bin/gzip";
+ defaultArgs = ["-9n"];
+ ubootName = "gzip";
+ extension = ".gz";
+ };
+ bzip2 = {
+ executable = pkgs: "${pkgs.bzip2}/bin/bzip2";
+ ubootName = "bzip2";
+ extension = ".bz2";
+ };
+ xz = {
+ executable = pkgs: "${pkgs.xz}/bin/xz";
+ defaultArgs = ["--check=crc32" "--lzma2=dict=512KiB"];
+ extension = ".xz";
+ };
+ lzma = {
+ executable = pkgs: "${pkgs.xz}/bin/lzma";
+ defaultArgs = ["--check=crc32" "--lzma1=dict=512KiB"];
+ ubootName = "lzma";
+ extension = ".lzma";
+ };
+ lz4 = {
+ executable = pkgs: "${pkgs.lz4}/bin/lz4";
+ defaultArgs = ["-l"];
+ ubootName = "lz4";
+ extension = ".lz4";
+ };
+ lzop = {
+ executable = pkgs: "${pkgs.lzop}/bin/lzop";
+ ubootName = "lzo";
+ extension = ".lzo";
+ };
+ zstd = {
+ executable = pkgs: "${pkgs.zstd}/bin/zstd";
+ defaultArgs = ["-10"];
+ ubootName = "zstd";
+ extension = ".zst";
+ };
+ pigz = gzip // {
+ executable = pkgs: "${pkgs.pigz}/bin/pigz";
+ };
+ pixz = xz // {
+ executable = pkgs: "${pkgs.pixz}/bin/pixz";
+ defaultArgs = [];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
index ed5dbdaee1..901eb311a8 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.nix
@@ -1,22 +1,74 @@
-# Create an initial ramdisk containing the closure of the specified
-# file system objects. An initial ramdisk is used during the initial
+# Create an initramfs containing the closure of the specified
+# file system objects. An initramfs is used during the initial
# stages of booting a Linux system. It is loaded by the boot loader
# along with the kernel image. It's supposed to contain everything
# (such as kernel modules) necessary to allow us to mount the root
# file system. Once the root file system is mounted, the `real' boot
# script can be called.
#
-# An initrd is really just a gzipped cpio archive.
-#
-# Symlinks are created for each top-level file system object. E.g.,
-# `contents = {object = ...; symlink = /init;}' is a typical
-# argument.
-
-{ stdenvNoCC, perl, cpio, contents, ubootTools
+# An initramfs is a cpio archive, and may be compressed with a number
+# of algorithms.
+let
+ # Some metadata on various compression programs, relevant to naming
+ # the initramfs file and, if applicable, generating a u-boot image
+ # from it.
+ compressors = import ./initrd-compressor-meta.nix;
+ # Get the basename of the actual compression program from the whole
+ # compression command, for the purpose of guessing the u-boot
+ # compression type and filename extension.
+ compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
+in
+{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost
+# Name of the derivation (not of the resulting file!)
, name ? "initrd"
-, compressor ? "gzip -9n"
+
+# Program used to compress the cpio archive; use "cat" for no compression.
+# This can also be a function which takes a package set and returns the path to the compressor,
+# such as `pkgs: "${pkgs.lzop}/bin/lzop"`.
+, compressor ? "gzip"
+, _compressorFunction ?
+ if lib.isFunction compressor then compressor
+ else if ! builtins.hasContext compressor && builtins.hasAttr compressor compressors then compressors.${compressor}.executable
+ else _: compressor
+, _compressorExecutable ? _compressorFunction pkgsBuildHost
+, _compressorName ? compressorName _compressorExecutable
+, _compressorMeta ? compressors.${_compressorName} or {}
+
+# List of arguments to pass to the compressor program, or null to use its defaults
+, compressorArgs ? null
+, _compressorArgsReal ? if compressorArgs == null then _compressorMeta.defaultArgs or [] else compressorArgs
+
+# Filename extension to use for the compressed initramfs. This is
+# included for clarity, but $out/initrd will always be a symlink to
+# the final image.
+# If this isn't guessed, you may want to complete the metadata above and send a PR :)
+, extension ? _compressorMeta.extension or
+ (throw "Unrecognised compressor ${_compressorName}, please specify filename extension")
+
+# List of { object = path_or_derivation; symlink = "/path"; }
+# The paths are copied into the initramfs in their nix store path
+# form, then linked at the root according to `symlink`.
+, contents
+
+# List of uncompressed cpio files to prepend to the initramfs. This
+# can be used to add files in specified paths without them becoming
+# symlinks to store paths.
, prepend ? []
-, lib
+
+# Whether to wrap the initramfs in a u-boot image.
+, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"
+
+# If generating a u-boot image, the architecture to use. The default
+# guess may not align with u-boot's nomenclature correctly, so it can
+# be overridden.
+# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list.
+, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch
+
+# The name of the compression, as recognised by u-boot.
+# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list.
+# If this isn't guessed, you may want to complete the metadata above and send a PR :)
+, uInitrdCompression ? _compressorMeta.ubootName or
+ (throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression")
}:
let
# !!! Move this into a public lib function, it is probably useful for others
@@ -24,15 +76,26 @@ let
lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
in stdenvNoCC.mkDerivation rec {
- inherit name;
+ inherit name makeUInitrd extension uInitrdArch prepend;
+
+ ${if makeUInitrd then "uinitrdCompression" else null} = uInitrdCompression;
builder = ./make-initrd.sh;
- makeUInitrd = stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage";
-
nativeBuildInputs = [ perl cpio ]
++ stdenvNoCC.lib.optional makeUInitrd ubootTools;
+ compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
+
+ # Pass the function through, for reuse in append-initrd-secrets. The
+ # function is used instead of the string, in order to support
+ # cross-compilation (append-initrd-secrets running on a different
+ # architecture than what the main initramfs is built on).
+ passthru = {
+ compressorExecutableFunction = _compressorFunction;
+ compressorArgs = _compressorArgsReal;
+ };
+
# !!! should use XML.
objects = map (x: x.object) contents;
symlinks = map (x: x.symlink) contents;
@@ -47,6 +110,4 @@ in stdenvNoCC.mkDerivation rec {
contents
(lib.range 0 (lib.length contents - 1));
pathsFromGraph = ./paths-from-graph.pl;
-
- inherit compressor prepend;
}
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh
index 0aeaedeb37..c0619ef14a 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh
@@ -39,10 +39,13 @@ mkdir -p $out
for PREP in $prepend; do
cat $PREP >> $out/initrd
done
-(cd root && find * -print0 | xargs -0r touch -h -d '@1')
-(cd root && find * -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | $compressor >> $out/initrd)
+(cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +)
+(cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
if [ -n "$makeUInitrd" ]; then
- mv $out/initrd $out/initrd.gz
- mkimage -A arm -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd
+ mkimage -A $uInitrdArch -O linux -T ramdisk -C "$uInitrdCompression" -d $out/initrd"$extension" $out/initrd.img
+ # Compatibility symlink
+ ln -s "initrd.img" "$out/initrd"
+else
+ ln -s "initrd" "$out/initrd$extension"
fi
diff --git a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
index fba09adc2d..abfe67ea43 100644
--- a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
@@ -150,10 +150,10 @@ in rec {
'');
withGitignoreFile = patterns: root:
- lib.toList patterns ++ [(root + "/.gitignore")];
+ lib.toList patterns ++ [ ".git" ] ++ [(root + "/.gitignore")];
withRecursiveGitignoreFile = patterns: root:
- lib.toList patterns ++ [(compileRecursiveGitignore root)];
+ lib.toList patterns ++ [ ".git" ] ++ [(compileRecursiveGitignore root)];
# filterSource derivatives
diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix
index b134effab8..fce0096c83 100644
--- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix
+++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, dune, dune_2, opaline }:
+{ stdenv, ocaml, findlib, dune, dune_2 }:
{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:
@@ -25,7 +25,7 @@ stdenv.mkDerivation ({
'';
installPhase = ''
runHook preInstall
- ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
+ dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 5ada40b3b9..d1010ac1ad 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -144,7 +144,7 @@ in ''
export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2}
export CARGO_PKG_VERSION_PRE="${versionPre}"
export CARGO_PKG_HOMEPAGE="${crateHomepage}"
- export NUM_JOBS=1
+ export NUM_JOBS=$NIX_BUILD_CORES
export RUSTC="rustc"
export RUSTDOC="rustdoc"
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix
index f6cd54c4ee..65c8880b13 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -146,12 +146,18 @@ let
};
in
runCommand "assert-outputs-${name}" {
- } ''
+ } (''
local actualFiles=$(mktemp)
cd "${crateOutput}"
- find . -type f | sort >$actualFiles
- diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
+ find . -type f \
+ | sort \
+ ''
+ # sed out the hash because it differs per platform
+ + ''
+ | sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \
+ > "$actualFiles"
+ diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || {
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
echo === Got:
sed -e 's/^/ /' $actualFiles
@@ -164,7 +170,7 @@ let
exit 1
}
touch $out
- ''
+ '')
;
in rec {
@@ -594,7 +600,7 @@ let
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
- "./lib/libtest_lib-042a1fdbef.rlib"
+ "./lib/libtest_lib-HASH.rlib"
"./lib/link"
];
};
@@ -611,7 +617,7 @@ let
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
- "./lib/libtest_lib-042a1fdbef.rlib"
+ "./lib/libtest_lib-HASH.rlib"
"./lib/link"
];
};
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 4f7c0c1430..511371931d 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -1,9 +1,20 @@
+#!/usr/bin/env bash
+
declare -a autoPatchelfLibs
+declare -Ag autoPatchelfFailedDeps
gatherLibraries() {
autoPatchelfLibs+=("$1/lib")
}
+# wrapper around patchelf to raise proper error messages
+# containing the tried file name and command
+runPatchelf() {
+ patchelf "$@" || (echo "Command failed: patchelf $*" && exit 1)
+}
+
+# shellcheck disable=SC2154
+# (targetOffset is referenced but not assigned.)
addEnvHooks "$targetOffset" gatherLibraries
isExecutable() {
@@ -23,14 +34,19 @@ isExecutable() {
# We cache dependencies so that we don't need to search through all of them on
# every consecutive call to findDependency.
-declare -a cachedDependencies
+declare -Ag autoPatchelfCachedDepsAssoc
+declare -ag autoPatchelfCachedDeps
+
addToDepCache() {
- local existing
- for existing in "${cachedDependencies[@]}"; do
- if [ "$existing" = "$1" ]; then return; fi
- done
- cachedDependencies+=("$1")
+ if [[ ${autoPatchelfCachedDepsAssoc[$1]+f} ]]; then return; fi
+
+ # store deps in an assoc. array for efficient lookups
+ # otherwise findDependency would have quadratic complexity
+ autoPatchelfCachedDepsAssoc["$1"]=""
+
+ # also store deps in normal array to maintain their order
+ autoPatchelfCachedDeps+=("$1")
}
declare -gi depCacheInitialised=0
@@ -43,9 +59,8 @@ getDepsFromSo() {
populateCacheWithRecursiveDeps() {
local so found foundso
- for so in "${cachedDependencies[@]}"; do
+ for so in "${autoPatchelfCachedDeps[@]}"; do
for found in $(getDepsFromSo "$so"); do
- local libdir="${found%/*}"
local base="${found##*/}"
local soname="${base%.so*}"
for foundso in "${found%/*}/$soname".so*; do
@@ -76,7 +91,7 @@ findDependency() {
depCacheInitialised=1
fi
- for dep in "${cachedDependencies[@]}"; do
+ for dep in "${autoPatchelfCachedDeps[@]}"; do
if [ "$filename" = "${dep##*/}" ]; then
if [ "$(getSoArch "$dep")" = "$arch" ]; then
foundDependency="$dep"
@@ -101,9 +116,12 @@ findDependency() {
autoPatchelfFile() {
local dep rpath="" toPatch="$1"
- local interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"
+ local interpreter
+ interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"
if isExecutable "$toPatch"; then
- patchelf --set-interpreter "$interpreter" "$toPatch"
+ runPatchelf --set-interpreter "$interpreter" "$toPatch"
+ # shellcheck disable=SC2154
+ # (runtimeDependencies is referenced but not assigned.)
if [ -n "$runtimeDependencies" ]; then
for dep in $runtimeDependencies; do
rpath="$rpath${rpath:+:}$dep/lib"
@@ -115,17 +133,19 @@ autoPatchelfFile() {
# We're going to find all dependencies based on ldd output, so we need to
# clear the RPATH first.
- patchelf --remove-rpath "$toPatch"
+ runPatchelf --remove-rpath "$toPatch"
- local missing="$(
+ # If the file is not a dynamic executable, ldd/sed will fail,
+ # in which case we return, since there is nothing left to do.
+ local missing
+ missing="$(
ldd "$toPatch" 2> /dev/null | \
sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p'
- )"
+ )" || return 0
# This ensures that we get the output of all missing dependencies instead
# of failing at the first one, because it's more useful when working on a
# new package where you don't yet know its dependencies.
- local -i depNotFound=0
for dep in $missing; do
echo -n " $dep -> " >&2
@@ -134,18 +154,13 @@ autoPatchelfFile() {
echo "found: $foundDependency" >&2
else
echo "not found!" >&2
- depNotFound=1
+ autoPatchelfFailedDeps["$dep"]="$toPatch"
fi
done
- # This makes sure the builder fails if we didn't find a dependency, because
- # the stdenv setup script is run with set -e. The actual error is emitted
- # earlier in the previous loop.
- [ $depNotFound -eq 0 -o -n "$autoPatchelfIgnoreMissingDeps" ]
-
if [ -n "$rpath" ]; then
echo "setting RPATH to: $rpath" >&2
- patchelf --set-rpath "$rpath" "$toPatch"
+ runPatchelf --set-rpath "$rpath" "$toPatch"
fi
}
@@ -168,10 +183,10 @@ addAutoPatchelfSearchPath() {
esac
done
- cachedDependencies+=(
- $(find "$@" "${findOpts[@]}" \! -type d \
- \( -name '*.so' -o -name '*.so.*' \))
- )
+ while IFS= read -r -d '' file; do
+ addToDepCache "$file"
+ done < <(find "$@" "${findOpts[@]}" \! -type d \
+ \( -name '*.so' -o -name '*.so.*' \) -print0)
}
autoPatchelf() {
@@ -197,14 +212,9 @@ autoPatchelf() {
echo "automatically fixing dependencies for ELF files" >&2
# Add all shared objects of the current output path to the start of
- # cachedDependencies so that it's choosen first in findDependency.
+ # autoPatchelfCachedDeps so that it's chosen first in findDependency.
addAutoPatchelfSearchPath ${norecurse:+--no-recurse} -- "$@"
- # Here we actually have a subshell, which also means that
- # $cachedDependencies is final at this point, so whenever we want to run
- # findDependency outside of this, the dependency cache needs to be rebuilt
- # from scratch, so keep this in mind if you want to run findDependency
- # outside of this function.
while IFS= read -r -d $'\0' file; do
isELF "$file" || continue
segmentHeaders="$(LANG=C $READELF -l "$file")"
@@ -215,8 +225,26 @@ autoPatchelf() {
# Skip if the executable is statically linked.
[ -n "$(echo "$segmentHeaders" | grep "^ *INTERP\\>")" ] || continue
fi
+ # Jump file if patchelf is unable to parse it
+ # Some programs contain binary blobs for testing,
+ # which are identified as ELF but fail to be parsed by patchelf
+ patchelf "$file" || continue
autoPatchelfFile "$file"
done < <(find "$@" ${norecurse:+-maxdepth 1} -type f -print0)
+
+ # fail if any dependencies were not found and
+ # autoPatchelfIgnoreMissingDeps is not set
+ local depsMissing=0
+ for failedDep in "${!autoPatchelfFailedDeps[@]}"; do
+ echo "autoPatchelfHook could not satisfy dependency $failedDep wanted by ${autoPatchelfFailedDeps[$failedDep]}"
+ depsMissing=1
+ done
+ # shellcheck disable=SC2154
+ # (autoPatchelfIgnoreMissingDeps is referenced but not assigned.)
+ if [[ $depsMissing == 1 && -z "$autoPatchelfIgnoreMissingDeps" ]]; then
+ echo "Add the missing dependencies to the build inputs or set autoPatchelfIgnoreMissingDeps=true"
+ exit 1
+ fi
}
# XXX: This should ultimately use fixupOutputHooks but we currently don't have
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh
index 82e48cd8aa..f5af76e816 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -21,6 +21,7 @@ compressManPages() {
# Point symlinks to compressed manpages.
find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \
+ | sort -z \
| while IFS= read -r -d $'\0' f
do
local target
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
index f5fa9378fd..a7cdfd1d27 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh
@@ -51,7 +51,7 @@ stripDirs() {
if [ -n "${dirs}" ]; then
header "stripping (with command $cmd and flags $stripFlags) in$dirs"
- find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $cmd $commonStripFlags $stripFlags 2>/dev/null || true
+ find $dirs -type f -exec $cmd $commonStripFlags $stripFlags '{}' \; #
stopNest
fi
}
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix
index 2f18e96e4c..5f3c7e1d62 100644
--- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix
@@ -1196,4 +1196,4 @@ rec {
`debDistros' sets. */
diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;
-} // import ./windows pkgs
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/bootstrap.nix b/third_party/nixpkgs/pkgs/build-support/vm/windows/bootstrap.nix
deleted file mode 100644
index 3b06d8f474..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/bootstrap.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
-, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu
-, samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep
-}:
-
-{ isoFile, productKey, arch ? null }:
-
-with stdenv.lib;
-
-let
- controller = import ./controller {
- inherit stdenv writeScript vmTools makeInitrd;
- inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep;
- };
-
- mkCygwinImage = import ./cygwin-iso {
- inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph;
- arch = let
- defaultArch = if stdenv.is64bit then "x86_64" else "i686";
- in if arch == null then defaultArch else arch;
- };
-
- installer = import ./install {
- inherit controller mkCygwinImage;
- inherit stdenv runCommand openssh qemu writeText dosfstools mtools;
- };
-in rec {
- installedVM = installer {
- inherit isoFile productKey;
- };
-
- runInVM = img: attrs: controller (attrs // {
- inherit (installedVM) sshKey;
- qemuArgs = attrs.qemuArgs or [] ++ [
- "-boot order=c"
- "-drive file=${img},index=0,media=disk"
- ];
- });
-
- runAndSuspend = let
- drives = {
- s = {
- source = "nixstore";
- target = "/nix/store";
- };
- x = {
- source = "xchg";
- target = "/tmp/xchg";
- };
- };
-
- genDriveCmds = letter: { source, target }: [
- "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes"
- "mkdir -p '${target}'"
- "mount -o bind '/cygdrive/${letter}' '${target}'"
- "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab"
- ];
- in runInVM "winvm.img" {
- command = concatStringsSep " && " ([
- "net config server /autodisconnect:-1"
- ] ++ concatLists (mapAttrsToList genDriveCmds drives));
- suspendTo = "state.gz";
- };
-
- suspendedVM = stdenv.mkDerivation {
- name = "cygwin-suspended-vm";
- buildCommand = ''
- ${qemu}/bin/qemu-img create \
- -b "${installedVM}/disk.img" \
- -f qcow2 winvm.img
- ${runAndSuspend}
- mkdir -p "$out"
- cp winvm.img "$out/disk.img"
- cp state.gz "$out/state.gz"
- '';
- };
-
- resumeAndRun = command: runInVM "${suspendedVM}/disk.img" {
- resumeFrom = "${suspendedVM}/state.gz";
- qemuArgs = singleton "-snapshot";
- inherit command;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/controller/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/windows/controller/default.nix
deleted file mode 100644
index 9d13983a28..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/controller/default.nix
+++ /dev/null
@@ -1,263 +0,0 @@
-{ stdenv, writeScript, vmTools, makeInitrd
-, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip
-, runtimeShell
-}:
-
-{ sshKey
-, qemuArgs ? []
-, command ? "sync"
-, suspendTo ? null
-, resumeFrom ? null
-, installMode ? false
-}:
-
-with stdenv.lib;
-
-let
- preInitScript = writeScript "preinit.sh" ''
- #!${vmTools.initrdUtils}/bin/ash -e
- export PATH=${vmTools.initrdUtils}/bin
- mount -t proc none /proc
- mount -t sysfs none /sys
- for arg in $(cat /proc/cmdline); do
- if [ "x''${arg#command=}" != "x$arg" ]; then
- command="''${arg#command=}"
- fi
- done
-
- for i in $(cat ${modulesClosure}/insmod-list); do
- insmod $i
- done
-
- mkdir -p /dev /fs
-
- mount -t tmpfs none /dev
- mknod /dev/null c 1 3
- mknod /dev/zero c 1 5
- mknod /dev/random c 1 8
- mknod /dev/urandom c 1 9
- mknod /dev/tty c 5 0
-
- ifconfig lo up
- ifconfig eth0 up 192.168.0.2
-
- mount -t tmpfs none /fs
- mkdir -p /fs/nix/store /fs/xchg /fs/dev /fs/sys /fs/proc /fs/etc /fs/tmp
-
- mount -o bind /dev /fs/dev
- mount -t sysfs none /fs/sys
- mount -t proc none /fs/proc
-
- mount -t 9p \
- -o trans=virtio,version=9p2000.L,cache=loose \
- store /fs/nix/store
-
- mount -t 9p \
- -o trans=virtio,version=9p2000.L \
- xchg /fs/xchg
-
- echo root:x:0:0::/root:/bin/false > /fs/etc/passwd
-
- set +e
- chroot /fs $command $out
- echo $? > /fs/xchg/in-vm-exit
-
- poweroff -f
- '';
-
- initrd = makeInitrd {
- contents = singleton {
- object = preInitScript;
- symlink = "/init";
- };
- };
-
- loopForever = "while :; do ${coreutils}/bin/sleep 1; done";
-
- initScript = writeScript "init.sh" (''
- #!${runtimeShell}
- ${coreutils}/bin/cp -L "${sshKey}" /ssh.key
- ${coreutils}/bin/chmod 600 /ssh.key
- '' + (if installMode then ''
- echo -n "Waiting for Windows installation to finish..."
- while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do
- echo -n .
- # Print a dot every 10 seconds only to shorten line length.
- ${coreutils}/bin/sleep 10
- done
- ${coreutils}/bin/touch /xchg/waiting_done
- echo " success."
- # Loop forever, because this VM is going to be killed.
- ${loopForever}
- '' else ''
- ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private \
- /var/lib/samba /var/log /var/run
- ${coreutils}/bin/cat > /etc/samba/smb.conf < saved-env
- XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)"
- ${coreutils}/bin/mv saved-env "$XCHG_DIR/"
-
- eval "$preVM"
-
- QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
- MONITOR_SOCKET="$(pwd)/monitor"
- WINVM_PIDFILE="$(pwd)/winvm.pid"
- CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid"
- ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" --dirmode 0700 &
- echo 'alive?' | ${socat}/bin/socat - \
- UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
- '';
-
- vmExec = ''
- ${vmTools.qemuProg} ${controllerQemuArgs} &
- ${vmTools.qemuProg} ${cygwinQemuArgs} &
- echo -n "Waiting for VMs to start up..."
- timeout=60
- while ! test -e "$WINVM_PIDFILE" -a -e "$CTRLVM_PIDFILE"; do
- timeout=$(($timeout - 1))
- echo -n .
- if test $timeout -le 0; then
- echo " timed out."
- exit 1
- fi
- ${coreutils}/bin/sleep 1
- done
- echo " done."
- '';
-
- checkDropOut = ''
- if ! test -e "$XCHG_DIR/waiting_done" &&
- ! kill -0 $(< "$WINVM_PIDFILE"); then
- echo "Windows VM has dropped out early, bailing out!" >&2
- exit 1
- fi
- '';
-
- toMonitor = "${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET";
-
- postVM = if suspendTo != null then ''
- while ! test -e "$XCHG_DIR/suspend_now"; do
- ${checkDropOut}
- ${coreutils}/bin/sleep 1
- done
- ${toMonitor} < '${suspendTo}'"
- CMD
- echo -n "Waiting for memory dump to finish..."
- while ! echo info migrate | ${toMonitor} | \
- ${gnugrep}/bin/grep -qi '^migration *status: *complete'; do
- ${coreutils}/bin/sleep 1
- echo -n .
- done
- echo " done."
- echo quit | ${toMonitor}
- wait $(< "$WINVM_PIDFILE")
- eval "$postVM"
- exit 0
- '' else if installMode then ''
- wait $(< "$WINVM_PIDFILE")
- eval "$postVM"
- exit 0
- '' else ''
- while kill -0 $(< "$CTRLVM_PIDFILE"); do
- ${checkDropOut}
- done
- if ! test -e "$XCHG_DIR/in-vm-exit"; then
- echo "Virtual machine didn't produce an exit code."
- exit 1
- fi
- eval "$postVM"
- exit $(< "$XCHG_DIR/in-vm-exit")
- '';
-
-in writeScript "run-cygwin-vm.sh" ''
- #!${stdenv.shell} -e
- ${preVM}
- ${vmExec}
- ${postVM}
-''
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/default.nix
deleted file mode 100644
index 76cd41a75b..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph
-, arch ? "x86_64"
-}:
-
-{ packages ? []
-, mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin"
-, extraContents ? []
-}:
-
-let
- cygPkgList = if arch == "x86_64" then fetchurl {
- url = "${mirror}/x86_64/setup.ini";
- sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj";
- } else fetchurl {
- url = "${mirror}/x86/setup.ini";
- sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69";
- };
-
- cygwinCross = (import ../../../../.. {
- localSystem = stdenv.hostPlatform;
- crossSystem = {
- libc = "msvcrt";
- platform = {};
- inherit arch;
- config = "${arch}-w64-mingw32";
- };
- }).windows.cygwinSetup;
-
- makeCygwinClosure = { packages, packageList }: let
- expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
- python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
- '');
- gen = { url, hash }: {
- source = fetchurl {
- url = "${mirror}/${url}";
- sha512 = hash;
- };
- target = url;
- };
- in map gen expr;
-
-in import ../../../../../nixos/lib/make-iso9660-image.nix {
- inherit stdenv perl xorriso pathsFromGraph;
- syslinux = null;
- contents = [
- { source = "${cygwinCross}/bin/setup.exe";
- target = "setup.exe";
- }
- { source = cygPkgList;
- target = "setup.ini";
- }
- ] ++ makeCygwinClosure {
- packages = cygPkgList;
- packageList = packages;
- } ++ extraContents;
-}
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
deleted file mode 100644
index 4c0d67c43b..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Ugliest Python code I've ever written. -- aszlig
-import sys
-
-def get_plist(path):
- in_pack = False
- in_str = False
- current_key = None
- buf = ""
- packages = {}
- package_name = None
- package_attrs = {}
- with open(path, 'r') as setup:
- for line in setup:
- if in_str and line.rstrip().endswith('"'):
- package_attrs[current_key] = buf + line.rstrip()[:-1]
- in_str = False
- continue
- elif in_str:
- buf += line
- continue
-
- if line.startswith('@'):
- in_pack = True
- package_name = line[1:].strip()
- package_attrs = {}
- elif in_pack and ':' in line:
- key, value = line.split(':', 1)
- if value.lstrip().startswith('"'):
- if value.lstrip()[1:].rstrip().endswith('"'):
- value = value.strip().strip('"')
- else:
- in_str = True
- current_key = key.strip().lower()
- buf = value.lstrip()[1:]
- continue
- package_attrs[key.strip().lower()] = value.strip()
- elif in_pack:
- in_pack = False
- packages[package_name] = package_attrs
- return packages
-
-def main():
- packages = get_plist(sys.argv[1])
- to_include = set()
-
- def traverse(package):
- to_include.add(package)
- attrs = packages.get(package, {})
- deps = attrs.get('requires', '').split()
- for new_dep in set(deps) - to_include:
- traverse(new_dep)
-
- map(traverse, sys.argv[2:])
-
- sys.stdout.write('[\n')
- for package, attrs in packages.iteritems():
- if package not in to_include:
- cats = [c.lower() for c in attrs.get('category', '').split()]
- if 'base' not in cats:
- continue
-
- install_line = attrs.get('install')
- if install_line is None:
- continue
-
- url, size, hash = install_line.split(' ', 2)
-
- pack = [
- ' {',
- ' url = "{0}";'.format(url),
- ' hash = "{0}";'.format(hash),
- ' }',
- ];
- sys.stdout.write('\n'.join(pack) + '\n')
- sys.stdout.write(']\n')
-
-if __name__ == '__main__':
- main()
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/windows/default.nix
deleted file mode 100644
index 309241c36d..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-#note: the hardcoded /bin/sh is required for the VM's cygwin shell
-pkgs:
-
-let
- bootstrapper = import ./bootstrap.nix {
- inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd;
- inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba;
- inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph;
- inherit (pkgs) gnugrep;
- };
-
- builder = ''
- source /tmp/xchg/saved-env 2> /dev/null || true
- export NIX_STORE=/nix/store
- export NIX_BUILD_TOP=/tmp
- export TMPDIR=/tmp
- export PATH=/empty
- cd "$NIX_BUILD_TOP"
- exec $origBuilder $origArgs
- '';
-
-in {
- runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let
- bootstrap = bootstrapper attrs.windowsImage;
- in {
- requiredSystemFeatures = [ "kvm" ];
- builder = pkgs.stdenv.shell;
- args = ["-e" (bootstrap.resumeAndRun builder)];
- windowsImage = bootstrap.suspendedVM;
- origArgs = attrs.args;
- origBuilder = if attrs.builder == attrs.stdenv.shell
- then "/bin/sh"
- else attrs.builder;
-
- postHook = ''
- PATH=/usr/bin:/bin:/usr/sbin:/sbin
- SHELL=/bin/sh
- eval "$origPostHook"
- '';
-
- origPostHook = attrs.postHook or "";
- fixupPhase = ":";
- });
-}
diff --git a/third_party/nixpkgs/pkgs/build-support/vm/windows/install/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/windows/install/default.nix
deleted file mode 100644
index fe8e8f61de..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/vm/windows/install/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, runCommand, openssh, qemu, controller, mkCygwinImage
-, writeText, dosfstools, mtools
-}:
-
-{ isoFile
-, productKey
-}:
-
-let
- bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
- cat > "$out" < ~/.ssh/authorized_keys < certdata2pem.py
- patch -p1 < ${./fix-unicode-ca-names.patch}
- ${optionalString includeEmail ''
- # Disable CAs used for mail signing
- substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] '''
- ''}
'';
buildPhase = ''
@@ -66,12 +65,59 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh;
passthru.updateScript = ./update.sh;
+ passthru.tests = {
+ # Test that building this derivation with a blacklist works, and that UTF-8 is supported.
+ blacklist-utf8 = let
+ blacklistCAToFingerprint = {
+ # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint.
+ "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD";
+ "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98";
+ };
+ mapBlacklist = f: concatStringsSep "\n" (mapAttrsToList f blacklistCAToFingerprint);
+ in runCommand "verify-the-cacert-filter-output" {
+ cacert = cacert.unbundled;
+ cacertWithExcludes = (cacert.override {
+ blacklist = builtins.attrNames blacklistCAToFingerprint;
+ }).unbundled;
+
+ nativeBuildInputs = [ openssl ];
+ } ''
+ isPresent() {
+ # isPresent
+ for f in $1/etc/ssl/certs/*.crt; do
+ fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)"
+ if [[ "x$fingerprint" == "x$3" ]]; then
+ return 0
+ fi
+ done
+ return 1
+ }
+
+ # Ensure that each certificate is in the main "cacert".
+ ${mapBlacklist (caName: caFingerprint: ''
+ isPresent "$cacert" "${caName}" "${caFingerprint}" || ({
+ echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2
+ exit 1
+ })
+ '')}
+
+ # Ensure that each certificate is NOT in the "cacertWithExcludes".
+ ${mapBlacklist (caName: caFingerprint: ''
+ isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({
+ echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2
+ exit 1
+ })
+ '')}
+
+ touch $out
+ '';
+ };
meta = {
homepage = "https://curl.haxx.se/docs/caextract.html";
description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
platforms = platforms.all;
- maintainers = with maintainers; [ fpletz ];
+ maintainers = with maintainers; [ andir fpletz lukegb ];
license = licenses.mpl20;
};
}
diff --git a/third_party/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/third_party/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
deleted file mode 100644
index 07d3629196..0000000000
--- a/third_party/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/certdata2pem.py 2017-08-01 23:10:00.000000000 +0300
-+++ b/certdata2pem.py 2017-08-01 23:08:21.131297636 +0300
-@@ -88,7 +88,7 @@
- \# Read blacklist.
- blacklist = []
- if os.path.exists('blacklist.txt'):
-- for line in open('blacklist.txt', 'r'):
-+ for line in io.open('blacklist.txt', 'r', encoding='utf-8'):
- line = line.strip()
- if line.startswith('#') or len(line) == 0:
- continue
-@@ -101,7 +101,7 @@
- if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
- continue
- if obj['CKA_LABEL'] in blacklist:
-- print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
-+ print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8'))
- elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix
index 9f21ca1eeb..c94efd4c3e 100644
--- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz";
- sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/13d33ba1a0ce6acd583dee6a8a2c7e7398fa30cd.tar.gz";
+ sha256 = "0ggm1iv2ilxj39icqjx4dk9p3sbndvrf90v2qssz9h49xsv9w0j7";
}
diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
index ced7483ae4..9721d08347 100644
--- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20201015";
+ version = "20201119";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "1i20lribrb03vsn57q722mbmjhxqswq2y2dpii95ic5zxvnaj1qa";
+ sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
index df548052b8..75b9d0f65e 100644
--- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
- version = "2020-11-23";
+ version = "2020-12-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "115nmzwpsaq8aa0p7ghfcw79n7h9ifvh0drv3dd4lj2dk33vkpv1";
+ sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 1311bea08d..8f2ec6f85d 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
- version = "3.38.1";
+ version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j";
+ sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
index 026e0d2fae..10130be57d 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -47,13 +47,13 @@ in
stdenv.mkDerivation rec {
pname = "gdm";
- version = "3.38.2";
+ version = "3.38.2.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1k2k3rv10y9dppp6ffz6gqi2p6s3g03bxjyy8njvcjyxqdk6d8i5";
+ sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo=";
};
mesonFlags = [
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 444fcfc4f6..d4972fb0a2 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
- version = "3.38.0";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "08sj1csd1jsmph2lyw2lpj7jh40236alz56pmf315hwyimkcwd3p";
+ sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
index c2d5136e45..382f8aa732 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "Tiled scrollable window management for Gnome Shell";
homepage = "https://github.com/paperwm/PaperWM";
license = licenses.gpl3;
- maintainers = with maintainers; [ hedning zowoq ];
+ maintainers = with maintainers; [ hedning ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix
index b41d766c1a..38dfd62184 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "compton-conf";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py";
+ sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix
index 1292da151a..088b4e335e 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix
@@ -107,7 +107,7 @@ let
qlipper
### Default icon theme
- pkgs.oxygen-icons5
+ pkgs.kdeFrameworks.oxygen-icons5
### Screen saver
pkgs.xscreensaver
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
index fc97906ab7..fb6b759db5 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "libfm-qt";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
- sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3";
+ sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
index bd8181d57f..ee915491f8 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "liblxqt";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "01vfy7r7h0c5axlwqwsxg3pzdlaicnf2474bcq3jwk12gipvj5sd";
+ sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
index f5da7a4b23..f2d00a5869 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libqtxdg";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85";
+ sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
index 642b57fe0d..6f6e432ad9 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "libsysstat";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf";
+ sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
index 22ce26526a..014898f532 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lximage-qt";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp";
+ sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
index 0136512946..0070d31af9 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-about";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x";
+ sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 21a637bc66..b3b74b92f6 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-admin";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a";
+ sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 93e5ffec2a..8c5c57045d 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-archiver";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
- sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5";
+ sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 92ce3c2fe5..cd39096678 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "lxqt-build-tools";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf";
+ sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
index 677b90b25c..c50b258243 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-config";
- version = "0.15.0";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s";
+ sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 59e2096dea..62bb75e787 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm";
+ sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 43f9bf3193..520c0322ea 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-notificationd";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k";
+ sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index a164571800..cdfb51a472 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-openssh-askpass";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3";
+ sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
index a0bdd9bfae..d333bae3d3 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -30,13 +30,13 @@
mkDerivation rec {
pname = "lxqt-panel";
- version = "0.15.1";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd";
+ sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 7575c805a3..5b708d6c03 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-policykit";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h";
+ sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 2b48a2a04b..22eb060dfd 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -12,18 +12,19 @@
, kidletime
, liblxqt
, libqtxdg
+, lxqt-globalkeys
, lxqtUpdateScript
}:
mkDerivation rec {
pname = "lxqt-powermanagement";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f";
+ sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy";
};
nativeBuildInputs = [
@@ -41,6 +42,7 @@ mkDerivation rec {
kidletime
liblxqt
libqtxdg
+ lxqt-globalkeys
];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 7bdd628f45..5fbf9f8f56 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-qtplugin";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0if01bdhz8ph4k1mwvjjjw0fw6mxzprgz17ap23xbsdr009hxdf0";
+ sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 8a27ef4161..d99692847f 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -20,13 +20,13 @@
mkDerivation rec {
pname = "lxqt-runner";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5";
+ sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
index 2e513b2398..bb212cf15a 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-session";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn";
+ sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 5f8fbcd2a6..a6fef7479a 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lxqt-sudo";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb";
+ sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 4613017b8a..5ab100bd10 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "lxqt-themes";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29";
+ sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix
index 91baba60d8..3b9891053f 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "obconf-qt";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib";
+ sha256 = "0kk5scp1j0hqi27q3yl9cg73ybxzm22nj96pa8adhdn4shg9bpac";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 24343d4237..dafb894791 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "pavucontrol-qt";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367";
+ sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 599dd67828..9a6085da02 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "pcmanfm-qt";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4";
+ sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
index 7ef9db40f7..fea3db315c 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "qps";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva";
+ sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
index c7bcf6dad3..47a621d219 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
@@ -12,13 +12,13 @@
mkDerivation rec {
pname = "qterminal";
- version = "0.15.0";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3";
+ sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
index fc3fb4a5db..2517b7a444 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "qtermwidget";
- version = "0.15.0";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m";
+ sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
index 6a2e14fa50..cac2ef27d7 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "screengrab";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6";
+ sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
index b5ff3f5dd0..7500dda7e3 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,14 +1,17 @@
{
- mkDerivation, extra-cmake-modules, shared-mime-info,
- bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
- knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
+ mkDerivation, lib, extra-cmake-modules, shared-mime-info,
+ qtbase, qtdeclarative, bluez-qt,
+ kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications,
+ kwidgetsaddons, kwindowsystem, plasma-framework
}:
mkDerivation {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
- bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
- kdbusaddons kded kiconthemes knotifications kwidgetsaddons
+ qtbase qtdeclarative bluez-qt
+ ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
+ kiconthemes knotifications kwidgetsaddons
];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
index 39299d8c83..014f794b5e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
@@ -118,6 +118,7 @@ let
ksysguard = callPackage ./ksysguard.nix {};
kwallet-pam = callPackage ./kwallet-pam.nix {};
kwayland-integration = callPackage ./kwayland-integration.nix {};
+ kwayland-server = callPackage ./kwayland-server {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen {};
@@ -126,6 +127,7 @@ let
oxygen = callPackage ./oxygen.nix {};
plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
plasma-desktop = callPackage ./plasma-desktop {};
+ plasma-disks = callPackage ./plasma-disks.nix {};
plasma-integration = callPackage ./plasma-integration {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
@@ -137,7 +139,6 @@ let
powerdevil = callPackage ./powerdevil.nix {};
sddm-kcm = callPackage ./sddm-kcm.nix {};
systemsettings = callPackage ./systemsettings.nix {};
- user-manager = callPackage ./user-manager.nix {};
xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {};
thirdParty = let inherit (libsForQt5) callPackage; in {
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
index ccfeaa4f63..37632ab2f7 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
@@ -1,14 +1,15 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools, python,
appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
- qtquickcontrols2,
+ qtbase, qtquickcontrols2,
karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
knewstuff, kwindowsystem, kxmlgui, plasma-framework
}:
mkDerivation {
name = "discover";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
# discount is needed for libmarkdown
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
index abb5659526..dbc4eef057 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ )
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index d2870c27e6..5c856b9d39 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,12 +1,13 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
- kwindowsystem, kxmlgui, kcrash
+ kwindowsystem, kxmlgui, kcrash, qtbase
}:
mkDerivation {
name = "kactivitymanagerd";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index c1ed6dbd6c..798f8d807a 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules, wrapGAppsHook,
glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
- knewstuff, gsettings-desktop-schemas, xsettingsd
+ knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass
}:
mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
- knewstuff gsettings-desktop-schemas xsettingsd
+ knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass
];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
index 569da3c703..9a09ce30f4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, extra-cmake-modules, qtbase, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }:
mkDerivation {
name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
index ccbf3820b9..e7cc42e77c 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,11 +1,12 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm
+ kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm
}:
mkDerivation {
name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
+ meta.broken = lib.versionOlder qtbase.version "5.15";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
index cf353af589..c8213482d7 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,6 +1,7 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
+ qtbase,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
@@ -9,6 +10,7 @@
mkDerivation {
name = "kinfocenter";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
index e748121132..ace14b385e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,13 +1,14 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
- kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
+ kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras,
wayland,
}:
mkDerivation {
name = "kscreenlocker";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
index 39e260f6c7..c4dabd7134 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,5 +1,5 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
}:
@@ -8,4 +8,5 @@ mkDerivation {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
index 72793fdf08..0581b8bde7 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,13 +1,14 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
- knewstuff, libksysguard
+ knewstuff, libksysguard, qtbase
}:
mkDerivation {
name = "ksysguard";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
index 667d3ead17..2e923094dc 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,5 +1,5 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
kguiaddons, kidletime, kwayland, kwindowsystem, qtbase,
}:
@@ -8,4 +8,5 @@ mkDerivation {
name = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
new file mode 100644
index 0000000000..771e093bb9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
@@ -0,0 +1,25 @@
+From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001
+From: Tom Hall
+Date: Sat, 29 Aug 2020 19:14:30 +0100
+Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
+
+---
+ src/server/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
+index 0f99682..35e3601 100644
+--- a/src/server/CMakeLists.txt
++++ b/src/server/CMakeLists.txt
+@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI
+ SOVERSION ${KWAYLANDSERVER_SOVERSION}
+ )
+
+-install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+ set(SERVER_LIB_HEADERS
+ ${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h
+--
+2.26.2
+
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix
new file mode 100644
index 0000000000..6d2a3fabff
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, lib, cmake,
+ extra-cmake-modules, kdoctools,
+ kwayland, plasma-wayland-protocols,
+ wayland, wayland-protocols, qtbase
+}:
+
+mkDerivation {
+ name = "kwayland-server";
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules #kdoctools
+ ];
+ buildInputs = [
+ kwayland plasma-wayland-protocols wayland wayland-protocols
+ ];
+ patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
+}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index e2fb0877ec..f0b07fba73 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
@@ -11,7 +11,7 @@
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
- kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
+ kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, libcap, libdrm, mesa
}:
@@ -30,18 +30,13 @@ mkDerivation {
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
- kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
+ kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
libcap libdrm mesa
];
- outputs = [ "bin" "dev" "out" ];
+ outputs = [ "dev" "out" ];
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
- (fetchpatch { # included in >= 5.18.6
- name = "EGL_TEXTURE_Y_XUXV_WL.diff";
- url = "https://github.com/KDE/kwin/commit/2c76cc478.diff";
- sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy";
- })
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
index f6f6187e94..e6ee4829bc 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,5 +1,5 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
}:
@@ -8,4 +8,5 @@ mkDerivation {
name = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
index db952944ec..08a9e6f4f2 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -7,7 +7,7 @@
mkDerivation {
name = "libkscreen";
meta = {
- broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
+ broken = lib.versionOlder qtbase.version "5.15.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kwayland libXrandr qtx11extras ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
index 96d113e11f..8178d40795 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,13 +1,14 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
- kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine,
- qtx11extras
+ knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework,
+ qtbase, qtscript, qtwebengine, qtx11extras
}:
mkDerivation {
name = "libksysguard";
+ meta.broken = lib.versionOlder qtbase.version "5.14.0";
patches = [
./0001-qdiriterator-follow-symlinks.patch
];
@@ -15,7 +16,7 @@ mkDerivation {
buildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
- qtwebengine
+ qtwebengine knewstuff
];
outputs = [ "bin" "dev" "out" ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
index 790979d664..ab23703a47 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
@@ -1,12 +1,13 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice,
- plasma-framework, qtscript, qtdeclarative
+ plasma-framework, qtbase, qtscript, qtdeclarative
}:
mkDerivation {
name = "milou";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
index 1b1f34f17b..6eea3c9231 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
@@ -3,7 +3,7 @@
extra-cmake-modules,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
- qtx11extras
+ qtx11extras, libXdmcp
}:
mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
- qtx11extras
+ qtx11extras libXdmcp
];
outputs = [ "bin" "dev" "out" ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 73e449a136..a07a50f049 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -19,7 +19,7 @@ mkDerivation {
name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft
+ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
@@ -35,7 +35,7 @@ mkDerivation {
./tzdir.patch
];
postPatch = ''
- sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+ sed '1i#include ' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp
'';
CXXFLAGS = [
"-I${lib.getDev xorgserver}/include/xorg"
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix
new file mode 100644
index 0000000000..f97b061292
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, extra-cmake-modules, kdoctools,
+ kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
+ kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
+ kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace,
+ systemsettings
+}:
+
+mkDerivation {
+ name = "plasma-disks";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
+ kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
+ kactivities kactivities-stats kirigami2 kcrash plasma-workspace
+ systemsettings
+ ];
+ outputs = [ "bin" "dev" "out" ];
+}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 8296d54978..31fd355895 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,15 +1,17 @@
{
- mkDerivation, substituteAll,
+ mkDerivation, lib, substituteAll,
extra-cmake-modules, kdoctools,
kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt,
- openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
+ openconnect, openvpn, plasma-framework, qca-qt5, qtbase, qtdeclarative,
+ qttools, solid
}:
mkDerivation {
name = "plasma-nm";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
index e29df104f3..00f5fefdc4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,8 +1,8 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
- qtdeclarative,
+ qtbase, qtdeclarative,
gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
}:
@@ -15,6 +15,7 @@ mkDerivation {
kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
kwindowsystem
- qtdeclarative
+ qtbase qtdeclarative
];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
index 1208009262..ea8afedbe5 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
@@ -1,19 +1,33 @@
-From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Tue, 28 Jan 2020 05:00:53 -0600
-Subject: [PATCH 1/2] startkde
+From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001
+From: Tom Hall
+Date: Mon, 7 Sep 2020 18:09:52 +0100
+Subject: [PATCH] startkde
---
+ startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
- startkde/startplasma.cpp | 24 ++++++++++--------------
- 3 files changed, 12 insertions(+), 16 deletions(-)
+ startkde/startplasma.cpp | 22 +++++++++-------------
+ 4 files changed, 12 insertions(+), 16 deletions(-)
+diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
+index 89cc144ba..8ca9e81d2 100644
+--- a/startkde/plasma-session/startup.cpp
++++ b/startkde/plasma-session/startup.cpp
+@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent):
+ upAndRunning(QStringLiteral("ksmserver"));
+ const AutoStart autostart;
+
+- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
++ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
+
+ KJob* phase1;
+ QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
-index 87c71c6b3..5fc53140e 100644
+index f59654d18..5e3a93db0 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
-@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
+@@ -61,7 +61,7 @@ int main(int argc, char** argv)
waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n";
@@ -23,10 +37,10 @@ index 87c71c6b3..5fc53140e 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index 3314b6283..14cbe29fa 100644
+index ae1c4d101..0df24b5be 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
-@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
+@@ -110,7 +110,7 @@ int main(int argc, char** argv)
out << "startkde: Shutting down...\n";
@@ -36,10 +50,10 @@ index 3314b6283..14cbe29fa 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index 4c9f5cef6..5ea4c2cf1 100644
+index a055d5635..62afb1513 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
-@@ -34,7 +34,7 @@ QTextStream out(stderr);
+@@ -41,7 +41,7 @@ QTextStream out(stderr);
void messageBox(const QString &text)
{
out << text;
@@ -48,7 +62,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
QStringList allServices(const QLatin1String& prefix)
-@@ -242,15 +242,15 @@ void setupX11()
+@@ -262,15 +262,15 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
@@ -69,20 +83,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
// TODO: Check if Necessary
-@@ -267,11 +267,7 @@ bool syncDBusEnvironment()
- {
- int exitCode;
- // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) {
-- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") });
-- } else {
-- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {});
-- }
-+ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") });
- return exitCode == 0;
- }
-
-@@ -287,7 +283,7 @@ void setupFontDpi()
+@@ -306,7 +302,7 @@ void setupFontDpi()
//TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
@@ -91,7 +92,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
-@@ -309,7 +305,7 @@ QProcess* setupKSplash()
+@@ -328,7 +324,7 @@ QProcess* setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
@@ -100,15 +101,6 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
}
return p;
-@@ -331,7 +327,7 @@ bool startKDEInit()
- {
- // We set LD_BIND_NOW to increase the efficiency of kdeinit.
- // kdeinit unsets this variable before loading applications.
-- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
-+ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
- if (exitCode != 0) {
- messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
- return false;
--
-2.25.1
+2.28.0
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 8df146068c..e1becaab95 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -4,7 +4,7 @@
extra-cmake-modules, kdoctools,
coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
- libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot,
+ libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot,
baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
@@ -12,10 +12,10 @@
kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
- appstream-qt,
+ appstream-qt, plasma-wayland-protocols,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
- qtwayland, qtx11extras,
+ qtwayland, qtx11extras, qqc2-desktop-style,
}:
let inherit (lib) getBin getLib; in
@@ -25,16 +25,17 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- isocodes libdbusmenu libSM libXcursor libXtst pam wayland
+ isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland
baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons
kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
libqalculate networkmanager-qt phonon plasma-framework prison solid
- kholidays kquickcharts appstream-qt
+ kholidays kquickcharts appstream-qt plasma-wayland-protocols
- qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
+ qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
+ qtx11extras qqc2-desktop-style
];
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index c25b3d2744..27f03e2d93 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,7 +1,7 @@
{
- mkDerivation, extra-cmake-modules,
+ mkDerivation, lib, extra-cmake-modules,
kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
- kwidgetsaddons, kwindowsystem, polkit-qt
+ kwidgetsaddons, kwindowsystem, polkit-qt, qtbase
}:
mkDerivation {
@@ -12,4 +12,5 @@ mkDerivation {
knotifications kwindowsystem polkit-qt
];
outputs = [ "out" "dev" ];
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
index 979d69a02f..28e6db853a 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
@@ -19,18 +19,10 @@ mkDerivation {
"-DHAVE_DDCUTIL=On"
];
patches = [
- # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to
- # 'DDCA_Feature_List'.
- # https://bugs.kde.org/show_bug.cgi?id=423605
- (fetchpatch {
- url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
- sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
- })
-
# Reduce log message spam by setting the default log level to Warning.
- (fetchpatch {
- url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
- sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2";
- })
+ #(fetchpatch {
+ # url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
+ # sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2";
+ #})
];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
index 6becf3bf42..a9f51e50a2 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
@@ -1,12 +1,13 @@
{
- mkDerivation, extra-cmake-modules, shared-mime-info,
+ mkDerivation, lib, extra-cmake-modules, shared-mime-info,
libpthreadstubs, libXcursor, libXdmcp,
- qtquickcontrols2, qtx11extras,
+ qtbase, qtquickcontrols2, qtx11extras,
karchive, ki18n, kio, knewstuff
}:
mkDerivation {
name = "sddm-kcm";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
libpthreadstubs libXcursor libXdmcp
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
index 6f9214ccd6..ecca8c5bfd 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
@@ -1,390 +1,398 @@
# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
{ fetchurl, mirror }:
{
bluedevil = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz";
- sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66";
- name = "bluedevil-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz";
+ sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129";
+ name = "bluedevil-5.20.4.tar.xz";
};
};
breeze = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz";
- sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563";
- name = "breeze-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz";
+ sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f";
+ name = "breeze-5.20.4.tar.xz";
};
};
breeze-grub = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz";
- sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1";
- name = "breeze-grub-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz";
+ sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb";
+ name = "breeze-grub-5.20.4.tar.xz";
};
};
breeze-gtk = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz";
- sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9";
- name = "breeze-gtk-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz";
+ sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d";
+ name = "breeze-gtk-5.20.4.tar.xz";
};
};
breeze-plymouth = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz";
- sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281";
- name = "breeze-plymouth-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz";
+ sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada";
+ name = "breeze-plymouth-5.20.4.tar.xz";
};
};
discover = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz";
- sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6";
- name = "discover-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz";
+ sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012";
+ name = "discover-5.20.4.tar.xz";
};
};
drkonqi = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz";
- sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1";
- name = "drkonqi-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz";
+ sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8";
+ name = "drkonqi-5.20.4.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz";
- sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7";
- name = "kactivitymanagerd-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz";
+ sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34";
+ name = "kactivitymanagerd-5.20.4.tar.xz";
};
};
kde-cli-tools = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz";
- sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8";
- name = "kde-cli-tools-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz";
+ sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3";
+ name = "kde-cli-tools-5.20.4.tar.xz";
};
};
kdecoration = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz";
- sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8";
- name = "kdecoration-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz";
+ sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8";
+ name = "kdecoration-5.20.4.tar.xz";
};
};
kde-gtk-config = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz";
- sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab";
- name = "kde-gtk-config-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz";
+ sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1";
+ name = "kde-gtk-config-5.20.4.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz";
- sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f";
- name = "kdeplasma-addons-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz";
+ sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7";
+ name = "kdeplasma-addons-5.20.4.tar.xz";
};
};
kgamma5 = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz";
- sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f";
- name = "kgamma5-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz";
+ sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41";
+ name = "kgamma5-5.20.4.tar.xz";
};
};
khotkeys = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz";
- sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766";
- name = "khotkeys-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz";
+ sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648";
+ name = "khotkeys-5.20.4.tar.xz";
};
};
kinfocenter = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz";
- sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5";
- name = "kinfocenter-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz";
+ sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3";
+ name = "kinfocenter-5.20.4.tar.xz";
};
};
kmenuedit = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz";
- sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6";
- name = "kmenuedit-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz";
+ sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b";
+ name = "kmenuedit-5.20.4.tar.xz";
};
};
kscreen = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz";
- sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2";
- name = "kscreen-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz";
+ sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c";
+ name = "kscreen-5.20.4.tar.xz";
};
};
kscreenlocker = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz";
- sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2";
- name = "kscreenlocker-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz";
+ sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126";
+ name = "kscreenlocker-5.20.4.tar.xz";
};
};
ksshaskpass = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz";
- sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5";
- name = "ksshaskpass-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz";
+ sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218";
+ name = "ksshaskpass-5.20.4.tar.xz";
};
};
ksysguard = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz";
- sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f";
- name = "ksysguard-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz";
+ sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4";
+ name = "ksysguard-5.20.4.tar.xz";
};
};
kwallet-pam = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz";
- sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a";
- name = "kwallet-pam-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz";
+ sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9";
+ name = "kwallet-pam-5.20.4.tar.xz";
};
};
kwayland-integration = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz";
- sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5";
- name = "kwayland-integration-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz";
+ sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d";
+ name = "kwayland-integration-5.20.4.tar.xz";
+ };
+ };
+ kwayland-server = {
+ version = "5.20.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz";
+ sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44";
+ name = "kwayland-server-5.20.4.tar.xz";
};
};
kwin = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz";
- sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8";
- name = "kwin-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz";
+ sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a";
+ name = "kwin-5.20.4.tar.xz";
};
};
kwrited = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz";
- sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe";
- name = "kwrited-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz";
+ sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2";
+ name = "kwrited-5.20.4.tar.xz";
};
};
libkscreen = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz";
- sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c";
- name = "libkscreen-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz";
+ sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d";
+ name = "libkscreen-5.20.4.tar.xz";
};
};
libksysguard = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz";
- sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b";
- name = "libksysguard-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz";
+ sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422";
+ name = "libksysguard-5.20.4.tar.xz";
};
};
milou = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz";
- sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2";
- name = "milou-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz";
+ sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201";
+ name = "milou-5.20.4.tar.xz";
};
};
oxygen = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz";
- sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8";
- name = "oxygen-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz";
+ sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67";
+ name = "oxygen-5.20.4.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz";
- sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383";
- name = "plasma-browser-integration-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz";
+ sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4";
+ name = "plasma-browser-integration-5.20.4.tar.xz";
};
};
plasma-desktop = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz";
- sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f";
- name = "plasma-desktop-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz";
+ sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355";
+ name = "plasma-desktop-5.20.4.tar.xz";
+ };
+ };
+ plasma-disks = {
+ version = "5.20.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz";
+ sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845";
+ name = "plasma-disks-5.20.4.tar.xz";
};
};
plasma-integration = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz";
- sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870";
- name = "plasma-integration-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz";
+ sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299";
+ name = "plasma-integration-5.20.4.tar.xz";
};
};
plasma-nano = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz";
- sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341";
- name = "plasma-nano-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz";
+ sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd";
+ name = "plasma-nano-5.20.4.tar.xz";
};
};
plasma-nm = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz";
- sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa";
- name = "plasma-nm-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz";
+ sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf";
+ name = "plasma-nm-5.20.4.tar.xz";
};
};
plasma-pa = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz";
- sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209";
- name = "plasma-pa-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz";
+ sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3";
+ name = "plasma-pa-5.20.4.tar.xz";
};
};
plasma-phone-components = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz";
- sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070";
- name = "plasma-phone-components-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz";
+ sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e";
+ name = "plasma-phone-components-5.20.4.tar.xz";
};
};
plasma-sdk = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz";
- sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5";
- name = "plasma-sdk-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz";
+ sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea";
+ name = "plasma-sdk-5.20.4.tar.xz";
};
};
plasma-tests = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz";
- sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a";
- name = "plasma-tests-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz";
+ sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735";
+ name = "plasma-tests-5.20.4.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz";
- sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1";
- name = "plasma-thunderbolt-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz";
+ sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429";
+ name = "plasma-thunderbolt-5.20.4.tar.xz";
};
};
plasma-vault = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz";
- sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41";
- name = "plasma-vault-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz";
+ sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c";
+ name = "plasma-vault-5.20.4.tar.xz";
};
};
plasma-workspace = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz";
- sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354";
- name = "plasma-workspace-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz";
+ sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9";
+ name = "plasma-workspace-5.20.4.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz";
- sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d";
- name = "plasma-workspace-wallpapers-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz";
+ sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808";
+ name = "plasma-workspace-wallpapers-5.20.4.tar.xz";
};
};
plymouth-kcm = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz";
- sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3";
- name = "plymouth-kcm-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz";
+ sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77";
+ name = "plymouth-kcm-5.20.4.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.18.5";
+ version = "1-5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz";
- sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91";
- name = "polkit-kde-agent-1-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz";
+ sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61";
+ name = "polkit-kde-agent-1-5.20.4.tar.xz";
};
};
powerdevil = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz";
- sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548";
- name = "powerdevil-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz";
+ sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d";
+ name = "powerdevil-5.20.4.tar.xz";
};
};
sddm-kcm = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz";
- sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b";
- name = "sddm-kcm-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz";
+ sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e";
+ name = "sddm-kcm-5.20.4.tar.xz";
};
};
systemsettings = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz";
- sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b";
- name = "systemsettings-5.18.5.tar.xz";
- };
- };
- user-manager = {
- version = "5.18.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz";
- sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484";
- name = "user-manager-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz";
+ sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9";
+ name = "systemsettings-5.20.4.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.18.5";
+ version = "5.20.4";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz";
- sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224";
- name = "xdg-desktop-portal-kde-5.18.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz";
+ sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8";
+ name = "xdg-desktop-portal-kde-5.20.4.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/user-manager.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/user-manager.nix
deleted file mode 100644
index f46792fc48..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/user-manager.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml,
- ki18n, kiconthemes, kio, kwindowsystem, libpwquality
-}:
-
-mkDerivation {
- name = "user-manager";
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [
- kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem
- libpwquality
- ];
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index c03c6a8916..2b0450928f 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,18 +1,20 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools, python,
- cups, epoxy, mesa, pcre, pipewire,
+ cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
- kirigami2, kdeclarative, plasma-framework, kio
+ kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
+ qtbase
}:
mkDerivation {
name = "xdg-desktop-portal-kde";
+ meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
- cups epoxy mesa pcre pipewire
+ cups epoxy mesa pcre pipewire wayland wayland-protocols
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
- kirigami2 kdeclarative plasma-framework
+ kirigami2 kdeclarative plasma-framework plasma-wayland-protocols
];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix
index ee58c76ea0..17da815534 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix
@@ -1,5 +1,5 @@
-{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk2, gtk3
-, libxfce4ui, libxfce4util }:
+{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk2, gtk3
+, libxfce4ui, libxfce4util, perl }:
mkXfceDerivation {
category = "xfce";
@@ -10,7 +10,6 @@ mkXfceDerivation {
nativeBuildInputs = [
libxslt
- perlPackages.URI
docbook_xsl
];
@@ -20,6 +19,8 @@ mkXfceDerivation {
glib
libxfce4ui
libxfce4util
+
+ (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail
];
# Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825
diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix
new file mode 100644
index 0000000000..b6b1fc9c89
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-ci/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3 }:
+
+let
+
+ runtimePath = stdenv.lib.makeBinPath [
+ arduino-cli
+ python3 # required by the esp8266 core
+ ];
+
+in
+stdenv.mkDerivation rec {
+ pname = "arduino-ci";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "pololu";
+ repo = "arduino-ci";
+ rev = "v${version}";
+ sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ install $src/ci.rb $out/bin/arduino-ci
+
+ runHook postInstall
+ '';
+
+ fixupPhase = ''
+ substituteInPlace $out/bin/arduino-ci --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby"
+ wrapProgram $out/bin/arduino-ci --prefix PATH ":" "${runtimePath}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "CI for Arduino Libraries";
+ homepage = src.meta.homepage;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ryantm ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 1c537edd0b..07e9c7bdb0 100644
--- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
@@ -11,7 +11,8 @@
, ncurses
, readline
, withGui ? false
-, gtk2 ? null
+, gtk3 ? null
+, wrapGAppsHook
, withTeensyduino ? false
/* Packages needed for Teensyduino */
, upx
@@ -29,7 +30,7 @@
, udev
}:
-assert withGui -> gtk2 != null;
+assert withGui -> gtk3 != null && wrapGAppsHook != null;
assert withTeensyduino -> withGui;
let
externalDownloads = import ./downloads.nix {
@@ -55,7 +56,7 @@ let
gcc.cc.lib
gdk-pixbuf
glib
- gtk2
+ gtk3
libpng12
libusb-compat-0_1
pango
@@ -78,39 +79,40 @@ let
+ stdenv.lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
- version = "1.8.12";
+ version = "1.8.13";
name = "${flavor}-${version}";
src = fetchFromGitHub {
owner = "arduino";
repo = "Arduino";
rev = version;
- sha256 = "0lxkyvsh55biz2q20ba4qabraind5cpxznl41zfq027vl22j6kd2";
+ sha256 = "0qg3qyj1b7wbaw2rsfly7nf3115h26nskl4ggrn6plhx272ni84p";
};
- teensyduino_version = "151";
+ teensyduino_version = "153";
teensyduino_src = fetchurl {
url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}";
sha256 = {
- linux64 = "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0";
- linux32 = "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m";
- linuxarm = "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip";
- linuxaarch64 = "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x";
+ linux64 = "02qgsj4h4zrjxkcclx7clsqbqd699kg0dq1xxa9hbj3vfnddjv1f";
+ linux32 = "14xaff8xj176ih8ifdvxsly5xgjjm82dqbn7lqq81a43i0svjjyn";
+ linuxarm = "0xpg9axa6dqyhccm9cpvsv2al7rgwy4gv2l8b2kffvn974dl5759";
+ linuxaarch64 = "1lyn4zy4l5mml3c19fw6i2pk1ypnq6mgjmxmzk9d54wpf6n3j5dk";
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
};
# Used because teensyduino requires jars be a specific size
arduino_dist_src = fetchurl {
- url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
+ url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
sha256 =
{
- linux64 = "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9";
- linux32 = "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi";
- linuxarm = "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx";
- linuxaarch64 = "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa";
+ linux64 = "1bdlk51dqiyg5pw23hs8rfv8nrjqy0jqfl89h1466ahahpnd080v";
+ linux32 = "0mgsw9wpwv1pgs2jslzflh7zf4ggqjgcd55hmdzrj0dvgkyw4cr2";
+ linuxarm = "08n4lpak3i7yfyi0085j4nq14gb2n7zx85wl9drp8gaavxnfbp5f";
+ linuxaarch64 = "0m4nhykzknm2hdpz1fhr2hbpncry53kvzs9y5lgj7rx3sy6ygbh7";
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
};
+ nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [
jdk
ant
@@ -149,7 +151,7 @@ stdenv.mkDerivation rec {
# This will be patched into `arduino` wrapper script
# Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH
- dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ];
+ dynamicLibraryPath = lib.makeLibraryPath [ gtk3 ];
javaPath = lib.makeBinPath [ jdk ];
# Everything else will be patched into rpath
diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix
index f2edf64ceb..76fa7664f0 100644
--- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/downloads.nix
@@ -107,20 +107,20 @@
url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip";
sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d";
};
- "build/avr-1.8.2.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2";
- sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2";
+ "build/avr-1.8.3.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2";
+ sha256 = "051wnc0nmsmxvvs4c79zvjag33yx5il2pz2j7qyjsxkp4jc9p2ny";
};
}
// optionalAttrs (system == "x86_64-linux") {
- "build/arduino-builder-linux64-1.5.2.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.2.tar.bz2";
- sha256 = "0wypr9a2cbv9r0ignsr13raw09i3vfc5zvkjxp2xwb7mv35y77z3";
+ "build/arduino-builder-linux64-1.5.4.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.4.tar.bz2";
+ sha256 = "1cgvwlvxzzpjaj4njz1mrsif27l26dwkz9c7gbhdj0lvlk3xsa7s";
};
- "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2";
- sha256 = "1yq6a811dabrkcgzfi3jsys41r19qsna46kglkjbcy0rza7yvzry";
+ "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2";
+ sha256 = "07nrzv7gsq7bi7ichlw3xsdvgzk0lvv56b73ksn3089ajpv3g35x";
};
"build/linux/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix
index 0b37dcf64f..40f3e38e50 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix
@@ -36,6 +36,38 @@ stdenv.mkDerivation {
};
patches = [
+ # https://trac.sagemath.org/ticket/22191#comment:237
+ (fetchurl {
+ name = "ECL_WITH_LISP_FPE.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2";
+ sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c";
+ })
+
+ # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
+ (fetchurl {
+ name = "write_error.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2";
+ sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh";
+ })
+
+ # Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122)
+ (fetchurl {
+ name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2";
+ sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk";
+ })
+
+ (fetchurl {
+ name = "0002-cosmetic-fix-some-compiler-warnings.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2";
+ sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8";
+ })
+
+ (fetchurl {
+ name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2";
+ sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a";
+ })
];
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix
new file mode 100644
index 0000000000..9393d4fc59
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "flasm";
+ version = "1.64";
+
+ src = fetchzip {
+ url = "https://www.nowrap.de/download/flasm16src.zip";
+ sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg";
+ stripRoot = false;
+ };
+
+ makeFlags = [ "CC=cc" ];
+
+ nativeBuildInputs = [ unzip bison flex gperf ];
+
+ buildInputs = [ zlib ];
+
+ installPhase = ''
+ install -Dm755 flasm -t $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Assembler and disassembler for Flash (SWF) bytecode";
+ homepage = "http://flasm.sourceforge.net/";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ siraben ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
index 7f4c824686..934c9a848b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
- version = "1.4.20";
+ version = "1.4.21";
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi";
+ sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
index c67b011721..36b42cef39 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
let
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
- hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY=";
+ hash = "sha256-nIvqEk18NLtY8Hec2Iq6ufWMblzYJ8SOIXgqomtqa0s=";
};
in rec {
clang = wrapCCWith rec {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
index 5b6da3cbef..27427e75d0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
@@ -254,6 +254,11 @@ let
$wrapperArgs
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+ makeWrapper \
+ ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+
makeWrapper \
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
--suffix PATH : $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
index 499a0a5f93..4c8a4cfd4e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rgbds";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "rednex";
repo = "rgbds";
rev = "v${version}";
- sha256 = "05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf";
+ sha256 = "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p";
};
nativeBuildInputs = [ bison flex pkg-config libpng ];
installFlags = [ "PREFIX=\${out}" ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix
index 2b3de4dd38..b4d887f2e9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix
@@ -11,15 +11,24 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
-, llvmPackages
-, pkgsBuildTarget, pkgsBuildBuild
+, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
+, llvmPackages_5, llvm_10
} @ args:
import ./default.nix {
rustcVersion = "1.45.2";
rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp";
+ llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; };
+
+ llvmBootstrapForDarwin = llvmPackages_5;
+
+ # For use at runtime
+ llvmShared = llvm_10.override { enableSharedLibraries = true; };
+
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.44.1";
@@ -41,4 +50,4 @@ import ./default.nix {
];
}
-(builtins.removeAttrs args [ "fetchpatch" ])
+(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_10" ])
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_48.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_48.nix
index b3a512e58b..6b4b10f12d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_48.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_48.nix
@@ -13,15 +13,24 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
-, llvmPackages
-, pkgsBuildTarget, pkgsBuildBuild
+, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
+, llvmPackages_5, llvm_11
} @ args:
import ./default.nix {
rustcVersion = "1.48.0";
rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf";
+ llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; };
+
+ llvmBootstrapForDarwin = llvmPackages_5;
+
+ # For use at runtime
+ llvmShared = llvm_11.override { enableSharedLibraries = true; };
+
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.47.0";
@@ -43,4 +52,4 @@ import ./default.nix {
];
}
-(builtins.removeAttrs args [ "fetchpatch" ])
+(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"])
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix
index 25876cc638..6203eaf47b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix
@@ -5,12 +5,16 @@
, bootstrapHashes
, selectRustPackage
, rustcPatches ? []
+, llvmBootstrapForDarwin
+, llvmShared
+, llvmSharedForBuild
+, llvmSharedForHost
+, llvmSharedForTarget
}:
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
-, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
, makeRustPlatform
}: rec {
@@ -76,16 +80,17 @@
version = rustcVersion;
sha256 = rustcSha256;
inherit enableRustcDev;
+ inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget;
patches = rustcPatches;
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
- stdenv = llvmPackages.stdenv;
- pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
- pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
- pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages.stdenv; };
+ stdenv = llvmBootstrapForDarwin.stdenv;
+ pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
+ pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
+ pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
});
rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
cargo = self.callPackage ./cargo.nix {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
index dab1f2a6bd..570cd8b796 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,7 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
, fetchurl, file, python3
-, llvm_10, darwin, cmake, rust, rustPlatform
+, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl
, which, libffi
, withBundledLLVM ? false
@@ -11,15 +12,8 @@
}:
let
- inherit (stdenv.lib) optionals optional optionalString;
+ inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
-
- llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
- llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; };
- llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; };
-
- # For use at runtime
- llvmShared = llvm_10.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
inherit version;
@@ -72,7 +66,14 @@ in stdenv.mkDerivation rec {
"--enable-vendor"
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
"--host=${rust.toRustTargetSpec stdenv.hostPlatform}"
- "--target=${rust.toRustTargetSpec stdenv.targetPlatform}"
+ # std is built for all platforms in --target. When building a cross-compiler
+ # we need to add the host platform as well so rustc can compile build.rs
+ # scripts.
+ "--target=${concatStringsSep "," ([
+ (rust.toRustTargetSpec stdenv.targetPlatform)
+ ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform) [
+ (rust.toRustTargetSpec stdenv.hostPlatform)
+ ])}"
"${setBuild}.cc=${ccForBuild}"
"${setHost}.cc=${ccForHost}"
@@ -147,6 +148,11 @@ in stdenv.mkDerivation rec {
python x.py dist rustc-dev
tar xf build/dist/rustc-dev*tar.gz
cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/
+ rm $out/lib/rustlib/install.log
+ for m in $out/lib/rustlib/manifest-rust*
+ do
+ sort --output=$m < $m
+ done
'' + ''
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix
index aaed6d8892..1a5cba37d4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
llvmPackages.stdenv.mkDerivation rec {
- version = "0.6.0";
+ version = "0.7.1";
pname = "zig";
src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
- sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z";
+ sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md";
};
nativeBuildInputs = [ cmake ];
@@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
- ./zig test $src/test/stage1/behavior.zig
+ ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig
runHook postCheck
'';
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
index 7246382c9a..f0434c4ae4 100644
--- a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix
@@ -29,6 +29,10 @@ let params = {
rev = "V8.12.0";
sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";
};
+ "8.13" = {
+ rev = "V8.13.0";
+ sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";
+ };
};
param = params.${coq.coq-version};
in
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
index 8cf502a194..542fac861c 100644
--- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
@@ -66,6 +66,7 @@ let
#######################################################################
# sha256 of released mathcomp versions
sha256 = {
+ "1.12.0" = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";
"1.11.0" = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";
"1.11+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm";
"1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
@@ -76,6 +77,7 @@ let
};
# versions of coq compatible with released mathcomp versions
coq-versions = {
+ "1.12.0" = flip elem [ "8.13" ];
"1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
"1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
"1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
@@ -96,7 +98,7 @@ let
# mathcomp preferred versions by decreasing order
# (the first version in the list will be tried first)
version-preferences =
- [ "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ];
+ [ "1.12.0" "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ];
# list of core mathcomp packages sorted by dependency order
packages = _version: # unused in current versions of mathcomp
diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
index 3714a1f6f0..58716d3717 100644
--- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
@@ -36,6 +36,9 @@
, meta ? {}
+# Not needed with buildGoModule
+, goPackagePath ? null
+
, ... }@args':
with builtins;
@@ -242,5 +245,7 @@ let
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
+else if (goPackagePath != null) then
+ throw "`goPackagePath` not needed with `buildGoModule`"
else
package
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index aa8212f167..30a9420b2b 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -176,9 +176,6 @@ self: super: {
# https://github.com/jputcu/serialport/issues/25
serialport = dontCheck super.serialport;
- # Test suite build depends on ancient tasty 0.11.x.
- cryptohash-sha512 = dontCheck super.cryptohash-sha512;
-
# Test suite depends on source code being available
simple-affine-space = dontCheck super.simple-affine-space;
@@ -815,6 +812,12 @@ self: super: {
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;
+ # Depends on base <4.12
+ # See https://github.com/haskell-hvr/cryptohash-sha512/pull/3
+ # , https://github.com/haskell-hvr/cryptohash-sha512/issues/4
+ # and https://github.com/haskell-hvr/cryptohash-sha512/pull/5
+ cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
+
# Depends on tasty < 1.x, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
@@ -859,6 +862,10 @@ self: super: {
snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+ # hledger-lib requires the latest version of pretty-simple
+ hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; };
+ pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; });
+
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@@ -889,6 +896,7 @@ self: super: {
'';
});
hledger-web = overrideCabal super.hledger-web (drv: {
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
for i in $(seq 1 9); do
for j in *.$i; do
@@ -948,6 +956,8 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
+ niv = generateOptparseApplicativeCompletion "niv" super.niv;
+ ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
# musl fixes
@@ -1397,24 +1407,17 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
+ fourmolu = self.fourmolu_0_3_0_0;
});
fourmolu = dontCheck super.fourmolu;
- ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
- # 2020-11-13: Bumping bounds via an already upstream merged change
- # https://github.com/haskell/ghcide/pull/905
- url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
- sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
- includes = [ "ghcide.cabal" ];
- }));
+ # 1. test requires internet
+ # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
+ ghcide = doDistribute (unmarkBroken (dontCheck
+ (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
+ ));
refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print;
- # the hls brittany is objectively better, because there hasn‘t been a
- # brittany release in a while and this version works with 8.10.
- # And we need to build it anyways.
- # 2020-11-15: jailbreaking because we have strict 0.4 which is to new
- brittany = self.hls-brittany;
- hls-brittany = dontCheck (doJailbreak super.hls-brittany);
# 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
aeson = dontCheck super.aeson;
@@ -1495,13 +1498,13 @@ self: super: {
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
- cachix = appendPatch super.cachix (pkgs.fetchpatch {
+ cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
- });
+ }));
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text;
@@ -1512,7 +1515,6 @@ self: super: {
# 2020-11-23: https://github.com/cdornan/fmt/issues/30
fmt = dontCheck super.fmt;
-
# 2020-11-27: Tests broken
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
@@ -1520,4 +1522,23 @@ self: super: {
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+ # 2020-12-05: http-client is fixed on too old version
+ essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
+ http-client = self.http-client_0_7_3;
+ };
+
+ # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
+ pandoc-include-code = doJailbreak super.pandoc-include-code;
+
+ # https://github.com/jgm/pandoc/issues/6961
+ pandoc = dontCheck super.pandoc;
+
+ # Update pandoc dependencies to fix the build.
+ doctemplates = self.doctemplates_0_9;
+ skylighting = self.skylighting_0_10_2;
+ skylighting-core = self.skylighting-core_0_10_2;
+
+ # https://github.com/yesodweb/yesod/issues/1714
+ yesod-core = dontCheck super.yesod-core;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e4ee9c1cb3..9ffe8dff34 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
- # Stackage Nightly 2020-12-04
+ # Stackage Nightly 2020-12-14
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -292,7 +292,7 @@ default-package-overrides:
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.11
- - base-orphans ==0.8.3
+ - base-orphans ==0.8.4
- base-prelude ==1.4
- base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
@@ -332,6 +332,7 @@ default-package-overrides:
- bitset-word8 ==0.1.1.2
- bits-extra ==0.0.2.0
- bitvec ==1.0.3.0
+ - bitwise-enum ==1.0.0.2
- blake2 ==0.3.0
- blanks ==0.5.0
- blas-carray ==0.1.0.1
@@ -367,6 +368,7 @@ default-package-overrides:
- btrfs ==0.2.0.0
- buffer-builder ==0.2.4.7
- buffer-pipe ==0.0
+ - bugsnag-haskell ==0.0.4.1
- bugsnag-hs ==0.2.0.3
- bugzilla-redhat ==0.3.0
- burrito ==1.2.0.0
@@ -391,7 +393,7 @@ default-package-overrides:
- bzlib ==0.5.1.0
- bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1
- - c2hs ==0.28.6
+ - c2hs ==0.28.7
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
@@ -440,7 +442,7 @@ default-package-overrides:
- checkers ==0.5.6
- checksum ==0.0
- chimera ==0.3.1.0
- - chiphunk ==0.1.2.1
+ - chiphunk ==0.1.4.0
- choice ==0.2.2
- chronologique ==0.3.1.3
- chronos ==1.1.1
@@ -462,6 +464,7 @@ default-package-overrides:
- Clipboard ==2.3.2.0
- clock ==0.8
- clock-extras ==0.1.0.2
+ - closed ==0.2.0.1
- clumpiness ==0.17.0.2
- ClustalParser ==1.3.0
- cmark ==0.6
@@ -649,11 +652,11 @@ default-package-overrides:
- deriving-aeson ==0.2.6
- deriving-compat ==0.5.10
- derulo ==1.0.9
- - dhall ==1.36.0
- - dhall-bash ==1.0.34
- - dhall-json ==1.7.3
- - dhall-lsp-server ==1.0.11
- - dhall-yaml ==1.2.3
+ - dhall ==1.37.0
+ - dhall-bash ==1.0.35
+ - dhall-json ==1.7.4
+ - dhall-lsp-server ==1.0.12
+ - dhall-yaml ==1.2.4
- diagrams-solve ==0.1.2
- dialogflow-fulfillment ==0.1.1.3
- di-core ==1.0.4
@@ -743,6 +746,7 @@ default-package-overrides:
- enumset ==0.0.5
- enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0
+ - envparse ==0.4.1
- envy ==2.1.0.0
- epub-metadata ==4.5
- eq ==4.2.1
@@ -750,6 +754,8 @@ default-package-overrides:
- equational-reasoning ==0.6.0.3
- equivalence ==0.3.5
- erf ==2.0.0.0
+ - error-or ==0.1.1.0
+ - error-or-utils ==0.1.1
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.8
@@ -835,7 +841,7 @@ default-package-overrides:
- fmlist ==0.9.4
- fmt ==0.6.1.2
- fn ==0.3.0.2
- - focus ==1.0.1.4
+ - focus ==1.0.2
- focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
@@ -990,7 +996,7 @@ default-package-overrides:
- gravatar ==0.8.0
- groom ==0.1.2.1
- group-by-date ==0.1.0.3
- - groups ==0.5
+ - groups ==0.5.2
- gtk-sni-tray ==0.1.6.0
- gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1
@@ -1098,7 +1104,7 @@ default-package-overrides:
- hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.9
- - hpack ==0.34.2
+ - hpack ==0.34.3
- hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.0
- hpc-lcov ==1.0.1
@@ -1166,7 +1172,7 @@ default-package-overrides:
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.1
- - http-conduit ==2.3.7.3
+ - http-conduit ==2.3.7.4
- http-date ==0.0.10
- http-directory ==0.1.8
- http-download ==0.2.0.0
@@ -1239,6 +1245,7 @@ default-package-overrides:
- Imlib ==0.1.2
- immortal ==0.3
- immortal-queue ==0.1.0.1
+ - inbox ==0.1.0
- include-file ==0.1.0.4
- incremental-parser ==0.5
- indents ==0.5.0.1
@@ -1444,7 +1451,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- - massiv ==0.5.7.0
+ - massiv ==0.5.8.0
- massiv-io ==0.4.0.0
- massiv-test ==0.1.5
- mathexpr ==0.3.0.0
@@ -1510,6 +1517,7 @@ default-package-overrides:
- mmorph ==1.1.3
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
+ - mock-time ==0.1.0
- mod ==0.1.2.0
- model ==0.5
- modern-uri ==0.3.3.0
@@ -1524,10 +1532,10 @@ default-package-overrides:
- monadlist ==0.0.2
- monad-logger ==0.3.36
- monad-logger-json ==0.1.0.0
- - monad-logger-prefix ==0.1.11
+ - monad-logger-prefix ==0.1.12
- monad-loops ==0.4.3
- monad-memo ==0.5.3
- - monad-metrics ==0.2.1.4
+ - monad-metrics ==0.2.2.0
- monad-par ==0.3.5
- monad-parallel ==0.7.2.3
- monad-par-extras ==0.3.3
@@ -1657,7 +1665,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- OpenAL ==1.7.0.5
- - openapi3 ==3.0.0.1
+ - openapi3 ==3.0.1.0
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
@@ -1707,7 +1715,7 @@ default-package-overrides:
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.8
- - password ==2.0.1.1
+ - password ==2.1.0.0
- password-instances ==2.0.0.1
- path ==0.7.0
- path-binary-instance ==0.1.0.1
@@ -1736,6 +1744,7 @@ default-package-overrides:
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.10.5.3
- persistent-documentation ==0.1.0.2
+ - persistent-mtl ==0.2.0.0
- persistent-mysql ==2.10.2.3
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.10.1.2
@@ -1748,6 +1757,7 @@ default-package-overrides:
- pg-transact ==0.3.1.1
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
+ - pinboard ==0.10.2.0
- pipes ==4.3.14
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
@@ -1954,7 +1964,7 @@ default-package-overrides:
- relude ==0.7.0.0
- renderable ==0.2.0.1
- replace-attoparsec ==1.4.2.0
- - replace-megaparsec ==1.4.3.0
+ - replace-megaparsec ==1.4.4.0
- repline ==0.4.0.0
- req ==3.8.0
- req-conduit ==1.0.0
@@ -2067,7 +2077,7 @@ default-package-overrides:
- servant-swagger ==1.1.10
- servant-swagger-ui ==0.3.4.3.37.2
- servant-swagger-ui-core ==0.3.4
- - serverless-haskell ==0.12.4
+ - serverless-haskell ==0.12.5
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0
@@ -2195,7 +2205,7 @@ default-package-overrides:
- streaming-bytestring ==0.2.0
- streaming-commons ==0.2.2.1
- streams ==3.3
- - strict ==0.4
+ - strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.5
- strict-tuple ==0.1.4
@@ -2239,6 +2249,7 @@ default-package-overrides:
- system-filepath ==0.4.14
- system-info ==0.5.1
- tabular ==0.2.2.8
+ - taffybar ==3.2.3
- tagchup ==0.4.1.1
- tagged ==0.8.6
- tagged-binary ==0.2.0.1
@@ -2314,7 +2325,7 @@ default-package-overrides:
- text-zipper ==0.10.1
- tfp ==1.0.1.1
- tf-random ==0.5
- - th-abstraction ==0.4.0.0
+ - th-abstraction ==0.4.1.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1
- th-constraint-compat ==0.0.1.0
@@ -2348,7 +2359,7 @@ default-package-overrides:
- thyme ==0.3.5.5
- tidal ==1.6.1
- tile ==0.3.0.0
- - time-compat ==1.9.4
+ - time-compat ==1.9.5
- timeit ==2.0
- timelens ==0.2.0.2
- time-lens ==0.4.0.2
@@ -2459,7 +2470,7 @@ default-package-overrides:
- unordered-containers ==0.2.13.0
- unsafe ==0.0
- urbit-hob ==0.3.3
- - uri-bytestring ==0.3.2.2
+ - uri-bytestring ==0.3.3.0
- uri-bytestring-aeson ==0.1.0.8
- uri-encode ==1.5.0.7
- url ==2.1.3
@@ -2489,7 +2500,7 @@ default-package-overrides:
- vault ==0.3.1.4
- vec ==0.3
- vector ==0.12.1.2
- - vector-algorithms ==0.8.0.3
+ - vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
@@ -2497,7 +2508,7 @@ default-package-overrides:
- vector-instances ==3.4
- vector-mmap ==0.0.3
- vector-rotcev ==0.1.0.0
- - vector-sized ==1.4.2
+ - vector-sized ==1.4.3
- vector-space ==0.16
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.7
@@ -2516,7 +2527,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0
- - wai-extra ==3.1.3
+ - wai-extra ==3.1.4.1
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
@@ -2543,7 +2554,7 @@ default-package-overrides:
- webex-teams-pipes ==0.2.0.1
- webgear-server ==0.2.0
- webrtc-vad ==0.1.0.3
- - websockets ==0.12.7.1
+ - websockets ==0.12.7.2
- websockets-snap ==0.10.3.1
- weigh ==0.0.16
- wide-word ==0.1.1.1
@@ -2551,7 +2562,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- - witch ==0.0.0.3
+ - witch ==0.0.0.4
- witherable-class ==0
- within ==0.2.0.1
- with-location ==0.1.0
@@ -2616,6 +2627,8 @@ default-package-overrides:
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
+ - yesod-page-cursor ==2.0.0.0
+ - yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
@@ -3392,6 +3405,7 @@ broken-packages:
- bbi
- BCMtools
- bcp47
+ - bcp47-orphans
- bdcs
- bdcs-api
- bdd
@@ -3642,9 +3656,7 @@ broken-packages:
- broker-haskell
- bronyradiogermany-common
- bronyradiogermany-streaming
- - brotli
- brotli-conduit
- - brotli-streams
- browscap
- bsd-sysctl
- bson
@@ -4223,6 +4235,7 @@ broken-packages:
- cookies
- coordinate
- copilot
+ - copilot-c99
- copilot-cbmc
- copilot-language
- copilot-libraries
@@ -4312,7 +4325,6 @@ broken-packages:
- cryptocipher
- cryptocompare
- cryptoconditions
- - cryptohash-sha512
- cryptoids
- cryptoids-class
- cryptoids-types
@@ -4927,7 +4939,6 @@ broken-packages:
- EsounD
- espial
- ess
- - essence-of-live-coding-warp
- estimators
- EstProgress
- estreps
@@ -6390,7 +6401,6 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- - hls-brittany
- hlwm
- hly
- hmark
@@ -6440,7 +6450,6 @@ broken-packages:
- hogre
- hogre-examples
- hois
- - hoist-error
- hol
- hold-em
- hole
@@ -8504,12 +8513,10 @@ broken-packages:
- pam
- pan-os-syslog
- panda
- - pandoc-crossref
- pandoc-csv2table
- pandoc-filter-graphviz
- pandoc-filter-indent
- pandoc-include
- - pandoc-include-code
- pandoc-japanese-filters
- pandoc-lens
- pandoc-markdown-ghci-filter
@@ -8859,6 +8866,7 @@ broken-packages:
- postgresql-syntax
- postgresql-tx-query
- postgresql-tx-squeal
+ - postgresql-tx-squeal-compat-simple
- postgresql-typed-lifted
- postgrest
- postgrest-ws
@@ -10447,6 +10455,7 @@ broken-packages:
- tds
- TeaHS
- teams
+ - techlab
- teeth
- telegram
- telegram-api
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index 85711a041b..678be15b86 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17579,6 +17579,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "SJW" = callPackage
+ ({ mkDerivation, attoparsec, base, Cabal, containers, directory
+ , filepath, mtl, optparse-applicative, random, text, time, unix
+ }:
+ mkDerivation {
+ pname = "SJW";
+ version = "0.1.2.2";
+ sha256 = "0ffwlsm8ynmi1nyx1a8j65p9llk7s68g3srkgk1i47rvddn70h6q";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base containers directory filepath mtl random text time
+ unix
+ ];
+ executableHaskellDepends = [
+ attoparsec base optparse-applicative text
+ ];
+ testHaskellDepends = [ base Cabal directory filepath random ];
+ benchmarkHaskellDepends = [ base directory filepath random time ];
+ description = "The Simple Javascript Wrench";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"SMTPClient" = callPackage
({ mkDerivation, base, containers, extensible-exceptions, hsemail
, network, old-locale, old-time
@@ -18891,10 +18914,8 @@ self: {
}:
mkDerivation {
pname = "Spock";
- version = "0.13.0.0";
- sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa";
- revision = "1";
- editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn";
+ version = "0.14.0.0";
+ sha256 = "19zqang5ixnfhqrdy70myqn8p1ijd24qfhnmj4w1f9hdr38kmz11";
libraryHaskellDepends = [
base base64-bytestring bytestring containers cryptonite focus
hashable http-types hvect list-t monad-control mtl reroute
@@ -18915,8 +18936,8 @@ self: {
({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
mkDerivation {
pname = "Spock-api";
- version = "0.12.0.1";
- sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960";
+ version = "0.14.0.0";
+ sha256 = "1wqbq8vgq5sifybw32prkmcjwm2dqz4z3sv8ci4s603a2sril7h7";
libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
@@ -18928,8 +18949,8 @@ self: {
}:
mkDerivation {
pname = "Spock-api-ghcjs";
- version = "0.12.0.1";
- sha256 = "1n03ax4iwz58b4myh8jwkixiclpiyvx55h247248xfh6a0xr96l0";
+ version = "0.14.0.0";
+ sha256 = "1ks2a8z2zav84qi9fkpp7pdl6bjbpn9j8h8mcfg5xb2h0p8000fc";
libraryHaskellDepends = [
aeson base bytestring ghcjs-base hvect Spock-api text
];
@@ -18943,8 +18964,8 @@ self: {
({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
mkDerivation {
pname = "Spock-api-server";
- version = "0.12.0.1";
- sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08";
+ version = "0.14.0.0";
+ sha256 = "0ra8y036vilsb75jb0lsfbdraygz6jm7b5l9002n7ixypbp2adya";
libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
@@ -18965,21 +18986,21 @@ self: {
"Spock-core" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
- , case-insensitive, containers, cookie, directory, hashable, hspec
- , hspec-wai, http-api-data, http-types, hvect, monad-control, mtl
+ , case-insensitive, containers, cookie, hashable, hspec, hspec-wai
+ , http-api-data, http-types, hvect, mmorph, monad-control, mtl
, old-locale, reroute, resourcet, stm, superbuffer, text, time
, transformers, transformers-base, unordered-containers, vault, wai
, wai-extra, warp
}:
mkDerivation {
pname = "Spock-core";
- version = "0.13.0.0";
- sha256 = "0qjiv0jqs3bsgx6mpflsykr2rpvw5cch5v7r6z5306ccli1bvjjy";
+ version = "0.14.0.0";
+ sha256 = "0bcxngy33wap9py3y4f6kjysl31yjz3qmkp6z5z6pka80x9w3sf7";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring case-insensitive containers
- cookie directory hashable http-api-data http-types hvect
- monad-control mtl old-locale reroute resourcet stm superbuffer text
- time transformers transformers-base unordered-containers vault wai
+ cookie hashable http-api-data http-types hvect mmorph monad-control
+ mtl old-locale reroute resourcet stm superbuffer text time
+ transformers transformers-base unordered-containers vault wai
wai-extra warp
];
testHaskellDepends = [
@@ -21808,25 +21829,26 @@ self: {
}) {inherit (pkgs) readline;};
"Z-Data" = callPackage
- ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim
+ ({ mkDerivation, base, Cabal, case-insensitive, deepseq, ghc-prim
, hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive
, QuickCheck, quickcheck-instances, scientific, tagged
, template-haskell, unordered-containers, word8
}:
mkDerivation {
pname = "Z-Data";
- version = "0.1.9.1";
- sha256 = "0fwbgcsfay83lp24m9afdvn43xlzxi3y74fsxxw2xbfaz6zmxivi";
+ version = "0.2.0.0";
+ sha256 = "1bxnbbcm3vwsklhhyf10z6i91mpymxh9rw2r64hmfy6yay2b2p0d";
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base case-insensitive deepseq ghc-prim hashable integer-gmp
primitive QuickCheck scientific tagged template-haskell
unordered-containers
];
- libraryToolDepends = [ hspec-discover ];
testHaskellDepends = [
base hashable hspec HUnit integer-gmp primitive QuickCheck
quickcheck-instances scientific word8
];
+ testToolDepends = [ hspec-discover ];
description = "Array, vector and text";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -21841,8 +21863,8 @@ self: {
}:
mkDerivation {
pname = "Z-IO";
- version = "0.1.9.0";
- sha256 = "1f9774065arknwm8f1avq7v769cfa610dy45winva3ys4345xcyy";
+ version = "0.2.0.0";
+ sha256 = "1d3z9869xawzp1wxkz0vm5fkc3071cv5sz6bmr8fdwyw8cd0r7dy";
libraryHaskellDepends = [
base containers exceptions primitive stm time unix-time
unordered-containers Z-Data
@@ -24062,8 +24084,8 @@ self: {
}:
mkDerivation {
pname = "advent-of-code-api";
- version = "0.2.7.1";
- sha256 = "1amm7gvr04ndfw6b0jxy8wsa35lqbfb85wp9bn9kycd8qp6vq9cs";
+ version = "0.2.8.0";
+ sha256 = "1g1wybpir0053pjav8czccnva38jr35gnii1as0lbyinc1k7vlhq";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath
finite-typelits http-api-data http-client http-client-tls
@@ -24084,8 +24106,8 @@ self: {
}:
mkDerivation {
pname = "advent-of-code-ocr";
- version = "0.1.1.0";
- sha256 = "0kzmm901yz262dblwv1wxf86h1jm8m2x1ky1gqvj03lck598fqz7";
+ version = "0.1.2.0";
+ sha256 = "0ppa386cbcdwx2k12ya19fsjlrgqgljdryv4mb3a0lrk44804k5c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -24591,6 +24613,8 @@ self: {
pname = "aeson-injector";
version = "1.1.5.0";
sha256 = "0hg853hhbvmqa6yj0xg8naxdrbs2n3lzld0jrbmfmccjqcfzarx4";
+ revision = "1";
+ editedCabalFile = "0l1628z78sxi1wjh1x3hymaid2f7g4r4sbs28phg127fzwn4i7ma";
libraryHaskellDepends = [
aeson base bifunctors deepseq hashable lens servant-docs swagger2
text unordered-containers
@@ -25868,6 +25892,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "alex_3_2_6" = callPackage
+ ({ mkDerivation, array, base, containers, directory, happy, process
+ }:
+ mkDerivation {
+ pname = "alex";
+ version = "3.2.6";
+ sha256 = "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [ array base containers directory ];
+ executableToolDepends = [ happy ];
+ testHaskellDepends = [ base process ];
+ description = "Alex is a tool for generating lexical analysers in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alex-meta" = callPackage
({ mkDerivation, alex, array, base, containers, happy
, haskell-src-meta, QuickCheck, template-haskell
@@ -29404,6 +29446,28 @@ self: {
license = "GPL";
}) {};
+ "anagrep" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, ghc-prim, hspec, integer-gmp, QuickCheck
+ , regex-tdfa, vector
+ }:
+ mkDerivation {
+ pname = "anagrep";
+ version = "0.1.0.0";
+ sha256 = "1pqp3q8pr2j0v1ra83glfbbclq6yd6vns0q9q8i9r4kd7lrd2vrm";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base case-insensitive containers deepseq ghc-prim integer-gmp
+ regex-tdfa vector
+ ];
+ executableHaskellDepends = [ base bytestring case-insensitive ];
+ testHaskellDepends = [ base case-insensitive hspec QuickCheck ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "Find strings with permutations (anagrams) that match a regular expression";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"analyze" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cassava
, exceptions, foldl, free, hashable, lucid, QuickCheck, tasty
@@ -32345,8 +32409,8 @@ self: {
}:
mkDerivation {
pname = "arion-compose";
- version = "0.1.1.1";
- sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph";
+ version = "0.1.2.0";
+ sha256 = "1vginzc90xl8fs1pr9qvw7fjj207vjb1k3rxa341hq7q5pri2y3d";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -33633,8 +33697,8 @@ self: {
pname = "ast-monad";
version = "0.1.0.0";
sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
- revision = "4";
- editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23";
+ revision = "5";
+ editedCabalFile = "1llhzaacz47f1cmjr3q4zsq5i0fi8q0vbqxgsb8vqfrnvddx0bz6";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A library for constructing AST by using do-notation";
@@ -33649,8 +33713,8 @@ self: {
pname = "ast-monad-json";
version = "0.1.0.1";
sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6";
- revision = "2";
- editedCabalFile = "0cbayikyr96vcn10253gkwgk0mvx6inymrldv0bhzp8qiv94sm3n";
+ revision = "3";
+ editedCabalFile = "01gvbidiiy20vdxgdbv3938zgvmwx8gz3nc54cgq57b36h2dl0ik";
libraryHaskellDepends = [ ast-monad base text ];
testHaskellDepends = [ ast-monad base hspec text ];
description = "A library for writing JSON";
@@ -37369,12 +37433,12 @@ self: {
broken = true;
}) {};
- "base_4_14_0_0" = callPackage
+ "base_4_14_1_0" = callPackage
({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
mkDerivation {
pname = "base";
- version = "4.14.0.0";
- sha256 = "108bg791pplf1mlc6x95jza6hq28yc5s8a8vv8fxvn33vwm058an";
+ version = "4.14.1.0";
+ sha256 = "15n0ya681yvfvccswcxxk855qv7wz886rmnabj0y6ah7mbf8aijs";
libraryHaskellDepends = [
ghc-prim invalid-cabal-flag-settings rts
];
@@ -37498,8 +37562,8 @@ self: {
}:
mkDerivation {
pname = "base-orphans";
- version = "0.8.3";
- sha256 = "1d9yrxrl270wjpq9iwy1a1faicc650njpr3d3ffn76kqgnn33alv";
+ version = "0.8.4";
+ sha256 = "1cxvjcyy0vsg21n85gxal03gfprw75vjd1h9sni00d60as9vbcip";
libraryHaskellDepends = [ base ghc-prim ];
testHaskellDepends = [ base hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
@@ -38427,8 +38491,8 @@ self: {
}:
mkDerivation {
pname = "bcp47";
- version = "0.1.0.0";
- sha256 = "1cy2wdp97mvyg1fvkmi6vzd8vd9v8645nd5cfzgp4whhy0v5y7rj";
+ version = "0.2.0.0";
+ sha256 = "0dbbpxjhsm17xhqp2a4vvwb0rq3v33wmb84rqdcjr6j8d54wnq5f";
libraryHaskellDepends = [
aeson base containers country generic-arbitrary iso639 megaparsec
QuickCheck text
@@ -38442,6 +38506,27 @@ self: {
broken = true;
}) {};
+ "bcp47-orphans" = callPackage
+ ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable
+ , hspec, http-api-data, path-pieces, persistent, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "bcp47-orphans";
+ version = "0.1.0.1";
+ sha256 = "0phw6hsrhya93w7zlrl7866zgpa62pscicjdb5lllpdqfcwl4jl2";
+ libraryHaskellDepends = [
+ base bcp47 cassava errors esqueleto hashable http-api-data
+ path-pieces persistent text
+ ];
+ testHaskellDepends = [
+ base bcp47 cassava hspec path-pieces persistent QuickCheck
+ ];
+ description = "BCP47 orphan instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"bcrypt" = callPackage
({ mkDerivation, base, bytestring, data-default, entropy, memory }:
mkDerivation {
@@ -38618,8 +38703,8 @@ self: {
}:
mkDerivation {
pname = "beam-automigrate";
- version = "0.1.1.0";
- sha256 = "14h8zbxyrkhajjbhjmdib9s99xv0bmar4s6gb4mpqkvhakj7a76n";
+ version = "0.1.2.0";
+ sha256 = "1y7i553zwm46k39k72l400rh2g8k6k2crjj2wdmkn9nndv1x7545";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -40873,6 +40958,17 @@ self: {
broken = true;
}) {g15 = null;};
+ "bindings-libpci" = callPackage
+ ({ mkDerivation, base, bindings-DSL }:
+ mkDerivation {
+ pname = "bindings-libpci";
+ version = "0.4.0.0";
+ sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq";
+ libraryHaskellDepends = [ base bindings-DSL ];
+ description = "Low level bindings to libpci";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bindings-librrd" = callPackage
({ mkDerivation, base, bindings-DSL, librrd }:
mkDerivation {
@@ -42591,8 +42687,8 @@ self: {
}:
mkDerivation {
pname = "bitwise-enum";
- version = "1.0.0.1";
- sha256 = "0y7x2yyvbdvwg5g5rrl9dbh2syvl1y74pwlccq2w2v5rhr8ql2cb";
+ version = "1.0.0.2";
+ sha256 = "1y63qpxkh8k019vj2b1qz1jnssld5lik5cjhf6dzj2bal4013lii";
libraryHaskellDepends = [
aeson array base deepseq mono-traversable vector
];
@@ -43322,6 +43418,21 @@ self: {
broken = true;
}) {};
+ "blindpass" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "blindpass";
+ version = "0.1.0";
+ sha256 = "0pi0k02xq25n9mjphyq357mna0d5jn67xhzjyafaa4q09g4vy1ay";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "Password entry tool";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"blink1" = callPackage
({ mkDerivation, base, bytestring, text, unix, usb, vector }:
mkDerivation {
@@ -45247,8 +45358,8 @@ self: {
}:
mkDerivation {
pname = "brittany";
- version = "0.12.2.0";
- sha256 = "03v7lhy6i7fk3sskimzb3hs9qi1g9b9w7zfvmc9m4606673ysdzl";
+ version = "0.13.1.0";
+ sha256 = "0dw4s4lcb34fkv4i0rylna6zrr55rgkqs1s75lhn8zskwl7j89bs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45447,9 +45558,8 @@ self: {
}) {};
"brotli" = callPackage
- ({ mkDerivation, base, bytestring, HUnit, libbrotlidec
- , libbrotlienc, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
- , transformers
+ ({ mkDerivation, base, brotli, bytestring, HUnit, QuickCheck, tasty
+ , tasty-hunit, tasty-quickcheck, transformers
}:
mkDerivation {
pname = "brotli";
@@ -45458,15 +45568,13 @@ self: {
revision = "2";
editedCabalFile = "0iny0gbb5b3a8n8rpriz7620fnhw70c0pgl615s4b1rhrnj87wrb";
libraryHaskellDepends = [ base bytestring transformers ];
- libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ];
+ libraryPkgconfigDepends = [ brotli ];
testHaskellDepends = [
base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
];
description = "Brotli (RFC7932) compression and decompression";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {libbrotlidec = null; libbrotlienc = null;};
+ }) {inherit (pkgs) brotli;};
"brotli-conduit" = callPackage
({ mkDerivation, base, brotli, bytestring, conduit, HUnit
@@ -45508,8 +45616,6 @@ self: {
];
description = "IO-Streams interface for Brotli (RFC7932) compression";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"browscap" = callPackage
@@ -45948,8 +46054,8 @@ self: {
}:
mkDerivation {
pname = "bugsnag-haskell";
- version = "0.0.4.0";
- sha256 = "1vmbyyya221f6nkk6j1wxscwcxmh10f0hwsy9ib460d59vf607ym";
+ version = "0.0.4.1";
+ sha256 = "0msr61bh2h9ncbar4kwsdpncvaasy3qa3n3vjgqvnsymvs257vaf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -47340,8 +47446,8 @@ self: {
({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }:
mkDerivation {
pname = "byteunits";
- version = "0.4.0.2";
- sha256 = "1mdkpmqwszllz2yyhssic02k5g7m8hwnd5wghi4vf970g6m6skpp";
+ version = "0.4.0.3";
+ sha256 = "1p28wax0i49c1zka7ijirr75a4y2hg7fpvm7hvvwn7y3npxddd18";
libraryHaskellDepends = [ base safe ];
testHaskellDepends = [ base Cabal HUnit QuickCheck ];
description = "Human friendly conversion between byte units (KB, MB, GB...)";
@@ -47579,8 +47685,8 @@ self: {
}:
mkDerivation {
pname = "c2hs";
- version = "0.28.6";
- sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci";
+ version = "0.28.7";
+ sha256 = "0ib7ayfn37krsnm710x4gxd2i88xv3djnqa737gbw93b0206l571";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -48226,8 +48332,8 @@ self: {
];
doCheck = false;
postInstall = ''
- mkdir $out/etc
- mv bash-completion $out/etc/bash_completion.d
+ mkdir -p $out/share/bash-completion
+ mv bash-completion $out/share/bash-completion/completions
'';
description = "The command-line interface for Cabal and Hackage";
license = stdenv.lib.licenses.bsd3;
@@ -49473,8 +49579,8 @@ self: {
}:
mkDerivation {
pname = "calamity";
- version = "0.1.22.1";
- sha256 = "0mwpggxkag3l4ql75yhp5a0mpmwah44a9rqpsln0ds405jydjw92";
+ version = "0.1.23.1";
+ sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5";
libraryHaskellDepends = [
aeson async base bytestring colour concurrent-extra containers
data-default-class data-flags deepseq deque df1 di-core di-polysemy
@@ -49636,8 +49742,8 @@ self: {
}:
mkDerivation {
pname = "call-alloy";
- version = "0.2.1.0";
- sha256 = "0k75fcrn2r4yk59i8r7qwirg0b9vwga9gmibmj4lznqg44yy2bhi";
+ version = "0.2.1.1";
+ sha256 = "0vgn4rrpnhmjcn7wh01nr4q0mlmr4ja2dd1b9vysxfrmslfxnxda";
libraryHaskellDepends = [
base bytestring containers directory file-embed filepath hashable
lens mtl process split trifecta unix
@@ -50083,34 +50189,34 @@ self: {
, deepseq, directory, exceptions, filepath, focus, hashable
, heredoc, hspec, list-t, monad-stm, mtl, network, network-simple
, pretty-show, primitive, process, process-extras, QuickCheck
- , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet
- , safe-exceptions, stm, stm-containers, supervisors, text
+ , quickcheck-instances, quickcheck-io, resourcet, safe-exceptions
+ , stm, stm-containers, supervisors, template-haskell, text
, transformers, vector, wl-pprint-text
}:
mkDerivation {
pname = "capnp";
- version = "0.8.0.0";
- sha256 = "0jqq1yal41rnc8z66b24kiycyxdzwpqykx1p8v1rc3qbn4i3n255";
+ version = "0.9.0.0";
+ sha256 = "0sgbl9rfvw73bb29kxp6q4ba0fxzx3a0kgpkiqhyvvvbr3ycdbqb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async base bytes bytestring containers cpu data-default
data-default-instances-vector exceptions focus hashable list-t
monad-stm mtl network network-simple pretty-show primitive
- reinterpret-cast safe-exceptions stm stm-containers supervisors
+ safe-exceptions stm stm-containers supervisors template-haskell
text transformers vector
];
executableHaskellDepends = [
base bifunctors bytes bytestring containers data-default directory
- exceptions filepath monad-stm mtl primitive reinterpret-cast
- safe-exceptions text transformers vector wl-pprint-text
+ exceptions filepath monad-stm mtl primitive safe-exceptions text
+ transformers vector wl-pprint-text
];
testHaskellDepends = [
async base bytes bytestring containers data-default deepseq
directory exceptions heredoc hspec monad-stm mtl network
network-simple pretty-show primitive process process-extras
- QuickCheck quickcheck-instances quickcheck-io reinterpret-cast
- resourcet safe-exceptions stm supervisors text transformers vector
+ QuickCheck quickcheck-instances quickcheck-io resourcet
+ safe-exceptions stm supervisors text transformers vector
];
description = "Cap'n Proto for Haskell";
license = stdenv.lib.licenses.mit;
@@ -52726,6 +52832,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "chassis" = callPackage
+ ({ mkDerivation, base, bytestring, comonad, composite-base
+ , containers, contravariant, distributive, either, exceptions
+ , extra, first-class-families, path, profunctors, rio, text, time
+ , vinyl
+ }:
+ mkDerivation {
+ pname = "chassis";
+ version = "0.0.4.0";
+ sha256 = "1mvi7h6pp1j3x4yccqy962f8d3gbm4sj5fvnfwxygnxqqhmy1dvk";
+ libraryHaskellDepends = [
+ base bytestring comonad composite-base containers contravariant
+ distributive either exceptions extra first-class-families path
+ profunctors rio text time vinyl
+ ];
+ description = "Prelude with algebraic constructs and polykinds on";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"chatter" = callPackage
({ mkDerivation, array, base, bytestring, cereal, cereal-text
, containers, deepseq, directory, filepath, fullstop, hashable
@@ -53064,6 +53189,33 @@ self: {
broken = true;
}) {};
+ "cherry-core-alpha" = callPackage
+ ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
+ , case-insensitive, cherry-core, containers, ghc-prim, hspec
+ , hspec-discover, http-client, http-client-tls, http-types, mtl
+ , network, safe-exceptions, scientific, stm, text-utf8, time, unix
+ , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp
+ }:
+ mkDerivation {
+ pname = "cherry-core-alpha";
+ version = "0.1.0.0";
+ sha256 = "1fzvgabln3zpmzzmzvmd2b3b0fkzz3gm3jyyz405563ifaqrjnal";
+ libraryHaskellDepends = [
+ async base base64-bytestring binary bytestring case-insensitive
+ containers ghc-prim http-client http-client-tls http-types mtl
+ network safe-exceptions scientific stm text-utf8 time unix
+ utf8-string vector wai wai-extra wai-middleware-static warp
+ ];
+ testHaskellDepends = [
+ base cherry-core containers hspec text-utf8
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "The core library for Cherry Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {cherry-core = null;};
+
"chessIO" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, directory, extra, file-embed, haskeline, megaparsec, MonadRandom
@@ -53183,8 +53335,10 @@ self: {
}:
mkDerivation {
pname = "chiphunk";
- version = "0.1.2.1";
- sha256 = "03mjx286kbxnnsalqii7fbq3zgdbdsb2mr6x334jffif801sjmbq";
+ version = "0.1.4.0";
+ sha256 = "096pcfszccx9hdzqknrmdzj2lb38059cfqndvyildx2x83dhq5dx";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base hashable safe-exceptions StateVar vector-space
];
@@ -54186,8 +54340,8 @@ self: {
}:
mkDerivation {
pname = "citeproc";
- version = "0.2";
- sha256 = "1jibg9yzcdafijy5c8khgavirbxq44plsw81gkxya24yc9ag5bi6";
+ version = "0.3";
+ sha256 = "0y4k06cqsqj85wv6k7ji6nyfr7k9m3rbbvly4xrzwqz9p1jrvdv9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -55456,8 +55610,8 @@ self: {
}:
mkDerivation {
pname = "clickhouse-haskell";
- version = "0.1.2.0";
- sha256 = "0mys7l7sncrdwd673p0s4ls3ir5i26kcjl7x0hpd9a4ms8y04fxx";
+ version = "0.1.2.3";
+ sha256 = "1sa9jbiw8j04plk26p7n25plq0ymzsw7vqln0y6kbn3k30panyqg";
libraryHaskellDepends = [
aeson array async attoparsec base binary bytestring
bytestring-to-vector call-stack containers data-default-class
@@ -56724,8 +56878,8 @@ self: {
}:
mkDerivation {
pname = "co-log-polysemy-formatting";
- version = "0.1.0.0";
- sha256 = "17dajk3d23xa1fj8qs896szs00vvwpdgcgjibvkw9mm160yvrlxi";
+ version = "0.1.1.0";
+ sha256 = "0bq16kf0xg1nlif5jk899jawbbgg1lkh0jy6gx46prvqghd05y4s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -56733,8 +56887,8 @@ self: {
polysemy text time
];
executableHaskellDepends = [
- ansi-terminal base co-log co-log-core co-log-polysemy formatting
- polysemy polysemy-plugin text time
+ base co-log co-log-core co-log-polysemy formatting polysemy
+ polysemy-plugin
];
description = "A Polysemy logging effect for high quality (unstructured) logs";
license = stdenv.lib.licenses.bsd3;
@@ -58411,6 +58565,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "comonad_5_0_7" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, containers
+ , distributive, doctest, indexed-traversable, tagged, transformers
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "comonad";
+ version = "5.0.7";
+ sha256 = "178d0g7f5rx69dniij0ihjv3makgg9zybqnrbwwf3jfknykypgam";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base containers distributive indexed-traversable tagged
+ transformers transformers-compat
+ ];
+ testHaskellDepends = [ base doctest ];
+ description = "Comonads";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"comonad-extras" = callPackage
({ mkDerivation, array, base, comonad, containers, distributive
, semigroupoids, transformers
@@ -62826,8 +63000,8 @@ self: {
}:
mkDerivation {
pname = "copilot";
- version = "3.1";
- sha256 = "1dw7bkmadwsncd39pkngaxglfsnrnc9km7y8ld0l9bkiiw136x2w";
+ version = "3.2";
+ sha256 = "1d1b70kal17aiflhvzz59ahc6iyyln3d70xvhjjjh7j7la03xm8h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -62842,20 +63016,27 @@ self: {
}) {};
"copilot-c99" = callPackage
- ({ mkDerivation, base, containers, copilot-core, directory
- , filepath, language-c99, language-c99-simple, language-c99-util
- , mtl, pretty
+ ({ mkDerivation, base, containers, copilot-core, copilot-language
+ , csv, directory, filepath, hspec, language-c99
+ , language-c99-simple, language-c99-util, mtl, pretty, process
+ , QuickCheck
}:
mkDerivation {
pname = "copilot-c99";
- version = "3.1.2";
- sha256 = "1mxkn9mvcxlycrrha023nppn8005n26mqhklcw2hf8l3aq2ij7mf";
+ version = "3.2";
+ sha256 = "0q0v8xwmcbvi2yvz0nn1kc3ms0i3g74f2k66gwhnznnvldr99qh2";
libraryHaskellDepends = [
base containers copilot-core directory filepath language-c99
language-c99-simple language-c99-util mtl pretty
];
+ testHaskellDepends = [
+ base copilot-core copilot-language csv hspec language-c99
+ language-c99-simple pretty process QuickCheck
+ ];
description = "A compiler for Copilot targeting C99";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"copilot-cbmc" = callPackage
@@ -62877,12 +63058,12 @@ self: {
}) {};
"copilot-core" = callPackage
- ({ mkDerivation, base, containers, dlist, mtl, pretty }:
+ ({ mkDerivation, base, dlist, mtl, pretty }:
mkDerivation {
pname = "copilot-core";
- version = "3.1";
- sha256 = "08xz5s0b2fd5igja5wiaq93ignx6bsf942rg4hy42fmh4c03hylp";
- libraryHaskellDepends = [ base containers dlist mtl pretty ];
+ version = "3.2";
+ sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga";
+ libraryHaskellDepends = [ base dlist mtl pretty ];
description = "An intermediate representation for Copilot";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -62893,8 +63074,8 @@ self: {
}:
mkDerivation {
pname = "copilot-language";
- version = "3.1";
- sha256 = "0hdk8418l30vz9lv7c4bzh8m5gn8knpvg296b14n66si9g36qglp";
+ version = "3.2";
+ sha256 = "1vx2i20ndphcb7gl252wnk2bim2dcg3552yfa0rpkh8axkiwmnpa";
libraryHaskellDepends = [
array base containers copilot-core copilot-theorem data-reify
ghc-prim mtl
@@ -62911,8 +63092,8 @@ self: {
}:
mkDerivation {
pname = "copilot-libraries";
- version = "3.1";
- sha256 = "094hjzg22b55n4kv89ccr7pbgqpbd0z8f5myn93nyw6yqpmpp30v";
+ version = "3.2";
+ sha256 = "0sjl6bk2fzba2zj0m41si0i2jr8pcwf96zc1vscwmhfg48hqxjg1";
libraryHaskellDepends = [
array base containers copilot-language data-reify mtl parsec
];
@@ -62946,8 +63127,8 @@ self: {
}:
mkDerivation {
pname = "copilot-theorem";
- version = "3.1";
- sha256 = "15vnl5lg9s6h9s98f1nvva3ab0gdn3a5314mxdfxxa53ywmiq2a0";
+ version = "3.2";
+ sha256 = "1l0vmxlrygvxq23nvjss8x53qlfhbshp5vlh3cs6mviv1hmpbg7v";
libraryHaskellDepends = [
ansi-terminal base bimap containers copilot-core data-default
directory mtl parsec pretty process random transformers xml
@@ -65376,8 +65557,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Fast, pure and practical SHA-512 implementation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"cryptoids" = callPackage
@@ -65569,6 +65748,8 @@ self: {
pname = "cryptsy-api";
version = "0.2.1";
sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs";
+ revision = "1";
+ editedCabalFile = "0j7ak0dypmr8g9zxrkr9pv5rn2hkj0m2lny2r1j2gwzkw61xifiz";
libraryHaskellDepends = [
aeson base bytestring deepseq either http-client http-client-tls
old-locale pipes-attoparsec pipes-http text time transformers
@@ -67156,8 +67337,8 @@ self: {
];
doCheck = false;
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
- mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
+ mkdir -p $out/share/bash-completion/completions
+ mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
'';
description = "a distributed, interactive, smart revision control system";
license = stdenv.lib.licenses.gpl2Plus;
@@ -69283,13 +69464,12 @@ self: {
}:
mkDerivation {
pname = "data-validation";
- version = "0.1.2.0";
- sha256 = "1qka2f0gl48yi2hfiqphk94srh5lq7i14vx0qmj09fgv8xn65n15";
- libraryHaskellDepends = [
- base containers regex-tdfa template-haskell
+ version = "0.1.2.4";
+ sha256 = "1ck7grirqv0hbi973fgbgwzflsmz8diwi1rmjmfxz1f3915vi1yz";
+ libraryHaskellDepends = [ base containers template-haskell ];
+ testHaskellDepends = [
+ base containers hspec regex-tdfa template-haskell
];
- testHaskellDepends = [ base containers hspec template-haskell ];
- doHaddock = false;
description = "A library for creating type safe validations";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -71958,8 +72138,8 @@ self: {
}:
mkDerivation {
pname = "derive-storable-plugin";
- version = "0.2.3.1";
- sha256 = "1g2i2l97jldw9yv10dbcbaq54lz1k1aajhxr28m7fgjwf2mry3gi";
+ version = "0.2.3.3";
+ sha256 = "1p15iia1zg9hm462wbhbcrk70zaphpsbkdbksfxizyfcw9c0v9qf";
libraryHaskellDepends = [ base derive-storable ghc ghci ];
testHaskellDepends = [
base derive-storable ghc ghci hspec QuickCheck
@@ -72579,10 +72759,8 @@ self: {
}:
mkDerivation {
pname = "dhall";
- version = "1.36.0";
- sha256 = "014bdxmrcxzc2yrk838fxbz521714fk3a7c6idb9065wrfzch1wj";
- revision = "1";
- editedCabalFile = "1561i0rv0qx4mizwg1k04qynwdz6gsx4fifps9415rwdfki6dyxw";
+ version = "1.37.0";
+ sha256 = "126092s8m5kf1bmihwg73kfjcll9y0icqj4aa48m9hg7qm92nq0x";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -72616,14 +72794,69 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall_1_37_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
+ , base, bytestring, case-insensitive, cborg, cborg-json, containers
+ , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+ , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+ , generic-random, half, hashable, haskeline, http-client
+ , http-client-tls, http-types, lens-family-core, megaparsec, memory
+ , mmorph, mockery, mtl, network-uri, optparse-applicative
+ , parser-combinators, parsers, pretty-simple, prettyprinter
+ , prettyprinter-ansi-terminal, profunctors, QuickCheck
+ , quickcheck-instances, repline, scientific, serialise
+ , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
+ , tasty-quickcheck, tasty-silver, template-haskell, text
+ , text-manipulate, th-lift-instances, transformers
+ , transformers-compat, turtle, unordered-containers, uri-encode
+ , vector
+ }:
+ mkDerivation {
+ pname = "dhall";
+ version = "1.37.1";
+ sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal atomic-write base bytestring
+ case-insensitive cborg cborg-json containers contravariant
+ cryptonite data-fix deepseq Diff directory dotgen either exceptions
+ filepath half hashable haskeline http-client http-client-tls
+ http-types lens-family-core megaparsec memory mmorph mtl
+ network-uri optparse-applicative parser-combinators parsers
+ pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
+ repline scientific serialise template-haskell text text-manipulate
+ th-lift-instances transformers transformers-compat
+ unordered-containers uri-encode vector
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base bytestring cborg containers data-fix deepseq directory doctest
+ either filepath foldl generic-random http-client http-client-tls
+ lens-family-core megaparsec mockery prettyprinter QuickCheck
+ quickcheck-instances scientific serialise special-values spoon
+ tasty tasty-expected-failure tasty-hunit tasty-quickcheck
+ tasty-silver template-haskell text transformers turtle
+ unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers directory gauge text
+ ];
+ doCheck = false;
+ description = "A configuration language guaranteed to terminate";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dhall-bash" = callPackage
({ mkDerivation, base, bytestring, containers, dhall
, neat-interpolation, optparse-generic, shell-escape, text
}:
mkDerivation {
pname = "dhall-bash";
- version = "1.0.34";
- sha256 = "1p1zylrjk80lh8rxpw2z3wyvk9x7q65lwyfwfacx8rrbgzx54riy";
+ version = "1.0.35";
+ sha256 = "0v7br83m3zhz4pa98yrzbikkvldgrprjq0z5amimjsk8lcdmpq8k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72665,8 +72898,8 @@ self: {
}:
mkDerivation {
pname = "dhall-docs";
- version = "1.0.2";
- sha256 = "17l8vwj02lbkqy8p4j7rhmwidrxx1ln375cv8lgwwx4n0fgvmgfc";
+ version = "1.0.3";
+ sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -72728,8 +72961,8 @@ self: {
}:
mkDerivation {
pname = "dhall-json";
- version = "1.7.3";
- sha256 = "0as1n4qy0rynmj1y7h39l1lazqarwgizbzsn0g7apixzzdfm53kx";
+ version = "1.7.4";
+ sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72777,8 +73010,8 @@ self: {
}:
mkDerivation {
pname = "dhall-lsp-server";
- version = "1.0.11";
- sha256 = "0xp4mbk26p22xs5f2bz493yi9ijbiiz1jwmc462yk1bxxz5lbx5n";
+ version = "1.0.12";
+ sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72802,8 +73035,8 @@ self: {
}:
mkDerivation {
pname = "dhall-nix";
- version = "1.1.18";
- sha256 = "0d947iz98mkmz7chxcp2402kid711na7xwwx8xzh8jg5lh41sm7w";
+ version = "1.1.19";
+ sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72827,8 +73060,8 @@ self: {
}:
mkDerivation {
pname = "dhall-nixpkgs";
- version = "1.0.2";
- sha256 = "1r76zbqk2pc5pryrbdj425j6bb86x28pqfkav3kw9kr4703afhni";
+ version = "1.0.3";
+ sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -72899,8 +73132,8 @@ self: {
}:
mkDerivation {
pname = "dhall-yaml";
- version = "1.2.3";
- sha256 = "1n42brr1yifb4pyl26960rsm8b1wzw0hvv6mmq8m5ml5av61ymf3";
+ version = "1.2.4";
+ sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -74560,8 +74793,8 @@ self: {
}:
mkDerivation {
pname = "diohsc";
- version = "0.1.2";
- sha256 = "0ksawn7wspw1f3yaaqyz4sgbl0p9fnidn1jjfwmjs9zrna1cb084";
+ version = "0.1.3.1";
+ sha256 = "1k44bi5ri63qsps0vh24qc32bclp3nqp2qbs6ylxm9k0q76758iw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -74800,6 +75033,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "directory-contents" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, text
+ , transformers, witherable
+ }:
+ mkDerivation {
+ pname = "directory-contents";
+ version = "0.2.0.0";
+ sha256 = "15irmkg3ll6s3dqwl4hn7mmr5kygcl11slba3mzkdhlyg567is6x";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filepath text transformers witherable
+ ];
+ executableHaskellDepends = [ base filepath text ];
+ testHaskellDepends = [ base filepath ];
+ description = "Recursively build, navigate, and operate on a tree of directory contents";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"directory-layout" = callPackage
({ mkDerivation, base, bytestring, command-qq, containers
, directory, doctest, filepath, free, hspec, lens, semigroups
@@ -77003,6 +77255,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "doctemplates_0_9" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
+ , tasty, tasty-golden, tasty-hunit, temporary, text
+ , text-conversions, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "doctemplates";
+ version = "0.9";
+ sha256 = "048h8ka849h1f0xxwkasjbrrwq03rfz2m7aqg5xc5286kp02w9ns";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base containers doclayout filepath HsYAML mtl parsec safe
+ scientific text text-conversions unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers doclayout filepath Glob tasty
+ tasty-golden tasty-hunit temporary text
+ ];
+ benchmarkHaskellDepends = [
+ aeson base containers criterion doclayout filepath mtl text
+ ];
+ description = "Pandoc-style document templates";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"doctest" = callPackage
({ mkDerivation, base, base-compat, code-page, deepseq, directory
, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery
@@ -82450,10 +82729,8 @@ self: {
}:
mkDerivation {
pname = "engine-io";
- version = "1.2.22";
- sha256 = "19hmd804r9k20270zlsfbsyvww5syi5h3nl74klvgmni39ahcxcl";
- revision = "1";
- editedCabalFile = "098nkv1zrc4b80137pxdz87by83bla9cbsv6920cpbspkic8x9xz";
+ version = "1.2.23";
+ sha256 = "0q03njv1fdc0g3i0l5bz43xj734wams5qs790y2vvxnjm3ajnjxb";
libraryHaskellDepends = [
aeson async attoparsec base base64-bytestring bytestring errors
free monad-loops mwc-random stm stm-delay text transformers
@@ -83590,6 +83867,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "error-or_0_1_2_0" = callPackage
+ ({ mkDerivation, base, containers, text }:
+ mkDerivation {
+ pname = "error-or";
+ version = "0.1.2.0";
+ sha256 = "0ry06vhz7mrl7i587vw3pv2ralh8aw7km6jfhagww0hmckwdjqmm";
+ libraryHaskellDepends = [ base containers text ];
+ description = "Composable, hierarchical errors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"error-or-utils" = callPackage
({ mkDerivation, base, containers, error-or, text }:
mkDerivation {
@@ -84074,8 +84363,6 @@ self: {
testHaskellDepends = [ base essence-of-live-coding http-client ];
description = "General purpose live coding framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"estimator" = callPackage
@@ -84867,20 +85154,22 @@ self: {
"eventlog2html" = callPackage
({ mkDerivation, aeson, array, attoparsec, base, blaze-html
- , bytestring, containers, file-embed, filepath, ghc-events
- , hashable, hashtables, hvega, mtl, optparse-applicative
- , semigroups, text, time, trie-simple, vector
+ , bytestring, containers, cpu, directory, file-embed, filepath
+ , ghc-events, ghc-heap, hashable, hashtables, hvega, mtl
+ , optparse-applicative, semigroups, statistics-linreg, strict, text
+ , time, trie-simple, vector
}:
mkDerivation {
pname = "eventlog2html";
- version = "0.7.0";
- sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1";
+ version = "0.8.2";
+ sha256 = "01qfggrnfsldv5sp62q14k8d04fm7qx6kwg6z4nipirbpnya8s89";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson array attoparsec base blaze-html bytestring containers
- file-embed filepath ghc-events hashable hashtables hvega mtl
- optparse-applicative semigroups text time trie-simple vector
+ aeson array attoparsec base blaze-html bytestring containers cpu
+ directory file-embed filepath ghc-events ghc-heap hashable
+ hashtables hvega mtl optparse-applicative semigroups
+ statistics-linreg strict text time trie-simple vector
];
executableHaskellDepends = [ aeson base filepath text ];
description = "Visualise an eventlog";
@@ -85964,6 +86253,38 @@ self: {
broken = true;
}) {};
+ "experimenter" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector
+ , conduit, containers, deepseq, directory, esqueleto, filepath
+ , foundation, HaTeX, hostname, hspec, lens, matrix, monad-logger
+ , mtl, mwc-random, parallel, persistent, persistent-postgresql
+ , persistent-template, process, QuickCheck, resource-pool
+ , resourcet, stm, text, time, transformers, unix, unliftio-core
+ , vector
+ }:
+ mkDerivation {
+ pname = "experimenter";
+ version = "0.1.0.1";
+ sha256 = "1cd4vwvagm0ajr35rs7kpcdv15nv5ps0f5l1ykv0hsgparls5kv7";
+ libraryHaskellDepends = [
+ aeson base bytestring cereal cereal-vector conduit containers
+ deepseq directory esqueleto filepath HaTeX hostname lens matrix
+ monad-logger mtl mwc-random parallel persistent
+ persistent-postgresql persistent-template process resource-pool
+ resourcet stm text time transformers unix unliftio-core vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring cereal cereal-vector conduit containers
+ deepseq directory esqueleto filepath foundation HaTeX hostname
+ hspec lens matrix monad-logger mtl mwc-random parallel persistent
+ persistent-postgresql persistent-template process QuickCheck
+ resource-pool resourcet stm text time transformers unix
+ unliftio-core vector
+ ];
+ description = "Perform scientific experiments stored in a DB, and generate reports";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"expiring-cache-map" = callPackage
({ mkDerivation, base, bytestring, containers, hashable, time
, unordered-containers
@@ -86436,33 +86757,35 @@ self: {
}) {};
"extensible-effects-concurrent" = callPackage
- ({ mkDerivation, async, base, containers, data-default, deepseq
- , directory, exceptions, extensible-effects, filepath, hashable
- , hostname, HUnit, lens, monad-control, mtl, network, pretty-types
+ ({ mkDerivation, async, base, containers, criterion, data-default
+ , deepseq, directory, exceptions, extensible-effects, filepath
+ , hashable, hostname, HUnit, lens, monad-control, mtl, network
, QuickCheck, safe-exceptions, stm, tasty, tasty-discover
- , tasty-hunit, text, time, transformers-base
+ , tasty-hunit, text, time, transformers-base, unliftio
}:
mkDerivation {
pname = "extensible-effects-concurrent";
- version = "0.32.0";
- sha256 = "1zipam9jac1bj4fkzihgh0hasiwgpycidhvxb0b2b0q7ic18487a";
+ version = "2.0.0";
+ sha256 = "1yzn3lhrwn4r4v1qxv9ask8qg6i5p4rkak5hlvai3nv3f3jnnz6c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async base containers data-default deepseq directory exceptions
extensible-effects filepath hashable hostname lens monad-control
- mtl network pretty-types safe-exceptions stm text time
- transformers-base
+ mtl network safe-exceptions stm text time transformers-base
];
executableHaskellDepends = [
- base data-default deepseq extensible-effects lens pretty-types text
+ base data-default deepseq extensible-effects lens text
];
testHaskellDepends = [
async base containers data-default deepseq extensible-effects
- filepath hostname HUnit lens monad-control pretty-types QuickCheck
- stm tasty tasty-discover tasty-hunit text time
+ filepath hostname HUnit lens monad-control QuickCheck stm tasty
+ tasty-discover tasty-hunit text time
];
testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq extensible-effects text unliftio
+ ];
description = "Message passing concurrency as extensible-effect";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91872,8 +92195,8 @@ self: {
}:
mkDerivation {
pname = "focus";
- version = "1.0.1.4";
- sha256 = "1knaiwnxcl2hrx4b3k954rd5v995gxa48db1z9mp58s646ymlmfl";
+ version = "1.0.2";
+ sha256 = "09d85g6knv3wcn8ib5mpbpjn9xw1pbl3a6qlfy1lrzypv9lrv0ld";
libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -93372,6 +93695,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "free_5_1_5" = callPackage
+ ({ mkDerivation, base, comonad, containers, distributive
+ , exceptions, indexed-traversable, mtl, profunctors, semigroupoids
+ , template-haskell, th-abstraction, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "free";
+ version = "5.1.5";
+ sha256 = "0rpnimi3iyr6n9q2ny365mp1l5rjjys15aggcikgnrfn0d656nw6";
+ libraryHaskellDepends = [
+ base comonad containers distributive exceptions indexed-traversable
+ mtl profunctors semigroupoids template-haskell th-abstraction
+ transformers transformers-base
+ ];
+ description = "Monads for free";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"free-algebras" = callPackage
({ mkDerivation, base, containers, data-fix, dlist, free, groups
, hedgehog, kan-extensions, mtl, transformers
@@ -95375,8 +95717,8 @@ self: {
}:
mkDerivation {
pname = "fused-effects";
- version = "1.1.0.0";
- sha256 = "0ns1h03skgywfm3i5748q9hxvla5769p7hb72zw8yhdfpgwh9rlx";
+ version = "1.1.1.0";
+ sha256 = "0z83iw3bysfk13pda44lasgyg3nlnrxv6bz1f9mpdyymq3vnb9d7";
libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [
base containers hedgehog hedgehog-fn inspection-testing tasty
@@ -95584,8 +95926,8 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.18.3";
- sha256 = "15x528wskfl158909y0qapq72084kq4rjbpp2yd96gh2ycgawz7b";
+ version = "0.18.4";
+ sha256 = "1qpl16r6q0bhb99502nv5skmycr825rjgnpna1y0flpdhkprmmqr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -98766,7 +99108,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc_8_10_1" = callPackage
+ "ghc_8_10_2" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
, ghci, hpc, process, template-haskell, terminfo, time
@@ -98774,8 +99116,8 @@ self: {
}:
mkDerivation {
pname = "ghc";
- version = "8.10.1";
- sha256 = "0j5cmb0bqndmrgr92zysa6yiccammdr2pgm9swwkipm5jz4g6d5s";
+ version = "8.10.2";
+ sha256 = "0xh6ll9x8iv74cv5l6q9q3qwm0qw0qkfxzh7dj3b6yzh10b63g8z";
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell
@@ -98816,12 +99158,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghc-boot-th_8_10_1" = callPackage
+ "ghc-boot-th_8_10_2" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ghc-boot-th";
- version = "8.10.1";
- sha256 = "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli";
+ version = "8.10.2";
+ sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz";
libraryHaskellDepends = [ base ];
description = "Shared functionality between GHC and the `template-haskell` library";
license = stdenv.lib.licenses.bsd3;
@@ -99064,6 +99406,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-events_0_15_0" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "ghc-events";
+ version = "0.15.0";
+ sha256 = "058ha55661qcxwd5zgmh6vwkdaj7l50h7xri9l1zg26gx69w3bhw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers text vector
+ ];
+ executableHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base ];
+ description = "Library and tool for parsing .eventlog files from GHC";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-events-analyze" = callPackage
({ mkDerivation, base, blaze-svg, bytestring, containers
, diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
@@ -100007,15 +100369,15 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "ghci_8_10_1" = callPackage
+ "ghci_8_10_2" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap
, template-haskell, transformers, unix
}:
mkDerivation {
pname = "ghci";
- version = "8.10.1";
- sha256 = "14r7h3nj61mhap15r3cq6824b6fib9krj6b6qa77bl7jqdqpfxsq";
+ version = "8.10.2";
+ sha256 = "1pn6d400mlxgfsskzmcgjxkka9wrma95v0vpgc44gaha5cdsrhh7";
libraryHaskellDepends = [
array base binary bytestring containers deepseq filepath ghc-boot
ghc-boot-th ghc-heap template-haskell transformers unix
@@ -100204,24 +100566,24 @@ self: {
"ghcide" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
- , binary, bytestring, Chart, Chart-diagrams, containers
- , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
- , directory, extra, filepath, fingertree, fuzzy, ghc, ghc-boot
- , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
- , Glob, haddock-library, hashable, haskell-lsp, haskell-lsp-types
- , hie-bios, hie-compat, hslogger, implicit-hie-cradle, lens
- , lsp-test, mtl, network-uri, optparse-applicative, prettyprinter
+ , binary, bytestring, containers, cryptohash-sha1, data-default
+ , deepseq, directory, extra, filepath, fingertree, fuzzy, ghc
+ , ghc-boot, ghc-boot-th, ghc-check, ghc-paths
+ , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
+ , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat
+ , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
+ , opentelemetry, optparse-applicative, parallel, prettyprinter
, prettyprinter-ansi-terminal, process, QuickCheck
, quickcheck-instances, record-dot-preprocessor, record-hasfield
, regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake
- , sorted-list, stm, syb, tasty, tasty-expected-failure, tasty-hunit
- , tasty-quickcheck, tasty-rerun, text, time, transformers, unix
- , unordered-containers, utf8-string, yaml
+ , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure
+ , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time
+ , transformers, unix, unordered-containers, utf8-string, yaml
}:
mkDerivation {
pname = "ghcide";
- version = "0.5.0";
- sha256 = "1l3h12jksxh1ds68zkslwmssfsdspxvyp0gqr5n8hgkymr4p896a";
+ version = "0.6.0.1";
+ sha256 = "06025p7ggqvirdhm4z9pydcc4av0bk2jkqlmdwlabf4f973vcsgq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -100229,17 +100591,17 @@ self: {
containers cryptohash-sha1 data-default deepseq directory extra
filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check
ghc-paths Glob haddock-library hashable haskell-lsp
- haskell-lsp-types hie-bios hie-compat hslogger implicit-hie-cradle
- mtl network-uri prettyprinter prettyprinter-ansi-terminal
- regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list
- stm syb text time transformers unix unordered-containers
- utf8-string
+ haskell-lsp-types heapsize hie-bios hie-compat hslogger
+ implicit-hie-cradle mtl network-uri opentelemetry parallel
+ prettyprinter prettyprinter-ansi-terminal regex-tdfa
+ rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
+ text time transformers unix unordered-containers utf8-string
];
executableHaskellDepends = [
aeson base bytestring containers data-default directory extra
- filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
- lens lsp-test optparse-applicative process safe-exceptions shake
- text unordered-containers
+ filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
+ hie-bios lens lsp-test optparse-applicative process safe-exceptions
+ shake text unordered-containers
];
testHaskellDepends = [
aeson base binary bytestring containers directory extra filepath
@@ -100251,13 +100613,14 @@ self: {
text
];
benchmarkHaskellDepends = [
- aeson base Chart Chart-diagrams diagrams diagrams-svg directory
- extra filepath shake text yaml
+ aeson base directory filepath shake shake-bench text yaml
];
description = "The core of an IDE";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ maralorn ];
- }) {};
+ broken = true;
+ }) {shake-bench = null;};
"ghcjs-ajax" = callPackage
({ mkDerivation, aeson, base, http-types, text }:
@@ -108678,8 +109041,8 @@ self: {
}:
mkDerivation {
pname = "greenclip";
- version = "3.3.0";
- sha256 = "02w84wmkih9j9iil9ilwb77qkbvfa6nhllavrcj6rgb7zp264w84";
+ version = "3.4.0";
+ sha256 = "0763nnh7k4blkamlswnapwxyqfn1l0g6ibpz7k1w2w2asj7a3q98";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -109220,6 +109583,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "group-theory" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+ , groups
+ }:
+ mkDerivation {
+ pname = "group-theory";
+ version = "0.2.0.0";
+ sha256 = "0giwyvki83ndxn9vyfzi5fkz23c95zv5x09ya1in4i8318f8d7az";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base containers groups ];
+ testHaskellDepends = [ base doctest ];
+ description = "The theory of groups";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"group-with" = callPackage
({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations
, QuickCheck
@@ -109299,8 +109677,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "groups";
- version = "0.5";
- sha256 = "1ivz03k5bk6d72bibn8jyq4wkivkyakbmvbrp270b33282a4lkpc";
+ version = "0.5.2";
+ sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn";
libraryHaskellDepends = [ base ];
description = "Groups";
license = stdenv.lib.licenses.bsd3;
@@ -109319,6 +109697,25 @@ self: {
broken = true;
}) {};
+ "grow-vector" = callPackage
+ ({ mkDerivation, base, primitive, quickcheck-instances, tasty
+ , tasty-discover, tasty-hspec, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "grow-vector";
+ version = "0.1.3.0";
+ sha256 = "13b75yghy6nksga98wn8gc9b2198g4pqrm52hrldryyf4v83zadg";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base primitive vector ];
+ testHaskellDepends = [
+ base primitive quickcheck-instances tasty tasty-discover
+ tasty-hspec tasty-quickcheck
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Mutable vector with efficient appends";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"growler" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring
, case-insensitive, either, http-types, lens, monad-control, mtl
@@ -112926,8 +113323,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-images";
- version = "1.0.0";
- sha256 = "0433jha6rnw4c80igx6hka9a943b9qimscyda93mgn7v7pakw6l2";
+ version = "1.0.1";
+ sha256 = "1fbwg37899m82y0gskk9wsif8bc9c3j4iznyqj7v54m5y0hxlhc0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base binary bytestring hakyll JuicyPixels JuicyPixels-extra
@@ -115297,8 +115694,8 @@ self: {
pname = "hashable";
version = "1.3.0.0";
sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2";
- revision = "1";
- editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c";
+ revision = "2";
+ editedCabalFile = "16va8hx4ynw0n5s2warhs13ilj7hrs5fcdn140h1fiix480as36n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118683,8 +119080,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.17.5";
- sha256 = "1isfxzn5gz7py469mh9m6jd430w9alp0x8b75rymd3sp2ihwc3mz";
+ version = "0.18.0";
+ sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3";
libraryHaskellDepends = [
aeson array base base16-bytestring bytestring cereal conduit
containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -118821,8 +119218,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.38.4";
- sha256 = "1kiqib85rblq9y8mz5fsiqv4w9i5bzqj6h62yxd7riigc82h10g3";
+ version = "0.39.0";
+ sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121326,6 +121723,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hcount" = callPackage
+ ({ mkDerivation, attoparsec, base, containers, ghc, lens, numhask
+ , optparse-applicative, stan, text
+ }:
+ mkDerivation {
+ pname = "hcount";
+ version = "0.0.1";
+ sha256 = "0lz400p757kcnfkdwr3qrv07hlshv5rlsm3zfrf6zfhg4nayb93p";
+ revision = "1";
+ editedCabalFile = "0gvwrrhd1hhk242h686chlsww3cmxh5vy7296k5g6p6sb03ir4p5";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ attoparsec base containers ghc lens numhask optparse-applicative
+ stan text
+ ];
+ description = "Haskell name counts";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hcron" = callPackage
({ mkDerivation, base, bytestring, containers, directory, mtl
, old-locale, pretty, process, random, stm, time
@@ -121981,8 +122398,8 @@ self: {
}:
mkDerivation {
pname = "heapsize";
- version = "0.3.0";
- sha256 = "14i4yfk8qfpkcajb9h500dx4s5mqnpvfnyh1v3rp8pxcb93ffgc1";
+ version = "0.3.0.1";
+ sha256 = "0v38czcdnrlpcszbz7janb2qw4bqldhmql0riqq6a9bylv3zfs0y";
libraryHaskellDepends = [
base deepseq exceptions ghc-heap hashable hashtables primitive
transformers unordered-containers
@@ -122284,6 +122701,8 @@ self: {
pname = "hedgehog";
version = "1.0.3";
sha256 = "10lv574491zldqzin433z0vqkq43f0v3shjf78j395y0g1jyky9m";
+ revision = "1";
+ editedCabalFile = "0v0wgij1sz7smmh7j74g8jdi6gvjdv90f20jci7qskx38mhn5n0j";
libraryHaskellDepends = [
ansi-terminal async base bytestring concurrent-output containers
deepseq directory erf exceptions fail lifted-async mmorph
@@ -122298,6 +122717,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hedgehog_1_0_4" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, bytestring
+ , concurrent-output, containers, deepseq, directory, erf
+ , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
+ , primitive, random, resourcet, stm, template-haskell, text, time
+ , transformers, transformers-base, wl-pprint-annotated
+ }:
+ mkDerivation {
+ pname = "hedgehog";
+ version = "1.0.4";
+ sha256 = "16j60k0xg74861b5a5n9brx1pgwa2yg76v8q8drmhlx46ga5fwdz";
+ libraryHaskellDepends = [
+ ansi-terminal async base bytestring concurrent-output containers
+ deepseq directory erf exceptions lifted-async mmorph monad-control
+ mtl pretty-show primitive random resourcet stm template-haskell
+ text time transformers transformers-base wl-pprint-annotated
+ ];
+ testHaskellDepends = [
+ base containers mmorph mtl pretty-show text transformers
+ ];
+ description = "Release with confidence";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hedgehog-checkers" = callPackage
({ mkDerivation, base, containers, either, hedgehog, semigroupoids
, semigroups
@@ -122463,6 +122907,8 @@ self: {
pname = "hedgehog-quickcheck";
version = "0.1.1";
sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp";
+ revision = "1";
+ editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh";
libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
description = "Use QuickCheck generators in Hedgehog and vice versa";
license = stdenv.lib.licenses.bsd3;
@@ -125144,6 +125590,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hie-bios_0_7_2" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
+ , directory, extra, file-embed, filepath, ghc, hslogger
+ , hspec-expectations, process, tasty, tasty-expected-failure
+ , tasty-hunit, temporary, text, time, transformers, unix-compat
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hie-bios";
+ version = "0.7.2";
+ sha256 = "0cff9kf4qnfkfzvxhxi0hh54x013g5sg0xcw0vpsarc3a91p7da8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring conduit conduit-extra
+ containers cryptohash-sha1 deepseq directory extra file-embed
+ filepath ghc hslogger process temporary text time transformers
+ unix-compat unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [ base directory filepath ghc ];
+ testHaskellDepends = [
+ base directory extra filepath ghc hspec-expectations tasty
+ tasty-expected-failure tasty-hunit temporary text
+ unordered-containers yaml
+ ];
+ description = "Set up a GHC API session";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hie-compat" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, filepath, ghc, ghc-boot, transformers
@@ -126840,41 +127317,40 @@ self: {
({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries
, bytestring, cmdargs, containers, data-default, Decimal, Diff
, directory, extra, filepath, hashable, haskeline, hledger-lib
- , lucid, math-functions, megaparsec, mtl, old-time, parsec
- , pretty-show, process, regex-tdfa, safe, shakespeare, split
- , tabular, tasty, temporary, terminfo, text, time, timeit
- , transformers, unordered-containers, utf8-string, utility-ht
- , wizards
+ , lucid, math-functions, megaparsec, mtl, old-time, parsec, process
+ , regex-tdfa, safe, shakespeare, split, tabular, tasty, temporary
+ , terminfo, text, time, timeit, transformers, unordered-containers
+ , utf8-string, utility-ht, wizards
}:
mkDerivation {
pname = "hledger";
- version = "1.19.1";
- sha256 = "0wfsyf2q1kf90mj3lxs0m5ghj153axmpkc8xfy12vkz5imnyphfm";
+ version = "1.20.1";
+ sha256 = "19f1p5fify3vy1aaknvfhykfl1cl4ibgilyvj3nf2127rwirb7kr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal base base-compat-batteries bytestring cmdargs
containers data-default Decimal Diff directory extra filepath
hashable haskeline hledger-lib lucid math-functions megaparsec mtl
- old-time parsec pretty-show process regex-tdfa safe shakespeare
- split tabular tasty temporary terminfo text time timeit
- transformers unordered-containers utf8-string utility-ht wizards
+ old-time parsec process regex-tdfa safe shakespeare split tabular
+ tasty temporary terminfo text time timeit transformers
+ unordered-containers utf8-string utility-ht wizards
];
executableHaskellDepends = [
aeson ansi-terminal base base-compat-batteries bytestring cmdargs
containers data-default Decimal directory extra filepath haskeline
- hledger-lib math-functions megaparsec mtl old-time parsec
- pretty-show process regex-tdfa safe shakespeare split tabular tasty
- temporary terminfo text time timeit transformers
- unordered-containers utf8-string utility-ht wizards
+ hledger-lib math-functions megaparsec mtl old-time parsec process
+ regex-tdfa safe shakespeare split tabular tasty temporary terminfo
+ text time timeit transformers unordered-containers utf8-string
+ utility-ht wizards
];
testHaskellDepends = [
aeson ansi-terminal base base-compat-batteries bytestring cmdargs
containers data-default Decimal directory extra filepath haskeline
- hledger-lib math-functions megaparsec mtl old-time parsec
- pretty-show process regex-tdfa safe shakespeare split tabular tasty
- temporary terminfo text time timeit transformers
- unordered-containers utf8-string utility-ht wizards
+ hledger-lib math-functions megaparsec mtl old-time parsec process
+ regex-tdfa safe shakespeare split tabular tasty temporary terminfo
+ text time timeit transformers unordered-containers utf8-string
+ utility-ht wizards
];
description = "Command-line interface for the hledger accounting system";
license = stdenv.lib.licenses.gpl3;
@@ -126974,8 +127450,8 @@ self: {
pname = "hledger-iadd";
version = "1.3.12";
sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048";
- revision = "1";
- editedCabalFile = "0amfrcwklqzpjkgr714d0as57m5ndaywi04d44ygvq2p5jd0h129";
+ revision = "2";
+ editedCabalFile = "1n43j7fh3d9f8jn1y40vhkfh7yfwb4sixm3wyrfj20mkr7yyr732";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127005,6 +127481,8 @@ self: {
pname = "hledger-interest";
version = "1.6.0";
sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq";
+ revision = "1";
+ editedCabalFile = "10v3fwyzbaqzrldaswvn031hncxy2sra302n10k4zkxg41bz7f73";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -127039,33 +127517,33 @@ self: {
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base
, base-compat-batteries, blaze-markup, bytestring, call-stack
, cassava, cassava-megaparsec, cmdargs, containers, data-default
- , Decimal, directory, doctest, extra, fgl, file-embed, filepath
- , Glob, hashtables, megaparsec, mtl, old-time, parsec
- , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
- , tasty, tasty-hunit, template-haskell, text, time, timeit
- , transformers, uglymemo, unordered-containers, utf8-string
+ , Decimal, directory, doctest, extra, file-embed, filepath, Glob
+ , hashtables, megaparsec, mtl, old-time, parsec, parser-combinators
+ , pretty-simple, regex-tdfa, safe, split, tabular, tasty
+ , tasty-hunit, template-haskell, text, time, timeit, transformers
+ , uglymemo, unordered-containers, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.19.1";
- sha256 = "0py11011r358nmnvwwkc8mlx6mpy36jm8sqlr4i8ihx3x0zjdgya";
+ version = "1.20.1";
+ sha256 = "1kh65sci79aa6yc4vqb6mq4i1gj41hrnc5blwzn5gxh4nzhw6jy1";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
- cmdargs containers data-default Decimal directory extra fgl
- file-embed filepath Glob hashtables megaparsec mtl old-time parsec
- parser-combinators pretty-show regex-tdfa safe split tabular tasty
- tasty-hunit template-haskell text time timeit transformers uglymemo
- unordered-containers utf8-string
+ cmdargs containers data-default Decimal directory extra file-embed
+ filepath Glob hashtables megaparsec mtl old-time parsec
+ parser-combinators pretty-simple regex-tdfa safe split tabular
+ tasty tasty-hunit template-haskell text time timeit transformers
+ uglymemo unordered-containers utf8-string
];
testHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
- cmdargs containers data-default Decimal directory doctest extra fgl
+ cmdargs containers data-default Decimal directory doctest extra
file-embed filepath Glob hashtables megaparsec mtl old-time parsec
- parser-combinators pretty-show regex-tdfa safe split tabular tasty
- tasty-hunit template-haskell text time timeit transformers uglymemo
- unordered-containers utf8-string
+ parser-combinators pretty-simple regex-tdfa safe split tabular
+ tasty tasty-hunit template-haskell text time timeit transformers
+ uglymemo unordered-containers utf8-string
];
description = "A reusable library providing the core functionality of hledger";
license = stdenv.lib.licenses.gpl3;
@@ -127119,21 +127597,20 @@ self: {
({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
, brick, cmdargs, containers, data-default, directory, extra
, filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens
- , microlens-platform, pretty-show, process, safe, split, text
- , text-zipper, time, transformers, unix, vector, vty
+ , microlens-platform, process, safe, split, text, text-zipper, time
+ , transformers, unix, vector, vty
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.19.1";
- sha256 = "17iz82jr89qxfd7j6q16w2jjr38mb7d94p3rbp0ks01bf4rlq5fl";
+ version = "1.20.1";
+ sha256 = "0dx71yzzvizjmvikb4pbd4zg272k7xrhfp1s76v2bmc9gqq0n6yc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
ansi-terminal async base base-compat-batteries brick cmdargs
containers data-default directory extra filepath fsnotify hledger
- hledger-lib megaparsec microlens microlens-platform pretty-show
- process safe split text text-zipper time transformers unix vector
- vty
+ hledger-lib megaparsec microlens microlens-platform process safe
+ split text text-zipper time transformers unix vector vty
];
description = "Curses-style terminal interface for the hledger accounting system";
license = stdenv.lib.licenses.gpl3;
@@ -127163,30 +127640,33 @@ self: {
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, case-insensitive, clientsession, cmdargs, conduit, conduit-extra
, containers, data-default, Decimal, directory, extra, filepath
- , hjsmin, hledger, hledger-lib, http-client, http-conduit
+ , hjsmin, hledger, hledger-lib, hspec, http-client, http-conduit
, http-types, megaparsec, mtl, network, shakespeare
, template-haskell, text, time, transformers, unix-compat
, unordered-containers, utf8-string, wai, wai-cors, wai-extra
, wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form
- , yesod-static
+ , yesod-static, yesod-test
}:
mkDerivation {
pname = "hledger-web";
- version = "1.19.1";
- sha256 = "03wak0dgxhf7y2mc2az4xcypgz1z1lf65vn6kj98z063pmlwp1b0";
+ version = "1.20.1";
+ sha256 = "0s4vg3vfcvp4krm5n5hjys0sa5gvf2pvdcmp5l967z18iqi3zj8l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring case-insensitive
clientsession cmdargs conduit conduit-extra containers data-default
- Decimal directory extra filepath hjsmin hledger hledger-lib
+ Decimal directory extra filepath hjsmin hledger hledger-lib hspec
http-client http-conduit http-types megaparsec mtl network
shakespeare template-haskell text time transformers unix-compat
unordered-containers utf8-string wai wai-cors wai-extra
wai-handler-launch warp yaml yesod yesod-core yesod-form
- yesod-static
+ yesod-static yesod-test
];
executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base hledger hledger-lib hspec text yesod yesod-test
+ ];
description = "Web-based user interface for the hledger accounting system";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -127388,17 +127868,15 @@ self: {
"hlrdb" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
, hashable, hedis, hlrdb-core, memory, random, store, time
- , unordered-containers
+ , unordered-containers, zstd
}:
mkDerivation {
pname = "hlrdb";
- version = "0.3.1.0";
- sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr";
- revision = "2";
- editedCabalFile = "11f2vv95kmk4k07yzvzma7714p148sfyn9k3zx94h5y0zihgn49g";
+ version = "0.3.2.0";
+ sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p";
libraryHaskellDepends = [
base base64-bytestring bytestring cryptonite hashable hedis
- hlrdb-core memory random store time unordered-containers
+ hlrdb-core memory random store time unordered-containers zstd
];
description = "High-level Redis Database";
license = stdenv.lib.licenses.mit;
@@ -127447,8 +127925,8 @@ self: {
}:
mkDerivation {
pname = "hls-plugin-api";
- version = "0.5.0.0";
- sha256 = "18bahpndgic8g259v4blckybc5mlp7snaqh1gmnd7kh39p8kf1v4";
+ version = "0.5.0.1";
+ sha256 = "0sv892m18ic9m8d5b8wm7385v80rc02fjy0wxvq9mzhgazz20cp2";
libraryHaskellDepends = [
aeson base containers data-default Diff ghc ghc-boot-th ghcide
hashable haskell-lsp hslogger lens process regex-tdfa shake text
@@ -128205,8 +128683,8 @@ self: {
}:
mkDerivation {
pname = "hnix";
- version = "0.11.0";
- sha256 = "01m23sn3r2pr6ldblk4m41y082jc0lrgpfzbx63sx168ldhwxar3";
+ version = "0.11.1";
+ sha256 = "0rdl1ky8l2zm5arkdq77qrg0xnqfavba0bnr9bd0zhjj3k2gb4v7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128795,8 +129273,6 @@ self: {
libraryHaskellDepends = [ base either mtl ];
description = "Some convenience facilities for hoisting errors into a monad";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hol" = callPackage
@@ -130162,8 +130638,8 @@ self: {
}:
mkDerivation {
pname = "hpack";
- version = "0.34.2";
- sha256 = "0sn99v1bndbn1if36i4xj1xqcxpihh6yj8ssixypnpwi5vm7hvyf";
+ version = "0.34.3";
+ sha256 = "0gwqmv3p3g9551n405bxrwm7a5ysx3q72q04k5qmicb3mxwwxnff";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -131331,8 +131807,7 @@ self: {
"hs-brotli" = callPackage
({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring
- , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck
- , quickcheck-instances, tasty-quickcheck
+ , ghc-prim, QuickCheck, quickcheck-instances, tasty-quickcheck
}:
mkDerivation {
pname = "hs-brotli";
@@ -131340,7 +131815,6 @@ self: {
sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf";
libraryHaskellDepends = [ base bytestring ghc-prim ];
librarySystemDepends = [ brotlidec brotlienc ];
- libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ];
testHaskellDepends = [
base brotli bytestring QuickCheck quickcheck-instances
tasty-quickcheck
@@ -131349,8 +131823,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {brotlidec = null; brotlienc = null; libbrotlidec = null;
- libbrotlienc = null;};
+ }) {brotlidec = null; brotlienc = null;};
"hs-captcha" = callPackage
({ mkDerivation, base, bytestring, gd, random }:
@@ -134475,8 +134948,8 @@ self: {
}:
mkDerivation {
pname = "hspec-expectations-json";
- version = "1.0.0.0";
- sha256 = "1i6w3qsy25y0aymkcnkycpgrx0dkbsv5a60004hx3fpl5rkbq1aj";
+ version = "1.0.0.1";
+ sha256 = "1k0rlf2l6bq7lmpnwssgnjxbddrssdqf2m5wnpklsrxaxdrvi05g";
libraryHaskellDepends = [
aeson aeson-pretty base Diff HUnit scientific text
unordered-containers vector
@@ -135042,15 +135515,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-wai_0_11_0" = callPackage
+ "hspec-wai_0_11_1" = callPackage
({ mkDerivation, base, base-compat, bytestring, case-insensitive
, hspec, hspec-core, hspec-expectations, http-types, QuickCheck
, text, transformers, wai, wai-extra
}:
mkDerivation {
pname = "hspec-wai";
- version = "0.11.0";
- sha256 = "0fk23vrs5apjy11z47mply2kay3n193gnyrbb9fkpwvmxyhxlp0x";
+ version = "0.11.1";
+ sha256 = "03wiksic5y9a2g6a86nsxrnajdgdvpv17w02h5qla0zp9zs6pa1j";
libraryHaskellDepends = [
base base-compat bytestring case-insensitive hspec-core
hspec-expectations http-types QuickCheck text transformers wai
@@ -137087,36 +137560,6 @@ self: {
}) {};
"http-conduit" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
- , case-insensitive, conduit, conduit-extra, connection, cookie
- , data-default-class, hspec, http-client, http-client-tls
- , http-types, HUnit, mtl, network, resourcet, streaming-commons
- , temporary, text, time, transformers, unliftio, unliftio-core
- , utf8-string, wai, wai-conduit, warp, warp-tls
- }:
- mkDerivation {
- pname = "http-conduit";
- version = "2.3.7.3";
- sha256 = "00rshi1y0h8y4rvsnnad0bppxgpvp40sk7lw1kxmdwy8pi8xrvbs";
- revision = "1";
- editedCabalFile = "0d9mkg8wm943avghjwvq986m667fx63pvvgn2y8gvr6nla8740an";
- libraryHaskellDepends = [
- aeson attoparsec base bytestring conduit conduit-extra http-client
- http-client-tls http-types mtl resourcet transformers unliftio-core
- ];
- testHaskellDepends = [
- aeson base blaze-builder bytestring case-insensitive conduit
- conduit-extra connection cookie data-default-class hspec
- http-client http-types HUnit network resourcet streaming-commons
- temporary text time transformers unliftio utf8-string wai
- wai-conduit warp warp-tls
- ];
- doCheck = false;
- description = "HTTP client package with conduit interface and HTTPS support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http-conduit_2_3_7_4" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, case-insensitive, conduit, conduit-extra, connection, cookie
, data-default-class, hspec, http-client, http-client-tls
@@ -137142,7 +137585,6 @@ self: {
doCheck = false;
description = "HTTP client package with conduit interface and HTTPS support";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-conduit-browser" = callPackage
@@ -137708,19 +138150,19 @@ self: {
"http-rfc7807" = callPackage
({ mkDerivation, aeson, base, call-stack, hspec-expectations-json
- , http-media, http-types, servant, servant-server, tasty
+ , http-media, http-types, HUnit, servant, servant-server, tasty
, tasty-hunit, text
}:
mkDerivation {
pname = "http-rfc7807";
- version = "0.1.0.0";
- sha256 = "1wysqi3rfyg1fb7p9plb6ihcqzvyb2cqhsfx46ciwgym9nxg8lr4";
+ version = "0.2.0.0";
+ sha256 = "0nhdz37sjy2qam2a8zvsx7xpnqykc4z0zhg7a8ii6nmxvfmsbywv";
libraryHaskellDepends = [
aeson base http-media http-types servant servant-server text
];
testHaskellDepends = [
- aeson base call-stack hspec-expectations-json tasty tasty-hunit
- text
+ aeson base call-stack hspec-expectations-json http-types HUnit
+ servant servant-server tasty tasty-hunit text
];
description = "RFC7807 style response messages";
license = stdenv.lib.licenses.bsd3;
@@ -138300,6 +138742,36 @@ self: {
broken = true;
}) {};
+ "hum" = callPackage
+ ({ mkDerivation, base, brick, bytestring, containers, directory
+ , filepath, lens, libmpd, mtl, relude, template-haskell, text
+ , text-zipper, time, transformers, vector, vty, witherable-class
+ }:
+ mkDerivation {
+ pname = "hum";
+ version = "0.1.0.0";
+ sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick bytestring containers directory filepath lens libmpd mtl
+ relude template-haskell text text-zipper time transformers vector
+ vty witherable-class
+ ];
+ executableHaskellDepends = [
+ base brick bytestring containers directory filepath lens libmpd mtl
+ relude template-haskell text text-zipper time transformers vector
+ vty witherable-class
+ ];
+ testHaskellDepends = [
+ base brick bytestring containers directory filepath lens libmpd mtl
+ relude template-haskell text text-zipper time transformers vector
+ vty witherable-class
+ ];
+ description = "A TUI MPD client, inspired by ncmpcpp";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
"human-parse" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
@@ -141428,8 +141900,8 @@ self: {
}:
mkDerivation {
pname = "icepeak";
- version = "0.7.3.0";
- sha256 = "0in02r708s5j8n22900jvnf4iiw87bvs1q5mjmr1yc4vn8vrf4vv";
+ version = "0.7.4.0";
+ sha256 = "1jjcjl0i9brdzflfz4b7fba420rwgmv74b1qz7ii6m4bd7i4jkzp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -143696,6 +144168,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "indexed-traversable" = callPackage
+ ({ mkDerivation, array, base, containers, transformers }:
+ mkDerivation {
+ pname = "indexed-traversable";
+ version = "0.1";
+ sha256 = "1pn0i2zn3qrzmj58aa32vr9fjdr7sh8h50v7yab76q8zxwpxnhlz";
+ libraryHaskellDepends = [ array base containers transformers ];
+ description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
+ "indexed-traversable-instances" = callPackage
+ ({ mkDerivation, base, containers, criterion, indexed-traversable
+ , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "indexed-traversable-instances";
+ version = "0.1";
+ sha256 = "1p38mssyajhwgc7ljnr31q6g18dxbv8r88z1r188xd82g6049v7s";
+ libraryHaskellDepends = [
+ base indexed-traversable tagged unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base containers indexed-traversable QuickCheck quickcheck-instances
+ tasty tasty-quickcheck transformers unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion indexed-traversable unordered-containers
+ vector
+ ];
+ description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"indextype" = callPackage
({ mkDerivation, base, hspec }:
mkDerivation {
@@ -143766,22 +144273,24 @@ self: {
}) {};
"indigo" = callPackage
- ({ mkDerivation, base, cleveland, constraints, containers
+ ({ mkDerivation, base, casing, cleveland, constraints, containers
, directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz
- , megaparsec, morley, morley-prelude, optparse-applicative, process
- , reflection, shelly, singletons, string-interpolate, summoner
- , tasty, tasty-discover, tasty-hedgehog, tasty-hunit-compat, text
- , vinyl, with-utf8
+ , megaparsec, microlens-th, morley, morley-prelude
+ , optparse-applicative, process, reflection, shelly, singletons
+ , string-interpolate, summoner, tasty, tasty-discover
+ , tasty-hedgehog, tasty-hunit-compat, template-haskell, text, vinyl
+ , with-utf8
}:
mkDerivation {
pname = "indigo";
- version = "0.3.1";
- sha256 = "1xc2gk7bihgpv78cl1c15x1izwsazmdpdsagan4d6yd0zw30xci4";
+ version = "0.4";
+ sha256 = "1qa6xbzyfl1f1c6kw71b0zi538zxql07kidkmsjz91sy9nrc93ml";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base constraints containers lorentz morley morley-prelude
- reflection singletons vinyl with-utf8
+ base casing constraints containers fmt lorentz microlens-th morley
+ morley-prelude reflection singletons template-haskell vinyl
+ with-utf8
];
executableHaskellDepends = [
base directory megaparsec morley morley-prelude
@@ -144270,8 +144779,8 @@ self: {
}:
mkDerivation {
pname = "inline-r";
- version = "0.10.3";
- sha256 = "15wkf1lxc7syp6kcf7d10lxn013q5mnvdl113sbhnchq92q7npgj";
+ version = "0.10.4";
+ sha256 = "0jvfi2izhxn0n5xzz6rhhfs3fxlx7p1mhd9pjrazqckib14jw8ml";
libraryHaskellDepends = [
aeson base bytestring containers data-default-class deepseq
exceptions inline-c mtl pretty primitive process reflection setenv
@@ -151120,6 +151629,22 @@ self: {
broken = true;
}) {};
+ "katip-logstash" = callPackage
+ ({ mkDerivation, aeson, base, katip, logstash, retry, stm
+ , stm-chans, text, transformers, unliftio
+ }:
+ mkDerivation {
+ pname = "katip-logstash";
+ version = "0.1.0.0";
+ sha256 = "16rw2bxbi5kklz6pz8zj7dq7as58v4yfjq7npnlyyx658nvhia6l";
+ libraryHaskellDepends = [
+ aeson base katip logstash retry stm stm-chans text transformers
+ unliftio
+ ];
+ description = "Logstash backend for katip";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"katip-logzio" = callPackage
({ mkDerivation, aeson, async, base, bytestring, errors, hedgehog
, hostname, http-client, http-client-tls, http-types, katip, retry
@@ -151146,6 +151671,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "katip-raven" = callPackage
+ ({ mkDerivation, aeson, base, katip, raven-haskell, string-conv
+ , text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "katip-raven";
+ version = "0.1.0.0";
+ sha256 = "107hb8rn6si77ms9hp72494ah4ismfivkf8xgldy1jk2ifqgxc0d";
+ libraryHaskellDepends = [
+ aeson base katip raven-haskell string-conv text
+ unordered-containers
+ ];
+ description = "Katip scribe for raven (https://sentry.io)";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"katip-rollbar" = callPackage
({ mkDerivation, aeson, async, base, hostname, http-client, katip
, rollbar-hs, stm-chans, text, time
@@ -151916,8 +152457,8 @@ self: {
}:
mkDerivation {
pname = "kempe";
- version = "0.1.0.1";
- sha256 = "0wnjljwnwy9qq575v493y2dsbimks3plbsripfrjph0ldpianrdm";
+ version = "0.1.1.0";
+ sha256 = "1vxk9a0vjkg1mcb0mhvrkh2cjgb0g42bxh6rwih8q6nh2gs7q55h";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -151927,10 +152468,12 @@ self: {
transformers
];
libraryToolDepends = [ alex happy ];
- executableHaskellDepends = [ base optparse-applicative ];
+ executableHaskellDepends = [
+ base bytestring optparse-applicative prettyprinter
+ ];
testHaskellDepends = [
- base bytestring deepseq filepath prettyprinter process tasty
- tasty-golden tasty-hunit temporary
+ base bytestring composition-prelude deepseq filepath prettyprinter
+ process tasty tasty-golden tasty-hunit temporary text
];
benchmarkHaskellDepends = [
base bytestring criterion prettyprinter text
@@ -152206,8 +152749,8 @@ self: {
}:
mkDerivation {
pname = "keystore";
- version = "0.8.1.1";
- sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy";
+ version = "0.8.2.0";
+ sha256 = "1y91mdy9gpzwxcf2h9s4afs9lzyxrffq4qhrip0ygvyd8qr8x95m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -157204,8 +157747,8 @@ self: {
pname = "lens-aeson";
version = "1.1";
sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p";
- revision = "2";
- editedCabalFile = "1ivxsj7igrrrzkwhw7ipcxnnr721797is6yfsrh3mha9dl8985sf";
+ revision = "3";
+ editedCabalFile = "10zm8r29c3hb5saxv3ryr67nsg8rf4dk67yjwysasd3jpkxghj5p";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base bytestring lens scientific text
@@ -157743,8 +158286,8 @@ self: {
}:
mkDerivation {
pname = "less-arbitrary";
- version = "0.1.0.2";
- sha256 = "0xqhlk4qqykb173pm6akd7jvygm5ya3qqw3xc649aiq053ralvif";
+ version = "0.1.4.0";
+ sha256 = "1rd21mnvr3wwzbl09070jmzbg7zl05kviaggpycyxybj4sq8lxm3";
libraryHaskellDepends = [
base containers email-validate generic-arbitrary genvalidity
genvalidity-hspec genvalidity-property hashable hspec mtl
@@ -158105,8 +158648,8 @@ self: {
}:
mkDerivation {
pname = "libarchive";
- version = "3.0.1.1";
- sha256 = "1i5801prr06vachxrpcc31bsxhsb6f8ik91mx7a9hmqkwhpr986b";
+ version = "3.0.2.0";
+ sha256 = "1v6mx8li7dp1pzp6qzsql3hcapj7l7ia3b3nala0xzw2r7jvmc4l";
setupHaskellDepends = [ base Cabal chs-cabal ];
libraryHaskellDepends = [
base bytestring composition-prelude deepseq dlist filepath mtl
@@ -158966,6 +159509,18 @@ self: {
license = stdenv.lib.licenses.gpl3Plus;
}) {inherit (pkgs) libtelnet;};
+ "libversion" = callPackage
+ ({ mkDerivation, base, bytestring, libversion }:
+ mkDerivation {
+ pname = "libversion";
+ version = "0.1.0";
+ sha256 = "0w5maaklglbxp7k0ah699w1mhjsjrpgw9n7axld319dpfdwhl94j";
+ libraryHaskellDepends = [ base bytestring ];
+ libraryPkgconfigDepends = [ libversion ];
+ description = "Haskell binding to libversion";
+ license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) libversion;};
+
"libvirt-hs" = callPackage
({ mkDerivation, base, c2hs, libvirt, syb, unix }:
mkDerivation {
@@ -162700,8 +163255,8 @@ self: {
}:
mkDerivation {
pname = "logging-effect";
- version = "1.3.11";
- sha256 = "1r5qfip5xl22hq2v27b1lkcknixmc40wm7iya7vs3mrnwyavpmdb";
+ version = "1.3.12";
+ sha256 = "1bbh7aq3sbyya0w4p0qkkrryy7mpxw4s4cj2s6zvdsqq9fg2fpda";
libraryHaskellDepends = [
async base exceptions free monad-control mtl prettyprinter
semigroups stm stm-delay text time transformers transformers-base
@@ -162942,6 +163497,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "logstash" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, data-default-class
+ , exceptions, monad-control, mtl, network, resource-pool, resourcet
+ , retry, stm, stm-chans, time, tls, unbounded-delays, unliftio
+ }:
+ mkDerivation {
+ pname = "logstash";
+ version = "0.1.0.0";
+ sha256 = "0cxdrp7snp1pvz63127spi4m5zb04w549fkwhariyj5ql7lcbdn6";
+ libraryHaskellDepends = [
+ aeson async base bytestring data-default-class exceptions
+ monad-control mtl network resource-pool resourcet retry stm
+ stm-chans time tls unbounded-delays unliftio
+ ];
+ description = "Logstash client library for Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"lojban" = callPackage
({ mkDerivation, base, containers, curl, directory, haskell98, HTTP
, markov-chain, mtl, parsec, process, random, regex-compat, strict
@@ -166920,8 +167493,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.5.7.0";
- sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62";
+ version = "0.5.8.0";
+ sha256 = "0p469736yydr7lbfr4vd51al4mvx6fb4s9zxc420fvb9f7v00jsb";
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
scheduler unliftio-core vector
@@ -168534,6 +169107,8 @@ self: {
pname = "megaparsec";
version = "9.0.1";
sha256 = "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j";
+ revision = "1";
+ editedCabalFile = "00vjc5b1x6yd0jqsbcahvghlkwai65dl1ib6744a0lhsa9vsni12";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -168555,6 +169130,8 @@ self: {
pname = "megaparsec-tests";
version = "9.0.1";
sha256 = "0synm14x1k9r5q7xmv21z0y95b42g7lvwn78mcnc3cx62x6393ng";
+ revision = "1";
+ editedCabalFile = "1iz18gmhqvxwiw6r35nd6p2m3zjpzsy0bzhwgbfxpjbvvcgy8736";
libraryHaskellDepends = [
base bytestring containers hspec hspec-expectations
hspec-megaparsec megaparsec mtl QuickCheck text transformers
@@ -170186,6 +170763,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microstache_1_0_1_2" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , directory, filepath, hspec, parsec, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microstache";
+ version = "1.0.1.2";
+ sha256 = "1xdca11z5cy7vfy2dszhr6qvlrxw6pn0d9iri7mg56lvi02javik";
+ libraryHaskellDepends = [
+ aeson base containers deepseq directory filepath parsec text
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec parsec text
+ ];
+ description = "Mustache templates for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microtimer" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -171631,8 +172229,8 @@ self: {
}:
mkDerivation {
pname = "mixpanel-client";
- version = "0.2.1";
- sha256 = "1gangs1ivbg0hyc804flmxq7fgai3qlf2fnsw1r9dyjb5d91smp1";
+ version = "0.3.0";
+ sha256 = "1yk4p1cyw0gz9q9j7sw4mnfp2597a0k84l8ygpp2f0fndj6jmw4m";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring http-client http-client-tls
servant servant-client string-conv text time
@@ -171861,6 +172459,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mmsyn2-array" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "mmsyn2-array";
+ version = "0.1.1.0";
+ sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny";
+ libraryHaskellDepends = [ base ];
+ description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"mmsyn3" = callPackage
({ mkDerivation, base, directory }:
mkDerivation {
@@ -171873,20 +172482,15 @@ self: {
}) {};
"mmsyn4" = callPackage
- ({ mkDerivation, base, directory, mmsyn2, mmsyn3, process, vector
- }:
+ ({ mkDerivation, base, directory, mmsyn3, process }:
mkDerivation {
pname = "mmsyn4";
- version = "0.5.0.0";
- sha256 = "05r33lx2cxsf7a14809dgs7lhfqlglshpv22jfzrl2xy0rl3x4qz";
+ version = "0.6.3.0";
+ sha256 = "06lp72rbkna5hrw8zbwz7wqijchcbc9y1nl5d1gp4z3gq1324za5";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [
- base directory mmsyn2 mmsyn3 process vector
- ];
- executableHaskellDepends = [
- base directory mmsyn2 mmsyn3 process vector
- ];
+ libraryHaskellDepends = [ base directory mmsyn3 process ];
+ executableHaskellDepends = [ base directory mmsyn3 process ];
description = "The \"glue\" between electronic tables and GraphViz";
license = stdenv.lib.licenses.mit;
}) {};
@@ -171925,6 +172529,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mmsyn6ukr-array" = callPackage
+ ({ mkDerivation, base, bytestring, directory, mmsyn2-array, mmsyn3
+ , mmsyn5, process, ukrainian-phonetics-basic-array
+ }:
+ mkDerivation {
+ pname = "mmsyn6ukr-array";
+ version = "0.1.0.0";
+ sha256 = "10ljcy283938aq3r90k325mplpiwikpwzm9wci4yrvsf8v7wvdsd";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring directory mmsyn2-array mmsyn3 mmsyn5 process
+ ukrainian-phonetics-basic-array
+ ];
+ executableHaskellDepends = [
+ base bytestring directory mmsyn2-array mmsyn3 mmsyn5 process
+ ukrainian-phonetics-basic-array
+ ];
+ description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"mmsyn7h" = callPackage
({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
, mmsyn6ukr, mmsyn7s, mmsyn7ukr, process, vector
@@ -173142,20 +173769,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "monad-logger-logstash" = callPackage
+ ({ mkDerivation, aeson, base, logstash, monad-logger, retry, stm
+ , stm-chans, text, transformers, unliftio
+ }:
+ mkDerivation {
+ pname = "monad-logger-logstash";
+ version = "0.1.0.0";
+ sha256 = "1k8k5dymnjz2k4iabvwdvy8wzs8gpgqhppsr01z9r32bsslcd5ch";
+ libraryHaskellDepends = [
+ aeson base logstash monad-logger retry stm stm-chans text
+ transformers unliftio
+ ];
+ description = "Logstash backend for monad-logger";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"monad-logger-prefix" = callPackage
- ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
- , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
- , transformers, transformers-base
+ ({ mkDerivation, base, criterion, exceptions, monad-control
+ , monad-logger, mtl, resourcet, text, transformers
+ , transformers-base, unliftio-core
}:
mkDerivation {
pname = "monad-logger-prefix";
- version = "0.1.11";
- sha256 = "0zw591nqgyqy37vj0vmyyd2m7v6cyx8bgwfm1xhf1ppbxhjx38nv";
+ version = "0.1.12";
+ sha256 = "00gsp7mhvqvfbdh75lgr73j5adw3hd4cp969h241gaw892z3qvws";
libraryHaskellDepends = [
base exceptions monad-control monad-logger mtl resourcet text
- transformers transformers-base
+ transformers transformers-base unliftio-core
];
- testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
benchmarkHaskellDepends = [ base criterion monad-logger ];
description = "Add prefixes to your monad-logger output";
license = stdenv.lib.licenses.asl20;
@@ -173281,8 +173923,8 @@ self: {
}:
mkDerivation {
pname = "monad-metrics";
- version = "0.2.1.4";
- sha256 = "0h83kh1qc3wf9i0l8k998zib6fvf8fpwzn3qiz0d6z7az0i947cf";
+ version = "0.2.2.0";
+ sha256 = "13wsz9c02jsh5sh2kka1v7kna1aij51794n7g52ib27qmxgg9qvq";
libraryHaskellDepends = [
base clock ekg-core exceptions hashable microlens mtl text
transformers unordered-containers
@@ -179296,8 +179938,8 @@ self: {
}:
mkDerivation {
pname = "nanovg-simple";
- version = "0.4.0.0";
- sha256 = "0k9sykyipj6gndkgk9j2l4r7a4kac851g077279a2j1k45dilcjn";
+ version = "0.5.0.0";
+ sha256 = "0z4gif0n56799llcm0l1p1d2qzxvfyrxvgzny58d8ymsgizldp6d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -179915,6 +180557,37 @@ self: {
broken = true;
}) {};
+ "neptune-backend" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, containers, deepseq, envy, exceptions, hspec
+ , http-api-data, http-client, http-client-tls, http-media
+ , http-types, iso8601-time, jwt, katip, lens, lens-aeson, microlens
+ , modern-uri, mtl, network, QuickCheck, random, req, rio
+ , safe-exceptions, semigroups, text, time, transformers
+ , unordered-containers, uuid, vector
+ }:
+ mkDerivation {
+ pname = "neptune-backend";
+ version = "0.1.1";
+ sha256 = "12qvnkixx53a0a4n88ywh3q6has8h2p3cclk6lfkz9l0p4f7qy42";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring case-insensitive containers
+ deepseq envy exceptions http-api-data http-client http-client-tls
+ http-media http-types iso8601-time jwt katip lens lens-aeson
+ microlens modern-uri mtl network random req rio safe-exceptions
+ text time transformers unordered-containers uuid vector
+ ];
+ executableHaskellDepends = [ base mtl rio ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+ semigroups text time transformers unordered-containers vector
+ ];
+ description = "Auto-generated neptune-backend API Client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"nerf" = callPackage
({ mkDerivation, base, binary, bytestring, cmdargs, containers
, crf-chain1, data-named, dawg, directory, filepath, IntervalMap
@@ -181023,8 +181696,8 @@ self: {
({ mkDerivation, base, bytestring, network, text, time, vector }:
mkDerivation {
pname = "network-carbon";
- version = "1.0.14";
- sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b";
+ version = "1.0.15";
+ sha256 = "1w6a267h6svgx4wvbjy134wl2cvjdgicb0hcyrmb3z1d6bgy09dv";
libraryHaskellDepends = [
base bytestring network text time vector
];
@@ -182434,8 +183107,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools-extra";
- version = "0.6.0.1";
- sha256 = "0xgnjriq9c3r9vpnkm0ldjqghss9ahjzk8ckrwq59bmdhns3fvx9";
+ version = "0.6.1.1";
+ sha256 = "1gqns0ifrmjd1013jfa9c03xwdmqicdvazjc9kkxyzw4mpjgjils";
libraryHaskellDepends = [
aeson array base base64 binary bytestring case-insensitive
containers ede enclosed-exceptions http-client http-types network
@@ -186743,8 +187416,8 @@ self: {
}:
mkDerivation {
pname = "openapi3";
- version = "3.0.0.1";
- sha256 = "12sa72v9iljq40r05ikcf336724v5cc3qznc30ba8b8bm4b29r8m";
+ version = "3.0.1.0";
+ sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -188453,14 +189126,16 @@ self: {
"ordinal" = callPackage
({ mkDerivation, base, containers, data-default, hspec
- , hspec-discover, QuickCheck, regex, template-haskell, text, vector
+ , hspec-discover, QuickCheck, regex, template-haskell, text, time
+ , vector
}:
mkDerivation {
pname = "ordinal";
- version = "0.3.1.0";
- sha256 = "16y8a4xrrna6cwzy8lvvykdb9jgk5qswrwd8dn7iqgmhqck271x8";
+ version = "0.4.0.0";
+ sha256 = "1k0hpp5p546zlvwsy1d8hypryfwqvqdifmk3cqifw3xsdrqv3d8y";
libraryHaskellDepends = [
- base containers data-default regex template-haskell text vector
+ base containers data-default regex template-haskell text time
+ vector
];
testHaskellDepends = [ base hspec QuickCheck text ];
testToolDepends = [ hspec-discover ];
@@ -189400,6 +190075,24 @@ self: {
broken = true;
}) {};
+ "paddle" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , containers, HsOpenSSL, http-api-data, http-client, protolude
+ , scientific, servant, servant-client, servant-client-core, time
+ }:
+ mkDerivation {
+ pname = "paddle";
+ version = "0.1.0.0";
+ sha256 = "0j08q2a2hgh5wga114fmbcl5jn44cs6a6ajh1924l5akd0dvairc";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring containers HsOpenSSL
+ http-api-data http-client protolude scientific servant
+ servant-client servant-client-core time
+ ];
+ description = "API to the Paddle payment processor";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pads-haskell" = callPackage
({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim
, haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec
@@ -189694,8 +190387,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "2.11.2";
- sha256 = "10p2vmdjwgbzrbzrpsplbs67pycwz91aww4iz1rclw382xag42nb";
+ version = "2.11.3";
+ sha256 = "186bync51lknmfmganz0lvid6rrrlmydf6x4b65dnhz5xjng98xq";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -189820,8 +190513,6 @@ self: {
];
description = "Pandoc filter for cross-references";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pandoc-csv2table" = callPackage
@@ -189987,8 +190678,6 @@ self: {
];
description = "A Pandoc filter for including code from source files";
license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pandoc-japanese-filters" = callPackage
@@ -190025,6 +190714,19 @@ self: {
broken = true;
}) {};
+ "pandoc-link-context" = callPackage
+ ({ mkDerivation, base, containers, pandoc-types, relude, text }:
+ mkDerivation {
+ pname = "pandoc-link-context";
+ version = "1.0.0.0";
+ sha256 = "0pl232p0cdn810jyp3xjdhf3zfj6ryjmb1f462l4jivawffyjfd4";
+ libraryHaskellDepends = [
+ base containers pandoc-types relude text
+ ];
+ description = "Extract \"contextual links\" from Pandoc";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pandoc-markdown-ghci-filter" = callPackage
({ mkDerivation, aeson, base, containers, ghcid, pandoc
, pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -191436,8 +192138,8 @@ self: {
pname = "parsec";
version = "3.1.14.0";
sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67";
- revision = "1";
- editedCabalFile = "0dhg5xwqnig83hbkpawqi1k2prrps7jhkj4gb3ccram2drfmb933";
+ revision = "2";
+ editedCabalFile = "1xyjd06nns0k65k4ig2azrijy43gnbvpcfwb3jpd8vmn2fnk0yib";
libraryHaskellDepends = [ base bytestring mtl text ];
testHaskellDepends = [
base HUnit mtl test-framework test-framework-hunit
@@ -192146,23 +192848,21 @@ self: {
"password" = callPackage
({ mkDerivation, base, base-compat, base64, bytestring, Cabal
, cabal-doctest, cryptonite, doctest, memory, QuickCheck
- , quickcheck-instances, scrypt, tasty, tasty-quickcheck
- , template-haskell, text
+ , quickcheck-instances, scrypt, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, text
}:
mkDerivation {
pname = "password";
- version = "2.0.1.1";
- sha256 = "1fi39w79p7jaw85i5r8f4flw7s1n2ljxj5ci9gda6a556015w1p8";
- revision = "1";
- editedCabalFile = "1r27scxmkmvw8nbcg4x3k10ibq4qhrmpwgnqbnz32g1fvw7mlxg3";
+ version = "2.1.0.0";
+ sha256 = "1v8hbjy0r6l0c6r0l4832z9whadx195fzxpn9l19zjb5ylz1zmqc";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- base base64 bytestring cryptonite memory text
+ base base64 bytestring cryptonite memory template-haskell text
];
testHaskellDepends = [
base base-compat bytestring cryptonite doctest memory QuickCheck
- quickcheck-instances scrypt tasty tasty-quickcheck template-haskell
- text
+ quickcheck-instances scrypt tasty tasty-hunit tasty-quickcheck
+ template-haskell text
];
description = "Hashing and checking of passwords";
license = stdenv.lib.licenses.bsd3;
@@ -193119,6 +193819,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pcre2" = callPackage
+ ({ mkDerivation, base, containers, criterion, hspec
+ , microlens-platform, mtl, pcre-light, regex-pcre-builtin
+ , template-haskell, text, transformers
+ }:
+ mkDerivation {
+ pname = "pcre2";
+ version = "1.1.0";
+ sha256 = "0vj8c8yis5gdsbg5ifn8fpya989ikavglyvqasic029ffr6cskfb";
+ libraryHaskellDepends = [
+ base containers mtl template-haskell text transformers
+ ];
+ testHaskellDepends = [
+ base containers hspec microlens-platform mtl template-haskell text
+ transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion microlens-platform mtl pcre-light
+ regex-pcre-builtin template-haskell text transformers
+ ];
+ description = "Regular expressions via the PCRE2 C library (included)";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"pdf-slave" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, containers, directory, exceptions, haskintex, HaTeX
@@ -194356,17 +195080,18 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
- "persistent_2_11_0_1" = callPackage
+ "persistent_2_11_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, blaze-html, bytestring, conduit, containers, fast-logger, hspec
, http-api-data, monad-logger, mtl, path-pieces, resource-pool
- , resourcet, scientific, silently, text, time, transformers
- , unliftio, unliftio-core, unordered-containers, vector
+ , resourcet, scientific, shakespeare, silently, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ , vector
}:
mkDerivation {
pname = "persistent";
- version = "2.11.0.1";
- sha256 = "0nmgjk5jpsh7dxwyghvmnislxj8m77sdp9hg6anh7ba94xs7wcjv";
+ version = "2.11.0.2";
+ sha256 = "09dvwh9hdc50zr6yvbzp8a9n70yjqwa2kzvjm80l9m34p29v8kkc";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data monad-logger mtl
@@ -194375,8 +195100,8 @@ self: {
];
testHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
- containers hspec http-api-data path-pieces scientific text time
- transformers unordered-containers vector
+ containers hspec http-api-data path-pieces scientific shakespeare
+ text time transformers unordered-containers vector
];
description = "Type-safe, multi-backend data serialization";
license = stdenv.lib.licenses.mit;
@@ -194611,6 +195336,31 @@ self: {
broken = true;
}) {};
+ "persistent-mtl" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, containers
+ , monad-logger, mtl, persistent, persistent-postgresql
+ , persistent-sqlite, persistent-template, resource-pool, resourcet
+ , resourcet-pool, tasty, tasty-golden, tasty-hunit, text
+ , transformers, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "persistent-mtl";
+ version = "0.2.0.0";
+ sha256 = "0c22frczi2km3z108iz211gl023m69cjc284dwbknabsrl3yg4l5";
+ libraryHaskellDepends = [
+ base conduit containers mtl persistent resource-pool resourcet
+ resourcet-pool text transformers unliftio unliftio-core
+ ];
+ testHaskellDepends = [
+ base bytestring conduit containers monad-logger persistent
+ persistent-postgresql persistent-sqlite persistent-template
+ resource-pool resourcet tasty tasty-golden tasty-hunit text
+ unliftio
+ ];
+ description = "Monad transformer for the persistent API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"persistent-mysql" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
, containers, fast-logger, hspec, HUnit, monad-logger, mysql
@@ -194637,7 +195387,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "persistent-mysql_2_10_3" = callPackage
+ "persistent-mysql_2_10_3_1" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
, containers, fast-logger, hspec, HUnit, monad-logger, mysql
, mysql-simple, persistent, persistent-qq, persistent-template
@@ -194646,8 +195396,8 @@ self: {
}:
mkDerivation {
pname = "persistent-mysql";
- version = "2.10.3";
- sha256 = "1da2vbkz55lngpi5ggndnnxv8gm9ckcv3gd3y8z47yh129b04csk";
+ version = "2.10.3.1";
+ sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit containers monad-logger
mysql mysql-simple persistent resource-pool resourcet text
@@ -194781,7 +195531,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "persistent-postgresql_2_11_0_0" = callPackage
+ "persistent-postgresql_2_11_0_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, conduit, containers, fast-logger, hspec, hspec-expectations
, HUnit, monad-logger, mtl, persistent, persistent-qq
@@ -194792,8 +195542,8 @@ self: {
}:
mkDerivation {
pname = "persistent-postgresql";
- version = "2.11.0.0";
- sha256 = "12h72dj6zmk8m45m62syc3inwvqgb03whymi7wds0aklzn4j83b4";
+ version = "2.11.0.1";
+ sha256 = "08bmf52fqjwzyw4dnvh2ql4q3ai05fzzicgd5z6bim13b9s4ggmk";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder bytestring conduit containers
monad-logger mtl persistent postgresql-libpq postgresql-simple
@@ -195888,8 +196638,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-plus";
- version = "0.1.0.0";
- sha256 = "1yzqrqkikkx6ii1n7zs5vf1k5m26v8bj8m0h43zmxb1j30klh2ir";
+ version = "0.2.0.0";
+ sha256 = "05xzmkzx3lc070ln6q2ynbqfh6rb70rx1n845gy0i59h6zpsl9ai";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base lists-flines ];
@@ -195935,8 +196685,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-common";
- version = "0.3.4.0";
- sha256 = "1cf2k35jljcbyzyfz85nsxjzh5wdiipm9sa558gky26yz1h3n54x";
+ version = "0.4.0.0";
+ sha256 = "02fc9cd1ad5m8qsi73zxzhz80g24q0brlhnxswzmmsxsmp4y2542";
libraryHaskellDepends = [
base phonetic-languages-permutations subG subG-instances vector
];
@@ -195949,27 +196699,27 @@ self: {
, phonetic-languages-constraints, phonetic-languages-permutations
, phonetic-languages-plus, phonetic-languages-rhythmicity
, phonetic-languages-simplified-common
- , phonetic-languages-simplified-properties-lists
+ , phonetic-languages-simplified-properties-lists-double
, phonetic-languages-ukrainian, print-info, subG
, ukrainian-phonetics-basic, uniqueness-periods-vector-filters
, uniqueness-periods-vector-stats, vector
}:
mkDerivation {
pname = "phonetic-languages-simplified-lists-examples";
- version = "0.4.0.0";
- sha256 = "18n45cz6x8lh8pphnipp24xjjf8j5h6kskmkr6x4l5y5qi13ld4x";
+ version = "0.6.0.0";
+ sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base heaps mmsyn2 phonetic-languages-constraints
phonetic-languages-simplified-common
- phonetic-languages-simplified-properties-lists vector
+ phonetic-languages-simplified-properties-lists-double vector
];
executableHaskellDepends = [
base heaps mmsyn2 parallel phonetic-languages-constraints
phonetic-languages-permutations phonetic-languages-plus
phonetic-languages-rhythmicity phonetic-languages-simplified-common
- phonetic-languages-simplified-properties-lists
+ phonetic-languages-simplified-properties-lists-double
phonetic-languages-ukrainian print-info subG
ukrainian-phonetics-basic uniqueness-periods-vector-filters
uniqueness-periods-vector-stats vector
@@ -195996,6 +196746,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "phonetic-languages-simplified-properties-lists-double" = callPackage
+ ({ mkDerivation, base, phonetic-languages-rhythmicity
+ , phonetic-languages-simplified-common, ukrainian-phonetics-basic
+ , vector
+ }:
+ mkDerivation {
+ pname = "phonetic-languages-simplified-properties-lists-double";
+ version = "0.1.0.0";
+ sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl";
+ libraryHaskellDepends = [
+ base phonetic-languages-rhythmicity
+ phonetic-languages-simplified-common ukrainian-phonetics-basic
+ vector
+ ];
+ description = "A generalization of the uniqueness-periods-vector-properties package";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"phonetic-languages-ukrainian" = callPackage
({ mkDerivation, base, mmsyn2, mmsyn5, vector }:
mkDerivation {
@@ -196499,8 +197267,8 @@ self: {
}:
mkDerivation {
pname = "pinboard";
- version = "0.10.1.4";
- sha256 = "1kmkxcvkfqwp2p46s22gdnvk12g7bx9dqr8cs04wjw1rbj0mli49";
+ version = "0.10.2.0";
+ sha256 = "12hwfgqkn7sym9hig0b0afnzf0an6wcwdw9bc166y3539r3v13ck";
libraryHaskellDepends = [
aeson base bytestring containers http-client http-client-tls
http-types monad-logger mtl network profunctors random text time
@@ -197771,8 +198539,8 @@ self: {
}:
mkDerivation {
pname = "pipes-text";
- version = "0.0.2.5";
- sha256 = "0ahgkism9q5qda1iq45h9sc36vqyna017pf4kw28gzgbm01fx2a4";
+ version = "1.0.0";
+ sha256 = "0q01amm5813qpbkj9098mkd6h1a65vc864qjk2vgd4h80vx2a6mi";
libraryHaskellDepends = [
base bytestring pipes pipes-bytestring pipes-group pipes-parse
pipes-safe streaming-commons text transformers
@@ -199086,8 +199854,8 @@ self: {
}:
mkDerivation {
pname = "pointfree";
- version = "1.1.1.6";
- sha256 = "1rsr9vgqq10ydwan2qvghgfvff5m75ivl8md8r8yxffbw0spiwsv";
+ version = "1.1.1.7";
+ sha256 = "19yvkh4akcsiy0blmrwy7ayirg729s3vs4w0qkb2w171aas34090";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199774,8 +200542,8 @@ self: {
}:
mkDerivation {
pname = "polysemy-methodology";
- version = "0.1.7.0";
- sha256 = "1qb2rj2fc7vaf9i0lm9gqzkfy5a8zmsq9ibvhmc4457yd3k7cfcg";
+ version = "0.1.8.0";
+ sha256 = "0p4h6vjrq6g6pd27mqpzp33jg84gfi3wpymjkbxfrwz7ky74jag5";
libraryHaskellDepends = [
base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
];
@@ -201643,8 +202411,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "postgresql-tx";
- version = "0.1.0.0";
- sha256 = "1jvrdyllmgd0v9w2wxqr1g70f6gza1wyb13j38ww2r2nvqzhp330";
+ version = "0.3.0.0";
+ sha256 = "1q8yh16wxgfdvr3090i395ba20lzv2iyq5sswrzm9slcbnan353d";
libraryHaskellDepends = [ base transformers ];
description = "A safe transaction monad for use with various PostgreSQL Haskell libraries";
license = stdenv.lib.licenses.bsd3;
@@ -201654,25 +202422,27 @@ self: {
({ mkDerivation, base, monad-logger, postgresql-tx }:
mkDerivation {
pname = "postgresql-tx-monad-logger";
- version = "0.1.0.0";
- sha256 = "0y1x2d2r61ayhln0l2c5i3ivv97zpwyiaw1hymghpv4vwnlihv1y";
+ version = "0.3.0.0";
+ sha256 = "00gyhjfq13rknh4hpizmfizqv84b8l8ziik36gjyq1vsmfg5da43";
libraryHaskellDepends = [ base monad-logger postgresql-tx ];
description = "postgresql-tx interfacing for use with monad-logger";
license = stdenv.lib.licenses.bsd3;
}) {};
"postgresql-tx-query" = callPackage
- ({ mkDerivation, base, monad-logger, mtl, postgresql-query
- , postgresql-simple, postgresql-tx, postgresql-tx-monad-logger
- , transformers
+ ({ mkDerivation, base, exceptions, monad-control, monad-logger, mtl
+ , postgresql-query, postgresql-simple, postgresql-tx
+ , postgresql-tx-monad-logger, postgresql-tx-simple, transformers
+ , transformers-base
}:
mkDerivation {
pname = "postgresql-tx-query";
- version = "0.1.0.0";
- sha256 = "0a7khw9ncc8k5cpi63kw598hvg3ycm1lchz46aw06pndcdzr54sv";
+ version = "0.3.0.0";
+ sha256 = "0d2i0djylqbmr4xd1hmxvcqv26xvlkkm0aflxzcz6b4vcb43b6lc";
libraryHaskellDepends = [
- base monad-logger mtl postgresql-query postgresql-simple
- postgresql-tx postgresql-tx-monad-logger transformers
+ base exceptions monad-control monad-logger mtl postgresql-query
+ postgresql-simple postgresql-tx postgresql-tx-monad-logger
+ postgresql-tx-simple transformers transformers-base
];
description = "postgresql-tx interfacing for use with postgresql-query";
license = stdenv.lib.licenses.bsd3;
@@ -201681,15 +202451,15 @@ self: {
}) {};
"postgresql-tx-simple" = callPackage
- ({ mkDerivation, base, postgresql-simple, postgresql-tx
+ ({ mkDerivation, base, bytestring, postgresql-simple, postgresql-tx
, transformers
}:
mkDerivation {
pname = "postgresql-tx-simple";
- version = "0.1.0.0";
- sha256 = "1k03wqqzsvmmd7wh9gnlg9h12v2xnzd1vc9396sl1krg29l8373p";
+ version = "0.3.0.0";
+ sha256 = "1n11n20yx60kkxccg59mmr1mz75p80r4q72kc2gmbkw26dn3al1z";
libraryHaskellDepends = [
- base postgresql-simple postgresql-tx transformers
+ base bytestring postgresql-simple postgresql-tx transformers
];
description = "postgresql-tx interfacing for use with postgresql-simple";
license = stdenv.lib.licenses.bsd3;
@@ -201697,15 +202467,15 @@ self: {
"postgresql-tx-squeal" = callPackage
({ mkDerivation, base, bytestring, generics-sop, postgresql-libpq
- , postgresql-tx, records-sop, squeal-postgresql
+ , postgresql-tx, records-sop, squeal-postgresql, unliftio
}:
mkDerivation {
pname = "postgresql-tx-squeal";
- version = "0.1.0.0";
- sha256 = "08wfdy6hlpwkv3njh33igskv489kk8zbsd1nk24fvql1w215gsa4";
+ version = "0.3.0.0";
+ sha256 = "1l0xjyjcwq0ndrc49alrp7ixs2dl1z4krdaclws8nf5pcpd03ap8";
libraryHaskellDepends = [
base bytestring generics-sop postgresql-libpq postgresql-tx
- records-sop squeal-postgresql
+ records-sop squeal-postgresql unliftio
];
description = "postgresql-tx interfacing for use with squeal-postgresql";
license = stdenv.lib.licenses.bsd3;
@@ -201713,6 +202483,21 @@ self: {
broken = true;
}) {};
+ "postgresql-tx-squeal-compat-simple" = callPackage
+ ({ mkDerivation, base, postgresql-simple, postgresql-tx-squeal }:
+ mkDerivation {
+ pname = "postgresql-tx-squeal-compat-simple";
+ version = "0.2.0.0";
+ sha256 = "1n167zsslba4c8m91s26ir7gibb09gjx82q1r8l5ilxx10856a89";
+ libraryHaskellDepends = [
+ base postgresql-simple postgresql-tx-squeal
+ ];
+ description = "Connection interop from postgresql-simple connections to postgresql-libpq connections";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"postgresql-typed" = callPackage
({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
, containers, convertible, criterion, cryptonite, data-default
@@ -203644,6 +204429,8 @@ self: {
pname = "primitive";
version = "0.7.1.0";
sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb";
+ revision = "1";
+ editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977";
libraryHaskellDepends = [ base deepseq transformers ];
testHaskellDepends = [
base base-orphans ghc-prim QuickCheck quickcheck-classes-base
@@ -205135,18 +205922,19 @@ self: {
"prolude" = callPackage
({ mkDerivation, aeson, base, bytestring, cassava, containers
- , generic-random, mongoDB, mtl, persistent, persistent-mongoDB
- , QuickCheck, quickcheck-instances, safe-exceptions, scientific
- , swagger2, text, time, uuid, vector
+ , generic-random, lens, mongoDB, mtl, persistent
+ , persistent-mongoDB, QuickCheck, quickcheck-instances
+ , safe-exceptions, scientific, swagger2, text, time, uuid, vector
}:
mkDerivation {
pname = "prolude";
- version = "0.0.0.12";
- sha256 = "09z9716pjyxzpqn3qc0zsi9mz03vf1qnb1q5bcf66bvb1kfj0phw";
+ version = "0.0.0.13";
+ sha256 = "1j4rq0libwrqs5f2ryfgpl5ayis7xlhl3ay2zbzqpwia39d38kcb";
libraryHaskellDepends = [
- aeson base bytestring cassava containers generic-random mongoDB mtl
- persistent persistent-mongoDB QuickCheck quickcheck-instances
- safe-exceptions scientific swagger2 text time uuid vector
+ aeson base bytestring cassava containers generic-random lens
+ mongoDB mtl persistent persistent-mongoDB QuickCheck
+ quickcheck-instances safe-exceptions scientific swagger2 text time
+ uuid vector
];
description = "ITProTV's custom prelude";
license = stdenv.lib.licenses.mit;
@@ -209759,13 +210547,13 @@ self: {
"raaz" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, criterion
- , deepseq, hspec, hspec-discover, HUnit, optparse-applicative
- , pretty, QuickCheck, transformers, vector
+ , criterion-measurement, deepseq, hspec, hspec-discover, HUnit
+ , optparse-applicative, pretty, QuickCheck, transformers, vector
}:
mkDerivation {
pname = "raaz";
- version = "0.2.1";
- sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq";
+ version = "0.2.2";
+ sha256 = "1v7zyk61vk4d6xniqq4fglwccgpx9clx7hxp1xr531spshadq99p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring deepseq vector ];
@@ -209776,7 +210564,8 @@ self: {
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
- base blaze-builder bytestring criterion pretty
+ base blaze-builder bytestring criterion criterion-measurement
+ pretty
];
description = "The raaz cryptographic library";
license = stdenv.lib.licenses.bsd3;
@@ -211331,29 +212120,29 @@ self: {
}) {};
"rattletrap" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
- , bytestring, containers, filepath, http-client, http-client-tls
+ ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
+ , caerbannog, containers, filepath, http-client, http-client-tls
, HUnit, scientific, template-haskell, temporary, text
, transformers
}:
mkDerivation {
pname = "rattletrap";
- version = "9.2.0";
- sha256 = "0dyp5fmrrj4fv172hw1prdigpiaib0k3wn7lrngl1ql0gahvvzkr";
+ version = "9.3.0";
+ sha256 = "1y18pqh7lwl87rq6j2ghkiipmq7yc8m0jn9krx2mkf1krglcnxb1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base binary binary-bits bytestring containers
+ aeson aeson-pretty base binary bytestring caerbannog containers
filepath http-client http-client-tls scientific template-haskell
text transformers
];
executableHaskellDepends = [
- aeson aeson-pretty base binary binary-bits bytestring containers
+ aeson aeson-pretty base binary bytestring caerbannog containers
filepath http-client http-client-tls scientific template-haskell
text transformers
];
testHaskellDepends = [
- aeson aeson-pretty base binary binary-bits bytestring containers
+ aeson aeson-pretty base binary bytestring caerbannog containers
filepath http-client http-client-tls HUnit scientific
template-haskell temporary text transformers
];
@@ -216387,22 +217176,6 @@ self: {
}) {};
"replace-megaparsec" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, megaparsec
- , parser-combinators, text
- }:
- mkDerivation {
- pname = "replace-megaparsec";
- version = "1.4.3.0";
- sha256 = "0lngw78rzb5q4n2d55kap8czyjwylpayi3ywy4zkcacc6x9dril7";
- libraryHaskellDepends = [
- base bytestring megaparsec parser-combinators text
- ];
- testHaskellDepends = [ base bytestring Cabal megaparsec text ];
- description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
- license = stdenv.lib.licenses.bsd2;
- }) {};
-
- "replace-megaparsec_1_4_4_0" = callPackage
({ mkDerivation, base, bytestring, Cabal, megaparsec
, parser-combinators, text
}:
@@ -216416,7 +217189,6 @@ self: {
testHaskellDepends = [ base bytestring Cabal megaparsec text ];
description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"replica" = callPackage
@@ -216853,10 +217625,8 @@ self: {
}:
mkDerivation {
pname = "reroute";
- version = "0.5.0.0";
- sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r";
- revision = "2";
- editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k";
+ version = "0.6.0.0";
+ sha256 = "1jvh5ngpf1w4y9b1ipx1c65q8gmwsajp8k5ha0sjn89hbc8cp48y";
libraryHaskellDepends = [
base deepseq hashable http-api-data hvect mtl text
unordered-containers
@@ -218095,8 +218865,8 @@ self: {
}:
mkDerivation {
pname = "rhbzquery";
- version = "0.1.1";
- sha256 = "0nlh81cmkfsjgsmrrrcbf51vzmni1ddrhb8dzzxk9a8s76ybmcks";
+ version = "0.4.1";
+ sha256 = "0zfn9bzgm3wb2apnnnakh0lmys0nf9a2ch797m1sfsrbx2mjqvmh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -218105,7 +218875,7 @@ self: {
];
testHaskellDepends = [ base simple-cmd ];
description = "Bugzilla query tool";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.gpl2;
}) {};
"rhine" = callPackage
@@ -223719,34 +224489,51 @@ self: {
}) {};
"scrapbook" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, data-default, drinkery
- , extensible, feed, gitrev, req, rio, tasty, tasty-hunit
- , xml-conduit, xml-types, yaml
+ ({ mkDerivation, base, drinkery, extensible, githash, rio
+ , scrapbook-core, tasty, tasty-hunit, yaml
}:
mkDerivation {
pname = "scrapbook";
- version = "0.3.3";
- sha256 = "17xc7ljfxxwg4l2jiqf8ffwgwq3hq7lynf6p478jp0sxf54irjr1";
+ version = "0.5.0";
+ sha256 = "1jn3zhczi1m644c7b5flxph4sh4cdmix37xwj8zs0rghhmwnkhww";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base data-default extensible feed req rio
- xml-conduit xml-types yaml
+ base extensible rio scrapbook-core yaml
];
executableHaskellDepends = [
- aeson aeson-pretty base data-default drinkery extensible feed
- gitrev req rio xml-conduit xml-types yaml
+ base drinkery extensible githash rio scrapbook-core yaml
];
testHaskellDepends = [
- aeson aeson-pretty base data-default extensible feed req rio tasty
- tasty-hunit xml-conduit xml-types yaml
+ base extensible rio scrapbook-core tasty tasty-hunit yaml
];
- description = "Automatically derive Kotlin class to query servant webservices";
+ description = "collect posts of site that is wrote in config yaml using feed or scraping";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
+ "scrapbook-core" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, extensible, feed
+ , modern-uri, req, rio, tasty, tasty-hunit, xml-conduit, xml-types
+ , yaml
+ }:
+ mkDerivation {
+ pname = "scrapbook-core";
+ version = "0.5.0";
+ sha256 = "0j1andyk438babrnvxdhilk2l7f1y5qfk8s6r197xyf9893r5vv1";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base extensible feed modern-uri req rio
+ xml-conduit xml-types yaml
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base extensible feed modern-uri req rio tasty
+ tasty-hunit xml-conduit xml-types yaml
+ ];
+ description = "Core Package for scrapbook";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"scrape-changes" = callPackage
({ mkDerivation, async, attoparsec, base, bytestring, cron
, directory, email-validate, filepath, hashable, hslogger
@@ -225818,8 +226605,8 @@ self: {
({ mkDerivation, base, bytestring, HUnit, unix }:
mkDerivation {
pname = "serialport";
- version = "0.4.7";
- sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
+ version = "0.5.0";
+ sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv";
libraryHaskellDepends = [ base bytestring unix ];
testHaskellDepends = [ base bytestring HUnit ];
description = "Cross platform serial port library";
@@ -227530,8 +228317,8 @@ self: {
}:
mkDerivation {
pname = "servant-polysemy";
- version = "0.1.0";
- sha256 = "1isk401bi31s8ldb14cw0bchr3lwjmm2aslrrl3hg21dsr0qfk4y";
+ version = "0.1.1";
+ sha256 = "074c1x51am3ffl9lzhq090h8a6xd9gjf154mhp51glb4m4f6kr15";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -228586,8 +229373,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.12.4";
- sha256 = "19ypfhzyqx23chxch847pkz11ida2a82n9rc0s7zfql83afssksi";
+ version = "0.12.5";
+ sha256 = "1p15nzwjbwbjxnqgs6dzz7sb2cp5y3l69hr3n10zmwmgrq4x2nfa";
libraryHaskellDepends = [
aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
bytestring case-insensitive http-client http-types iproute lens
@@ -231877,12 +232664,12 @@ self: {
}) {};
"simple-logger" = callPackage
- ({ mkDerivation, base, fast-logger, mtl, text }:
+ ({ mkDerivation, base, fast-logger, monad-logger, mtl, text }:
mkDerivation {
pname = "simple-logger";
- version = "0.1.0";
- sha256 = "04qha59ymvxfigb0mpzi9ay297kfjv1i0jnsxxla6rk5imin2i58";
- libraryHaskellDepends = [ base fast-logger mtl text ];
+ version = "0.1.1";
+ sha256 = "16ap76da3pvigl9gwpzb6miy13z5ypgh318cnqfyij0l5hrg4qg4";
+ libraryHaskellDepends = [ base fast-logger monad-logger mtl text ];
description = "A very simple but efficient logging framework";
license = stdenv.lib.licenses.mit;
}) {};
@@ -233337,6 +234124,29 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "skylighting_0_10_2" = callPackage
+ ({ mkDerivation, base, binary, blaze-html, bytestring, containers
+ , directory, filepath, pretty-show, skylighting-core, text
+ }:
+ mkDerivation {
+ pname = "skylighting";
+ version = "0.10.2";
+ sha256 = "1f60fnr8d8a28fr785hjzaaakss1ncn0998sz740xb76wp6q7pqd";
+ configureFlags = [ "-fexecutable" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers skylighting-core
+ ];
+ executableHaskellDepends = [
+ base blaze-html bytestring containers directory filepath
+ pretty-show text
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-core" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
@@ -233368,6 +234178,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "skylighting-core_0_10_2" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+ , base64-bytestring, binary, blaze-html, bytestring
+ , case-insensitive, colour, containers, criterion, Diff, directory
+ , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe
+ , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
+ , transformers, utf8-string
+ }:
+ mkDerivation {
+ pname = "skylighting-core";
+ version = "0.10.2";
+ sha256 = "1igqskmcbhk7b3fv1a1fxvfc4s3mc2sf96q90bf5iipy0h3f2zbg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal attoparsec base base64-bytestring binary
+ blaze-html bytestring case-insensitive colour containers directory
+ filepath hxt mtl safe text transformers utf8-string
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff directory filepath HUnit
+ pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+ tasty-quickcheck text utf8-string
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion directory filepath text
+ ];
+ description = "syntax highlighting library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"skylighting-extensions" = callPackage
({ mkDerivation, base, containers, skylighting, skylighting-modding
, text
@@ -236490,8 +237332,8 @@ self: {
}:
mkDerivation {
pname = "socket-io";
- version = "1.3.11";
- sha256 = "078zbbhrpfb5a15vr2vjfxdyi1yabd07rg41ajvpcfqcwq4svw95";
+ version = "1.3.12";
+ sha256 = "01aqvbg498pdwi4wv14qsc6spd7nyaidmdz22azq746599f7xnrm";
libraryHaskellDepends = [
aeson attoparsec base bytestring engine-io mtl stm text
transformers unordered-containers vector
@@ -239360,10 +240202,8 @@ self: {
}:
mkDerivation {
pname = "stack";
- version = "2.5.1";
- sha256 = "1ffbgs5wgdcvvwbg3pkpgih5dqcbw8mpjj2p49fd8f79cfxmjq20";
- revision = "1";
- editedCabalFile = "0k5hapiyq2qv8sn2l2j5sh6w9b8493apwwsbrhpym5m1llxrv29p";
+ version = "2.5.1.1";
+ sha256 = "0fdm4wc8hxawfab7dv2ayr853mna93gznb7g162gw4h4zxnyzwyc";
configureFlags = [
"-fdisable-git-info" "-fhide-dependency-versions"
"-fsupported-build"
@@ -243080,8 +243920,8 @@ self: {
}:
mkDerivation {
pname = "strict";
- version = "0.4";
- sha256 = "0gs5fqsrwsc3y5w6fp91p9frgh7h42kd9smyg04cw284d5wfx7r7";
+ version = "0.4.0.1";
+ sha256 = "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz";
libraryHaskellDepends = [
assoc base binary bytestring deepseq ghc-prim hashable text these
transformers
@@ -244044,6 +244884,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "structured-cli_2_7_0_1" = callPackage
+ ({ mkDerivation, base, data-default, exceptions, haskeline, mtl
+ , split, transformers
+ }:
+ mkDerivation {
+ pname = "structured-cli";
+ version = "2.7.0.1";
+ sha256 = "18l4jy328djmrwhmcmli73592qlld85fwbwby95mghwdbdy2i68g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base data-default exceptions haskeline mtl split transformers
+ ];
+ executableHaskellDepends = [ base data-default mtl split ];
+ description = "Application library for building interactive console CLIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"structured-haskell-mode" = callPackage
({ mkDerivation, base, descriptive, ghc-prim, haskell-src-exts
, text
@@ -248649,18 +249508,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty_1_4" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+ "tasty_1_4_0_1" = callPackage
+ ({ mkDerivation, ansi-terminal, base, clock, containers, mtl
, optparse-applicative, stm, tagged, unbounded-delays, unix
, wcwidth
}:
mkDerivation {
pname = "tasty";
- version = "1.4";
- sha256 = "0jkia4zg01936gm2klpn3c4grlmdgiq0qnqq1cz7xg4baza14q3b";
+ version = "1.4.0.1";
+ sha256 = "1ffq2gpasdqm2drhd2aglcq33yrpb1h3grfyqyc34amz65bfczqq";
libraryHaskellDepends = [
- ansi-terminal async base clock containers mtl optparse-applicative
- stm tagged unbounded-delays unix wcwidth
+ ansi-terminal base clock containers mtl optparse-applicative stm
+ tagged unbounded-delays unix wcwidth
];
description = "Modern and extensible testing framework";
license = stdenv.lib.licenses.mit;
@@ -248892,8 +249751,8 @@ self: {
pname = "tasty-hedgehog";
version = "1.0.0.2";
sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5";
- revision = "4";
- editedCabalFile = "0z47ssv9030px81sxivhw5jp7yfpr6r6anlf03slks31jkzvx4gl";
+ revision = "6";
+ editedCabalFile = "12s7jgz14j32h62mgs4qbypqlpwjly1bk2hgrwqi9w3cjsskqk88";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -248971,6 +249830,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty-hunit_0_10_0_3" = callPackage
+ ({ mkDerivation, base, call-stack, tasty }:
+ mkDerivation {
+ pname = "tasty-hunit";
+ version = "0.10.0.3";
+ sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp";
+ libraryHaskellDepends = [ base call-stack tasty ];
+ description = "HUnit support for the Tasty test framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-hunit-adapter" = callPackage
({ mkDerivation, base, HUnit, tasty, tasty-hunit }:
mkDerivation {
@@ -249201,6 +250072,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty-quickcheck_0_10_1_2" = callPackage
+ ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
+ , random, tagged, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "tasty-quickcheck";
+ version = "0.10.1.2";
+ sha256 = "0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49";
+ libraryHaskellDepends = [
+ base optparse-applicative QuickCheck random tagged tasty
+ ];
+ testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
+ description = "QuickCheck support for the Tasty test framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-quickcheck-laws" = callPackage
({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
mkDerivation {
@@ -249821,6 +250709,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "techlab" = callPackage
+ ({ mkDerivation, base, chassis, co-log-polysemy, composite-base
+ , containers, dhall, formatting, optics, path-dhall-instance
+ , polysemy, polysemy-extra, polysemy-fs, polysemy-methodology
+ , polysemy-methodology-composite, polysemy-plugin, polysemy-vinyl
+ , polysemy-zoo
+ }:
+ mkDerivation {
+ pname = "techlab";
+ version = "0.1.1.0";
+ sha256 = "1139slr5pd03zr7w6m3mw625wkfd9jw8slqddgmbawpbi2z20p80";
+ libraryHaskellDepends = [
+ base chassis co-log-polysemy composite-base containers dhall
+ formatting optics path-dhall-instance polysemy polysemy-extra
+ polysemy-fs polysemy-methodology polysemy-methodology-composite
+ polysemy-plugin polysemy-vinyl polysemy-zoo
+ ];
+ description = "Bleeding edge prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"technique" = callPackage
({ mkDerivation, async, base, containers, core-data, core-program
, core-text, dlist, free, hashable, hspec, ivar-simple, megaparsec
@@ -251683,8 +252594,8 @@ self: {
}:
mkDerivation {
pname = "testcontainers";
- version = "0.2.0.0";
- sha256 = "0drdi2qqgiw499lwvkdc5yn8x7mys6l4p47jcz0af62fczpa5dnh";
+ version = "0.3.0.0";
+ sha256 = "0iibmfb5ps7i9d35pwj22a8dxn6b31hmdzswcdmbhdbkq06534hj";
libraryHaskellDepends = [
aeson aeson-optics base bytestring exceptions mtl network
optics-core process resourcet tasty text unliftio-core
@@ -253000,8 +253911,8 @@ self: {
({ mkDerivation, base, containers, ghc-prim, template-haskell }:
mkDerivation {
pname = "th-abstraction";
- version = "0.4.0.0";
- sha256 = "09r09va7ihhk2nbz73y0cp4hijbf4zpr4hiss0xqa9pqkkazz62h";
+ version = "0.4.1.0";
+ sha256 = "1klza7zxcr8bgyflndwv0wgziy0snjh1w2c5z3mv17yra0yrs84f";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -254690,14 +255601,14 @@ self: {
broken = true;
}) {};
- "time_1_11_1" = callPackage
+ "time_1_11_1_1" = callPackage
({ mkDerivation, base, criterion, deepseq, QuickCheck, random
, tasty, tasty-hunit, tasty-quickcheck, unix
}:
mkDerivation {
pname = "time";
- version = "1.11.1";
- sha256 = "0l0nqqg38xz2q78pi4i4jsbrb1jkn9ch0xlq17kn7824dh0j21vw";
+ version = "1.11.1.1";
+ sha256 = "0xrs9j4fskxz98zgwhgh7w4d9a6im3ipahg6ahp0689qhs61cx9p";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -254725,23 +255636,6 @@ self: {
}) {};
"time-compat" = callPackage
- ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
- , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
- }:
- mkDerivation {
- pname = "time-compat";
- version = "1.9.4";
- sha256 = "0fpk2bpxfyzwd24lk06k3cpra713hrpva5ylnwa28zq34azy1snz";
- libraryHaskellDepends = [ base base-orphans deepseq time ];
- testHaskellDepends = [
- base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
- tasty-quickcheck time
- ];
- description = "Compatibility package for time";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "time-compat_1_9_5" = callPackage
({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
}:
@@ -254756,7 +255650,6 @@ self: {
];
description = "Compatibility package for time";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"time-extras" = callPackage
@@ -261477,8 +262370,8 @@ self: {
}:
mkDerivation {
pname = "typed-encoding";
- version = "0.5.1.0";
- sha256 = "0bycjpq11p1byg5kncj3zykf2k5j18mgz3c9jsmcwji4wslagacp";
+ version = "0.5.2.1";
+ sha256 = "1n71rxj42ssv7g4yqsycg5wg1afja2y1jxfb5khv323v581gf4wn";
libraryHaskellDepends = [
base base64-bytestring bytestring symbols text
];
@@ -262553,13 +263446,24 @@ self: {
({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
mkDerivation {
pname = "ukrainian-phonetics-basic";
- version = "0.3.2.0";
- sha256 = "16w4dggl61jh93rqq0czb3lpbq9cf4kxih5c0i5mbrjcxn50cdqg";
+ version = "0.4.1.0";
+ sha256 = "1sgch686yq6yqm6yz63v4hcprslfzn82an1ndxbgy0m7d7ipdavx";
libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
license = stdenv.lib.licenses.mit;
}) {};
+ "ukrainian-phonetics-basic-array" = callPackage
+ ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }:
+ mkDerivation {
+ pname = "ukrainian-phonetics-basic-array";
+ version = "0.1.1.0";
+ sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn";
+ libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ];
+ description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ulid" = callPackage
({ mkDerivation, base, binary, bytestring, crypto-api, deepseq
, format-numbers, hashable, hspec, random, text, time
@@ -263671,8 +264575,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "uniqueness-periods-vector-stats";
- version = "0.1.2.0";
- sha256 = "1k98rdjq4i38lrnradfpdzk25b312h65m4mzbyjjzn7hzfra86gn";
+ version = "0.2.1.0";
+ sha256 = "1vw12a6q1h2in2llyy49n54s20sh8i4ry9vr2rwy8q0xfvfq9v25";
libraryHaskellDepends = [ base ghc-prim ];
description = "A very basic descriptive statistics";
license = stdenv.lib.licenses.mit;
@@ -265026,8 +265930,8 @@ self: {
}:
mkDerivation {
pname = "uri-bytestring";
- version = "0.3.2.2";
- sha256 = "0spzv3mwlpxiamd7347sxwcy2xri16ak1y7p1v4fisnvq4jprm67";
+ version = "0.3.3.0";
+ sha256 = "1zpynqz2q29cfk77n0d6lrnzmrqqi5nijvqd2pkz2fax3s6qhysz";
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring containers
template-haskell th-lift-instances
@@ -267389,8 +268293,8 @@ self: {
}:
mkDerivation {
pname = "vector-algorithms";
- version = "0.8.0.3";
- sha256 = "11vks2h9f5gk0irsx5j9xwlicbzkv3k80sx76j5k3zb38q0izi0s";
+ version = "0.8.0.4";
+ sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn";
libraryHaskellDepends = [ base bytestring primitive vector ];
testHaskellDepends = [
base bytestring containers QuickCheck vector
@@ -267492,16 +268396,17 @@ self: {
}) {};
"vector-circular" = callPackage
- ({ mkDerivation, base, hedgehog, hedgehog-classes, nonempty-vector
- , primitive, semigroupoids, template-haskell, vector
+ ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes
+ , nonempty-vector, primitive, semigroupoids, template-haskell
+ , vector
}:
mkDerivation {
pname = "vector-circular";
- version = "0.1";
- sha256 = "1ha5hdl2g7shjssjhqx4s5sqp34y301l0f0dg8yshrw5srg1k90x";
+ version = "0.1.1";
+ sha256 = "08ydvvhzgkci615dnh3r5avzvx0xzibh9l2lys93sbxa139j446c";
libraryHaskellDepends = [
- base nonempty-vector primitive semigroupoids template-haskell
- vector
+ base deepseq nonempty-vector primitive semigroupoids
+ template-haskell vector
];
testHaskellDepends = [ base hedgehog hedgehog-classes ];
description = "circular vectors";
@@ -267741,8 +268646,8 @@ self: {
}:
mkDerivation {
pname = "vector-sized";
- version = "1.4.2";
- sha256 = "02a7jzik6a6w1xb6bwpvl6hmii6jgi9wr0q7p48bfbq0mlqjv42h";
+ version = "1.4.3";
+ sha256 = "0k1rvy6znp2kig5v7w7zpq9i3sz65prp1wcpmjqgzkz3qb0s5l00";
libraryHaskellDepends = [
adjunctions base binary comonad deepseq distributive
finite-typelits hashable indexed-list-literals primitive vector
@@ -267751,6 +268656,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector-sized_1_4_3_1" = callPackage
+ ({ mkDerivation, adjunctions, base, binary, comonad, deepseq
+ , distributive, finite-typelits, hashable, indexed-list-literals
+ , primitive, vector
+ }:
+ mkDerivation {
+ pname = "vector-sized";
+ version = "1.4.3.1";
+ sha256 = "0vm6wvbn3g4r028p46yh24rz7pr429w03jshpwyj2z2c6b058klr";
+ libraryHaskellDepends = [
+ adjunctions base binary comonad deepseq distributive
+ finite-typelits hashable indexed-list-literals primitive vector
+ ];
+ description = "Size tagged vectors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-space" = callPackage
({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
mkDerivation {
@@ -268598,6 +269521,17 @@ self: {
broken = true;
}) {};
+ "vinyl-loeb" = callPackage
+ ({ mkDerivation, base, vinyl }:
+ mkDerivation {
+ pname = "vinyl-loeb";
+ version = "0.0.1.0";
+ sha256 = "1vxw57c17lajq6qb2kcblymbg42y7ddh85kiik5kwmbxgfmqyrrv";
+ libraryHaskellDepends = [ base vinyl ];
+ description = "Loeb's theorem for extensible records";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"vinyl-named-sugar" = callPackage
({ mkDerivation, base, vinyl }:
mkDerivation {
@@ -268822,19 +269756,20 @@ self: {
}) {};
"vivid" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, directory
- , filepath, hashable, MonadRandom, mtl, network, process, random
- , random-shuffle, split, stm, time, transformers, utf8-string
- , vivid-osc, vivid-supercollider
+ ({ mkDerivation, base, binary, bytestring, cereal, containers
+ , directory, filepath, hashable, MonadRandom, mtl, network, process
+ , random, random-shuffle, split, stm, time, transformers
+ , utf8-string, vivid-osc, vivid-supercollider
}:
mkDerivation {
pname = "vivid";
- version = "0.4.2.4";
- sha256 = "11admh79xx88i0yv8x7b38cchgarjbrxmzcbyd2aqa5v7hvk22k6";
+ version = "0.5.1.0";
+ sha256 = "06skwy5k4sgmh7m20m5v3g82kvm6sxq2sxmg039s45pvkbfp1c32";
libraryHaskellDepends = [
- base binary bytestring containers directory filepath hashable
- MonadRandom mtl network process random random-shuffle split stm
- time transformers utf8-string vivid-osc vivid-supercollider
+ base binary bytestring cereal containers directory filepath
+ hashable MonadRandom mtl network process random random-shuffle
+ split stm time transformers utf8-string vivid-osc
+ vivid-supercollider
];
description = "Sound synthesis with SuperCollider";
license = "GPL";
@@ -269208,8 +270143,8 @@ self: {
({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
mkDerivation {
pname = "vulkan";
- version = "3.8";
- sha256 = "08d48q6wml8bh28s39zk12hi6760xmn92qdb9zk7y3h896i8v15s";
+ version = "3.8.2";
+ sha256 = "1wq3hd99zqzasfj4w86yypcd0yrdp8q3xrzx3g2v6vyi99qwzdrr";
libraryHaskellDepends = [ base bytestring transformers vector ];
librarySystemDepends = [ vulkan ];
description = "Bindings to the Vulkan graphics API";
@@ -269640,8 +270575,8 @@ self: {
}:
mkDerivation {
pname = "wai-extra";
- version = "3.1.3";
- sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7";
+ version = "3.1.4.1";
+ sha256 = "0q95vz3x0avznpv0mcb71vlmamyws8sm50asrhcph5qwfwh9x13a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -272809,8 +273744,8 @@ self: {
}:
mkDerivation {
pname = "websockets";
- version = "0.12.7.1";
- sha256 = "1jqlvgw1ffw0236y4g7li188m9ac37a2yp07vkvcmbz63rmhfmnk";
+ version = "0.12.7.2";
+ sha256 = "1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -272974,8 +273909,8 @@ self: {
}:
mkDerivation {
pname = "weeder";
- version = "2.1.2";
- sha256 = "0jhdpv4032334ag46jm6d6nc3pdkccq74fkfzijslz798zh9sqmj";
+ version = "2.1.3";
+ sha256 = "0yph2dzg4xrfs7439jmxn3jc7h42id0c2f987wl6lccrbn39vzd7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -273735,8 +274670,8 @@ self: {
}:
mkDerivation {
pname = "witch";
- version = "0.0.0.3";
- sha256 = "0ghajh4f4xfhn79bmyhamxjgl63lwg37kp39nn1q6qxggzzmzkyx";
+ version = "0.0.0.4";
+ sha256 = "1mph0zaz2dnhpchyiyspqsjghd8kn8sbqnhbyjmag51l2wr418vb";
libraryHaskellDepends = [ base bytestring containers text ];
testHaskellDepends = [
base bytestring containers hspec QuickCheck text
@@ -279805,8 +280740,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.6.1.5";
- sha256 = "1awd16wli7g746sf5aqkzb0nglcbji3pl5yyximhb2ab2gjl2ank";
+ version = "0.6.1.6";
+ sha256 = "188msa26wr1xwz2ib7pa5bjb9sih02cklgh68i7h1rq412nw7anr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -280041,6 +280976,44 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-core_1_6_18_8" = callPackage
+ ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+ , blaze-markup, bytestring, case-insensitive, cereal, clientsession
+ , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
+ , gauge, hspec, hspec-expectations, http-types, HUnit, memory
+ , monad-logger, mtl, network, parsec, path-pieces, primitive
+ , random, resourcet, shakespeare, streaming-commons
+ , template-haskell, text, time, transformers, unix-compat, unliftio
+ , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+ , word8
+ }:
+ mkDerivation {
+ pname = "yesod-core";
+ version = "1.6.18.8";
+ sha256 = "1phqb74z5nqnx1xnbhnpimcdcrzm5dd474svzc5hp0ji3kp2xkri";
+ libraryHaskellDepends = [
+ aeson auto-update base blaze-html blaze-markup bytestring
+ case-insensitive cereal clientsession conduit conduit-extra
+ containers cookie deepseq fast-logger http-types memory
+ monad-logger mtl parsec path-pieces primitive random resourcet
+ shakespeare template-haskell text time transformers unix-compat
+ unliftio unordered-containers vector wai wai-extra wai-logger warp
+ word8
+ ];
+ testHaskellDepends = [
+ async base bytestring clientsession conduit conduit-extra
+ containers cookie hspec hspec-expectations http-types HUnit network
+ path-pieces random resourcet shakespeare streaming-commons
+ template-haskell text transformers unliftio wai wai-extra warp
+ ];
+ benchmarkHaskellDepends = [
+ base blaze-html bytestring gauge shakespeare text
+ ];
+ description = "Creation of type-safe, RESTful web applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-crud" = callPackage
({ mkDerivation, base, classy-prelude, containers, MissingH
, monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -281268,6 +282241,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-test_1_6_12" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+ , bytestring, case-insensitive, conduit, containers, cookie, hspec
+ , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network
+ , pretty-show, text, time, transformers, unliftio, unliftio-core
+ , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form
+ }:
+ mkDerivation {
+ pname = "yesod-test";
+ version = "1.6.12";
+ sha256 = "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-builder blaze-html bytestring
+ case-insensitive conduit containers cookie hspec-core html-conduit
+ http-types HUnit memory mtl network pretty-show text time
+ transformers wai wai-extra xml-conduit xml-types yesod-core
+ ];
+ testHaskellDepends = [
+ base bytestring containers cookie hspec html-conduit http-types
+ HUnit text unliftio unliftio-core wai wai-extra xml-conduit
+ yesod-core yesod-form
+ ];
+ description = "integration testing for WAI/Yesod Applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-test-json" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, hspec
, http-types, HUnit, text, transformers, wai, wai-test
@@ -282660,20 +283660,19 @@ self: {
"zeolite-lang" = callPackage
({ mkDerivation, base, containers, directory, filepath, hashable
- , mtl, parsec, regex-tdfa, time, transformers, unix
+ , megaparsec, mtl, parser-combinators, regex-tdfa, time
+ , transformers, unix
}:
mkDerivation {
pname = "zeolite-lang";
- version = "0.9.0.0";
- sha256 = "0gcjjxavsc763a218rswzk7zrx917qg5sid7gpy81yw054kfp6ws";
- revision = "1";
- editedCabalFile = "0c76xxaxqwsh0ybvf5r6wza9gq7y7hiqm75pazmrhkzvm48q1dl8";
+ version = "0.12.0.0";
+ sha256 = "056brd93d1559wdz7s4wcvjglqg5p1bafhhgbqcqnd0q8msnilrv";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base containers directory filepath hashable mtl parsec regex-tdfa
- time transformers unix
+ base containers directory filepath hashable megaparsec mtl
+ parser-combinators regex-tdfa time transformers unix
];
executableHaskellDepends = [
base containers directory filepath unix
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix
index 6bcc563164..964c179fb6 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/lib.nix
@@ -414,13 +414,13 @@ rec {
*/
generateOptparseApplicativeCompletion = exeName: pkg: overrideCabal pkg (drv: {
postInstall = (drv.postInstall or "") + ''
- bashCompDir="$out/share/bash-completion/completions"
- zshCompDir="$out/share/zsh/vendor-completions"
- fishCompDir="$out/share/fish/vendor_completions.d"
+ bashCompDir="''${!outputBin}/share/bash-completion/completions"
+ zshCompDir="''${!outputBin}/share/zsh/vendor-completions"
+ fishCompDir="''${!outputBin}/share/fish/vendor_completions.d"
mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
- "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}"
- "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}"
- "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
+ "''${!outputBin}/bin/${exeName}" --bash-completion-script "''${!outputBin}/bin/${exeName}" >"$bashCompDir/${exeName}"
+ "''${!outputBin}/bin/${exeName}" --zsh-completion-script "''${!outputBin}/bin/${exeName}" >"$zshCompDir/_${exeName}"
+ "''${!outputBin}/bin/${exeName}" --fish-completion-script "''${!outputBin}/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
# Sanity check
grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || {
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
index 30f00cc6ea..fe7fad15ce 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -19,9 +19,10 @@ self: super: {
# HLS and its fork of ghcide that it uses
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
- hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { };
hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
+ hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
+ hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
index 68819fa7ab..c22ad3f4cb 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
@@ -73,7 +73,7 @@ let
flags = [
"-nostdinc"
"-nostdinc++"
- "-isystem" "${glibc.dev}/include"
+ "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
"-I" "${unwrapped}/include"
"-I" "${unwrapped}/lib/clang/5.0.2/include"
];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix
index 4f3beff3b8..50f1c4af21 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/deps.nix
@@ -4,9 +4,9 @@
let repos = [
"https://repo.clojars.org/"
"https://repo1.maven.org/"
- "http://oss.sonatype.org/content/repositories/releases/"
- "http://oss.sonatype.org/content/repositories/public/"
- "http://repo.typesafe.com/typesafe/releases/"
+ "https://oss.sonatype.org/content/repositories/releases/"
+ "https://oss.sonatype.org/content/repositories/public/"
+ "https://repo.typesafe.com/typesafe/releases/"
];
in rec {
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh
index 6bb3910aaf..288f7e242f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh
+++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.0.sh
@@ -8,6 +8,16 @@ addGuileLibPath () {
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
+
+ if test -d "$1/lib/guile/2.0/ccache"
+ then
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/ccache"
+ fi
+
+ if test -d "$1/lib/guile/2.0/site-ccache"
+ then
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/site-ccache"
+ fi
}
addEnvHooks "$hostOffset" addGuileLibPath
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh
index 4b3541fcc7..1430dbe072 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh
+++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/setup-hook-2.2.sh
@@ -8,6 +8,16 @@ addGuileLibPath () {
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
+
+ if test -d "$1/lib/guile/2.2/ccache"
+ then
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/ccache"
+ fi
+
+ if test -d "$1/lib/guile/2.2/site-ccache"
+ then
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/site-ccache"
+ fi
}
addEnvHooks "$hostOffset" addGuileLibPath
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
index 8d27bfb64f..9159f026e1 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
- version = "9.2.13.0";
+ version = "9.2.14.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "0n5glz6xm3skrfihzn3g5awdxpjsqn2k8k46gv449rk2l50w5a3k";
+ sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj";
};
buildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
index 841f89b97f..67fca52dad 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
@@ -23,15 +23,17 @@
, fftwSinglePrec
, zlib
, curl
-, qrupdate
, blas, lapack
-, arpack
+# These two should use the same lapack and blas as the above
+, qrupdate, arpack, suitesparse ? null
+# If set to true, the above 5 deps are overriden to use the blas and lapack
+# with 64 bit indexes support. If all are not compatible, the build will fail.
+, use64BitIdx ? false
, libwebp
, gl2ps
, ghostscript ? null
, hdf5 ? null
, glpk ? null
-, suitesparse ? null
, gnuplot ? null
# - Include support for GNU readline:
, enableReadline ? true
@@ -41,7 +43,7 @@
, jdk ? null
, python ? null
, overridePlatforms ? null
-, sundials_2 ? null
+, sundials ? null
# - Build Octave Qt GUI:
, enableQt ? false
, qtbase ? null
@@ -56,9 +58,42 @@
, darwin
}:
-assert (!blas.isILP64) && (!lapack.isILP64);
-
-mkDerivation rec {
+let
+ # Not always evaluated
+ blas' = if use64BitIdx then
+ blas.override {
+ isILP64 = true;
+ }
+ else
+ blas
+ ;
+ lapack' = if use64BitIdx then
+ lapack.override {
+ isILP64 = true;
+ }
+ else
+ lapack
+ ;
+ qrupdate' = qrupdate.override {
+ # If use64BitIdx is false, this override doesn't evaluate to a new
+ # derivation, as blas and lapack are not overriden.
+ blas = blas';
+ lapack = lapack';
+ };
+ arpack' = arpack.override {
+ blas = blas';
+ lapack = lapack';
+ };
+ # Not always suitesparse is required at all
+ suitesparse' = if suitesparse != null then
+ suitesparse.override {
+ blas = blas';
+ lapack = lapack';
+ }
+ else
+ null
+ ;
+in mkDerivation rec {
version = "6.1.0";
pname = "octave";
@@ -78,34 +113,36 @@ mkDerivation rec {
fltk
zlib
curl
- blas
- lapack
+ blas'
+ lapack'
libsndfile
fftw
fftwSinglePrec
portaudio
- qrupdate
- arpack
+ qrupdate'
+ arpack'
libwebp
gl2ps
]
- ++ (stdenv.lib.optionals enableQt [
+ ++ stdenv.lib.optionals enableQt [
qtbase
qtsvg
qscintilla
- ])
- ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
- ++ (stdenv.lib.optional (hdf5 != null) hdf5)
- ++ (stdenv.lib.optional (glpk != null) glpk)
- ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
- ++ (stdenv.lib.optional (enableJava) jdk)
- ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
- ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
- ++ (stdenv.lib.optional (python != null) python)
- ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
- ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv
- darwin.apple_sdk.frameworks.Accelerate
- darwin.apple_sdk.frameworks.Cocoa ])
+ ]
+ ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ]
+ ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ]
+ ++ stdenv.lib.optionals (glpk != null) [ glpk ]
+ ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ]
+ ++ stdenv.lib.optionals (enableJava) [ jdk ]
+ ++ stdenv.lib.optionals (sundials != null) [ sundials ]
+ ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ]
+ ++ stdenv.lib.optionals (python != null) [ python ]
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv
+ darwin.apple_sdk.frameworks.Accelerate
+ darwin.apple_sdk.frameworks.Cocoa
+ ]
;
nativeBuildInputs = [
pkgconfig
@@ -115,12 +152,12 @@ mkDerivation rec {
fftwSinglePrec
texinfo
]
- ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
- ++ (stdenv.lib.optional enableJIT llvm)
- ++ (stdenv.lib.optionals enableQt [
+ ++ stdenv.lib.optionals (sundials != null) [ sundials ]
+ ++ stdenv.lib.optionals enableJIT [ llvm ]
+ ++ stdenv.lib.optionals enableQt [
qtscript
qttools
- ])
+ ]
;
doCheck = !stdenv.isDarwin;
@@ -128,14 +165,14 @@ mkDerivation rec {
enableParallelBuilding = true;
# See https://savannah.gnu.org/bugs/?50339
- F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else "";
+ F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
configureFlags = [
"--with-blas=blas"
"--with-lapack=lapack"
- (if blas.isILP64 then "--enable-64" else "--disable-64")
+ (if use64BitIdx then "--enable-64" else "--disable-64")
]
- ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ])
+ ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
@@ -149,14 +186,20 @@ mkDerivation rec {
'';
passthru = {
- inherit version;
sitePath = "share/octave/${version}/site";
+ blas = blas';
+ lapack = lapack';
+ qrupdate = qrupdate';
+ arpack = arpack';
+ suitesparse = suitesparse';
+ inherit python;
+ inherit enableQt enableJIT enableReadline enableJava;
};
meta = {
homepage = "https://www.gnu.org/software/octave/";
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [raskin];
+ maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ];
description = "Scientific Pragramming Language";
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
broken = enableJIT;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
index ac41a63cef..6b7d1d4d99 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
@@ -174,11 +174,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020
+ crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
- sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1";
+ sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -214,7 +214,7 @@ in {
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
- version = "5.33.4";
- sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz";
+ version = "5.33.5";
+ sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
index 4a96abcf9b..82134e1440 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
@@ -13,6 +13,7 @@ let
, version
, sha256
, extraPatches ? []
+ , packageOverrides ? (final: prev: {})
# Sapi flags
, cgiSupport ? true
@@ -49,8 +50,8 @@ let
php = generic filteredArgs;
php-packages = (callPackage ../../../top-level/php-packages.nix {
- php = phpWithExtensions;
- });
+ phpPackage = phpWithExtensions;
+ }).overrideScope' packageOverrides;
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
enabledExtensions =
@@ -112,7 +113,8 @@ let
phpIni = "${phpWithExtensions}/lib/php.ini";
unwrapped = php;
tests = nixosTests.php;
- inherit (php-packages) packages extensions buildPecl;
+ inherit (php-packages) extensions buildPecl;
+ packages = php-packages.tools;
meta = php.meta // {
outputsToInstall = [ "out" ];
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
index a1f9d68eb1..41d3ab5234 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
@@ -1,19 +1,19 @@
-From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Mon, 28 Aug 2017 09:24:06 +0200
+From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
+From: Greg Roodt
+Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
- Lib/ctypes/util.py | 70 ++----------------------------------------------------
- 1 file changed, 2 insertions(+), 68 deletions(-)
+ Lib/ctypes/util.py | 77 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 5e8b31a854..7b45ce6c15 100644
+index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
-@@ -94,46 +94,7 @@ elif os.name == "posix":
- import re, tempfile
-
+@@ -100,53 +100,7 @@ elif os.name == "posix":
+ return thefile.read(4) == elf_header
+
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
- # library name it prints out. The GCC command will fail because we
@@ -51,17 +51,24 @@ index 5e8b31a854..7b45ce6c15 100644
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
-- res = re.search(expr, trace)
+- res = re.findall(expr, trace)
- if not res:
- return None
-- return os.fsdecode(res.group(0))
+-
+- for file in res:
+- # Check if the given file is an elf file: gcc can report
+- # some files that are linker scripts and not actual
+- # shared objects. See bpo-41976 for more details
+- if not _is_elf(file):
+- continue
+- return os.fsdecode(file)
+ return None
-
-
+
+
if sys.platform == "sunos5":
-@@ -255,34 +216,7 @@ elif os.name == "posix":
+@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
-
+
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
@@ -92,9 +99,8 @@ index 5e8b31a854..7b45ce6c15 100644
- except OSError:
- pass
+ return None
-
+
def _findLib_ld(name):
# See issue #9998 for why this is needed
---
-2.15.0
-
+--
+2.24.3 (Apple Git-128)
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
index 7c3f94dcd1..a217f62986 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -167,10 +167,10 @@ in {
sourceVersion = {
major = "3";
minor = "9";
- patch = "0";
+ patch = "1";
suffix = "";
};
- sha256 = "0m18z05nlmqm1zjw9s0ifgrn1jvjn3jwjg0bpswhjmw5k4yfcwww";
+ sha256 = "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -181,9 +181,9 @@ in {
major = "3";
minor = "10";
patch = "0";
- suffix = "a2";
+ suffix = "a3";
};
- sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr";
+ sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY=";
inherit (darwin) configd;
inherit passthruFun;
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
index 0d77070004..c645fae0d8 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.11";
+ version = "2020.12";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "107sskgf0p6npm3vjpv5wrqgfa007af6bxxiv1wgiyzx7maqdw5n";
+ sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
index 5cd0b50e69..54b487c259 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.11";
+ version = "2020.12";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "1163zv1fglgwbk6pppzbjwcgzpp13ilg5cz7fawsfnzdnrrq40kd";
+ sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
index ad17808281..04b628bc9d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.11";
+ version = "2020.12";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "03whmlc6bmwmwrddwd5vqmir0gzwnmf0apvl2q1na09qqj3zb1br";
+ sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x";
};
buildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix
index 6824cb7f18..1979bdf5df 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
- version = "5.1";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "0rcv86hn5aqna7vr9nfk4np778qjr7l3742v58w6qw0z4y6l1km0";
+ sha256 = "1h4kj37zh60zap1gvpkvcl1b1lbdvav959gd59pq2c33i0ziagf6";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
index c90c0fd08a..af0da7dc62 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,7 +1,19 @@
-{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which
-, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123
-, CoreServices, AudioUnit, AudioToolbox
-, enableNativeMidi ? false, fluidsynth ? null }:
+{ stdenv
+, fetchurl
+, pkg-config
+, AudioToolbox
+, AudioUnit
+, CoreServices
+, SDL2
+, flac
+, fluidsynth
+, libmodplug
+, libogg
+, libvorbis
+, mpg123
+, opusfile
+, smpeg2
+}:
stdenv.mkDerivation rec {
pname = "SDL2_mixer";
@@ -12,19 +24,37 @@ stdenv.mkDerivation rec {
sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
};
- preAutoreconf = ''
- aclocal
- '';
+ nativeBuildInputs = [ pkg-config ];
- nativeBuildInputs = [ autoreconfHook pkgconfig which ];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+ AudioToolbox
+ AudioUnit
+ CoreServices
+ ];
- buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
+ propagatedBuildInputs = [
+ SDL2
+ flac
+ fluidsynth
+ libmodplug
+ libogg
+ libvorbis
+ mpg123
+ opusfile
+ smpeg2
+ ];
- propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ];
-
- configureFlags = [ "--disable-music-ogg-shared" ]
- ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"
- ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
+ configureFlags = [
+ "--disable-music-ogg-shared"
+ "--disable-music-flac-shared"
+ "--disable-music-mod-modplug-shared"
+ "--disable-music-mp3-mpg123-shared"
+ "--disable-music-opus-shared"
+ "--disable-music-midi-fluidsynth-shared"
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ "--disable-sdltest"
+ "--disable-smpegtest"
+ ];
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
index c3e5261155..f6859c9436 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2020.Q4.5";
+ version = "2020.Q4.6";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "1CcupEm19ZGEma0TIkGxOa0doKhlPbfXFX2S44EBNp0=";
+ sha256 = "wminJxfku8Myag+SI7iLSvS+VzHlUd4c86BbpF/cr1w=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix
index 8016053c42..3713a25766 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix
@@ -1,11 +1,11 @@
{
- gwenhywfar.version = "5.1.3";
- gwenhywfar.sha256 = "0xjr9d94y46h7pfdhz5ygn01pmlm66rhiybr520h13nvjh4zid0r";
- gwenhywfar.releaseId = "242";
+ gwenhywfar.version = "5.4.1";
+ gwenhywfar.sha256 = "16waq39mbhhjcma2ykdbqvpcw0ba3ksqqwsp55zczhg320s41zgv";
+ gwenhywfar.releaseId = "344";
libchipcard.version = "5.0.4";
libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
libchipcard.releaseId = "158";
- aqbanking.version = "6.0.2";
- aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx";
- aqbanking.releaseId = "273";
+ aqbanking.version = "6.2.5";
+ aqbanking.sha256 = "1pyny15g8y5dzzl4yg7jjnavygfzsi2g1jl7as9grqy77q70cnyg";
+ aqbanking.releaseId = "342";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
index bc2a189a88..d40f4b5aae 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix
@@ -298,10 +298,10 @@ in rec {
en = buildOfficialDict {
language = "en";
- version = "2019.10.06-0";
+ version = "2020.12.07-0";
fullName = "English";
filename = "aspell6";
- sha256 = "1zai9wrqwgb9z9vfgb22qhrvxvg73jg0ix44j1khm2f6m96lncr4";
+ sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc";
};
eo = buildOfficialDict {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index 6470566d5c..b028813558 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "aws-c-common";
@@ -13,15 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- # can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped
- patches = [
- (fetchpatch {
- name = "fix-re-export-of-target.patch";
- url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch";
- sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
- })
- ];
-
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-Wno-nullability-extension -Wno-typedef-redefinition";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
index ea3633d2e4..d4ba15e52d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "aws-checksums";
@@ -13,14 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- # can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped
- patches = [
- (fetchpatch {
- url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch";
- sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
- })
- ];
-
cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
index a195a2c7bb..b3950cb0d3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,5 @@
{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
+, fetchpatch
, which
, buildPackages
, toolset ? /**/ if stdenv.cc.isClang then "clang"
@@ -113,6 +114,14 @@ stdenv.mkDerivation {
if version == "1.55.0"
then ./darwin-1.55-no-system-python.patch
else ./darwin-no-system-python.patch)
+ # Fix boost-context segmentation faults on ppc64 due to ABI violation
+ ++ optional (versionAtLeast version "1.61" &&
+ versionOlder version "1.71") (fetchpatch {
+ url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
+ sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
+ stripLen = 1;
+ extraPrefix = "libs/context/";
+ })
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
index 22ddb76b29..2346153e2a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
@@ -1,9 +1,9 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
- baseVersion = "2.9";
- revision = "0";
- sha256 = "06fiyalvc68p11qqh953azx2vrbav5vr00yvcfp67p9l4csn8m9h";
+ baseVersion = "2.17";
+ revision = "2";
+ sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb";
postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix
index 04652aa013..8bcc6aaa8e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/botan/default.nix
@@ -4,6 +4,7 @@ callPackage ./generic.nix (args // {
baseVersion = "1.10";
revision = "17";
sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
+ sourceExtension = "tgz";
extraConfigureFlags = "--with-gnump";
postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
index 18b1b47f6d..4d2cf7515c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders
, baseVersion, revision, sha256
+, sourceExtension ? "tar.xz"
, extraConfigureFlags ? ""
, postPatch ? null
, darwin
@@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
version = "${baseVersion}.${revision}";
src = fetchurl {
- name = "Botan-${version}.tgz";
+ name = "Botan-${version}.${sourceExtension}";
urls = [
- "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"
- "http://botan.randombit.net/releases/Botan-${version}.tgz"
+ "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}"
+ "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}"
];
inherit sha256;
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix
index f286c881e4..cebe6fb2bf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "cddlib";
- version = "0.94l";
+ version = "0.94m";
src = fetchFromGitHub {
owner = "cddlib";
repo = "cddlib";
rev = version;
- sha256 = "0934a0i2m2bamlibi4cbrf1md1pz7dp35jbfamb0k7x644sayl4k";
+ sha256 = "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0";
};
buildInputs = [gmp];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
index 26a943791e..18f029c458 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix
@@ -12,11 +12,11 @@ assert runTests -> gflags != null;
stdenv.mkDerivation rec {
pname = "ceres-solver";
- version = "1.14.0";
+ version = "2.0.0";
src = fetchurl {
url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz";
- sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27";
+ sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix
index 65f9982b42..594cac5002 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
"--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
homepage = "https://launchpad.net/dee";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix
index 02feba0a43..317742f07b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix
@@ -2,14 +2,14 @@
}:
stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.4.1";
pname = "draco";
src = fetchFromGitHub {
owner = "google";
repo = "draco";
rev = version;
- sha256 = "0s65il754fpiygbg0yq2xynpbnmhiiaxghkzprjqxziyz6gi87lm";
+ sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix
index c8ec81f79e..b2c4d3741e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix
@@ -8,11 +8,11 @@ assert mp4v2Support -> (mp4v2 != null);
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "faac";
- version = "1.29.9.2";
+ version = "1.30";
src = fetchurl {
- url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
- sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl";
+ url = "mirror://sourceforge/faac/${pname}-${builtins.replaceStrings ["."] ["_"] version}.tar.gz";
+ sha256 = "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd";
};
configureFlags = [ ]
diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
index be648cf5a8..62f73a3619 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
@@ -1,18 +1,37 @@
-{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
-, gflags, libiberty, openssl }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, boost
+, libevent
+, double-conversion
+, glog
+, gflags
+, libiberty
+, lz4
+, lzma
+, zlib
+, jemalloc
+, openssl
+, pkg-config
+, libunwind
+, fmt
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
pname = "folly";
- version = "2019.11.11.00";
+ version = "2020.09.28.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "1sgv7sdalbs7zhz3zcc95gn2h8j2xjf7hkw2c618zc3pdn6aa58w";
+ sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
# See CMake/folly-deps.cmake in the Folly source tree.
buildInputs = [
@@ -23,9 +42,15 @@ stdenv.mkDerivation rec {
libevent
libiberty
openssl
+ lz4
+ lzma
+ zlib
+ jemalloc
+ libunwind
+ fmt
];
- enableParallelBuilding = true;
+ cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; {
description = "An open-source C++ library developed and used at Facebook";
@@ -35,4 +60,6 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ abbradar pierreis ];
};
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+ LDFLAGS = "-ljemalloc";
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index 2d6fae915f..f95818b399 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "gdk-pixbuf";
- version = "2.42.0";
+ version = "2.42.2";
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k";
+ sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz
new file mode 100644
index 0000000000..6141f08efa
Binary files /dev/null and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-10.patch.gz differ
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 630b6b8244..dd76745e1f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
let
version = "2.32";
- patchSuffix = "";
+ patchSuffix = "-10";
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
in
@@ -59,6 +59,15 @@ stdenv.mkDerivation ({
patches =
[
+ /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git
+ and using git or something would complicate bootstrapping.
+ Fortunately it's not too big with 2.32-10.
+ $ git checkout release/2.32/master; git describe
+ glibc-2.32-10-g0b9460d22e
+ $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-10.patch.gz
+ */
+ ./2.32-10.patch.gz
+
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index c5edeb2021..49343e79c8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -89,13 +89,13 @@ let
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1cn18cbqyysrxnrk5bpxdzd5xcws9g2kmm5rbv00cx6rhn69g5f1";
+ sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index da3434a77c..4728e49c51 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-base";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0hf66sh8d4x2ksfnvaq2rqrrfq0vi0pv6wbh9i5jixrhvvbm99hv";
+ sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index 3ea0bd8903..c2a639dff2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "gstreamer";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1fpcpsw740svvdxvvwn0hly5i72miizm4s0mbid10ji83zi8vpvr";
+ sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
index fe4c7005f6..6743a5ecd6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1pxhg8n5nl34baq6mb07i27b33gaw47zrv5yalyj6f12pnx148ki";
+ sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
index 075b2059db..75e065e6d2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [
"out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "09rr5a198p1r9wcbsjl01xg6idkfkgj5h9x7xxywarb5i7qv6g79";
+ sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
index 99b00e6ca9..d4c3b99c7c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
@@ -51,13 +51,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0v329xi4qhlfh9aksfyviryqk9lclm4wj1lxrjnbdv4haldfj472";
+ sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index 2763524739..c75d439cd5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1n1fkkbxxsndblnbm0c2ziqp967hrz5gag6z36xbpvqk4sy1g9rr";
+ sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 87aca8a7cf..4167b17277 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0m7p7sarvi6n9pz0rrl9k3gp3l5s42qs8z0165kyd6fiqdjjia0h";
+ sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
};
outputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
index ab922f9880..1cdc0a5193 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
- version = "1.18.1";
+ version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "09gpbykjchw3lb51ipxj53fy238gr9mg9jybcg5135pb56w6rk8q";
+ sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a1a6223798..52a6cb2789 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1sm6x2qa7ng78w0w8q4mjs7pbpbbk8qkfgzhdmbb8l0bh513q3a0";
+ sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
};
outputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index aee846ccfc..654ad3116a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
@@ -51,7 +51,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
- version = "3.24.23";
+ version = "3.24.24";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
- sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx";
+ sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
};
patches = [
@@ -73,13 +73,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
-
- # Fix path handling in pkg-config. MR for the gtk-3-24 branch:
- # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
- sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0";
- })
] ++ optionals stdenv.isDarwin [
# X11 module requires which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index fb315150e0..561a4693c1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with stdenv.lib;
let
- version = "2.3.0";
+ version = "2.4.0";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
- sha256 = "0r4a07ag1fv48ql2g64px0wrjpxlvkh6c7mhnkv9xxkkg04zc1xn";
+ sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
index 6019a69f35..7d80152103 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "igraph";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
- sha256 = "159qd4al19k1i5a54m2q2mxvig4z2lz9h3rd5rq44bklybdc0i7j";
+ sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
index 8d9a323fa4..30d572853c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -20,6 +20,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
description = "Intel Graphics Memory Management Library";
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ danieldk ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
index 43dbe67656..ada25e10d5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
- version = "20.4.2";
+ version = "20.4.3";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
- sha256 = "1nz0f2chfm3rr8aggb7md0cmikwpd9159ql1rc59208nvl2fshrb";
+ sha256 = "04a0hcw9f8fr96xpc1inc19mncssqzxmjba9cdvvh71n8j7n3yyw";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
index 839b2eb466..ea38934b00 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/)
+WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix
index 6537778958..1b326e51de 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,16 +1,22 @@
{
- mkDerivation, lib, propagate,
+ mkDerivation, lib, propagate, wrapGAppsHook,
extra-cmake-modules, kdoctools,
- kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
+ gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit,
+ kservice, qtbase,
}:
mkDerivation {
name = "kded";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
- kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
+ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit
+ kservice qtbase
];
outputs = [ "out" "dev" ];
setupHook = propagate "out";
+ dontWrapGApps = true;
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index ca015151e0..483ab16dcc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,16 +1,18 @@
{
- mkDerivation,
+ mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
- qtbase, qttools, qtx11extras,
+ qtbase, qttools, qtx11extras, libXdmcp,
}:
mkDerivation {
name = "kglobalaccel";
+ meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
- qtx11extras
+ qtx11extras libXdmcp
];
+ outputs = [ "out" "dev" ];
propagatedBuildInputs = [ qtbase ];
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
new file mode 100644
index 0000000000..609376e33e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
@@ -0,0 +1,50 @@
+From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel
+Date: Wed, 9 Dec 2020 10:01:59 -0600
+Subject: [PATCH] platform plugins path
+
+---
+ src/pluginwrapper.cpp | 27 +++++++++++++--------------
+ 1 file changed, 13 insertions(+), 14 deletions(-)
+
+diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
+index a255d83..9699b08 100644
+--- a/src/pluginwrapper.cpp
++++ b/src/pluginwrapper.cpp
+@@ -25,20 +25,19 @@ static QStringList pluginCandidates()
+ {
+ QStringList ret;
+ const auto paths = QCoreApplication::libraryPaths();
+- for (const QString &path : paths) {
+- static const QStringList searchFolders {
+- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
+- QStringLiteral("/kf5/kwindowsystem"),
+- };
+- for (const QString &searchFolder : searchFolders) {
+- QDir pluginDir(path + searchFolder);
+- if (!pluginDir.exists()) {
+- continue;
+- }
+- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+- for (const QString &entry : entries) {
+- ret << pluginDir.absoluteFilePath(entry);
+- }
++ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH);
++ static const QStringList searchFolders {
++ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
++ QStringLiteral("/kf5/kwindowsystem"),
++ };
++ for (const QString &searchFolder : searchFolders) {
++ QDir pluginDir(path + searchFolder);
++ if (!pluginDir.exists()) {
++ continue;
++ }
++ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
++ for (const QString &entry : entries) {
++ ret << pluginDir.absoluteFilePath(entry);
+ }
+ }
+ return ret;
+--
+2.28.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 1e77b63f7c..ab93966c0a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -9,13 +9,13 @@ mkDerivation {
name = "kwindowsystem";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = lib.versionOlder qtbase.version "5.7.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
patches = [
- ./platform-plugins-path.patch
+ ./0001-platform-plugins-path.patch
];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
deleted file mode 100644
index 2750173221..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
-===================================================================
---- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
-+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
-@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
- static QStringList pluginCandidates()
- {
- QStringList ret;
-- const auto paths = QCoreApplication::libraryPaths();
-- for (const QString &path : paths) {
-- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
-- if (!pluginDir.exists()) {
-- continue;
-- }
-- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-- for (const QString &entry : entries) {
-- ret << pluginDir.absoluteFilePath(entry);
-- }
-+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
-+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-+ for (const QString &entry : entries) {
-+ ret << pluginDir.absoluteFilePath(entry);
- }
- return ret;
- }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix
index 1484b2d048..6f1527da77 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -1,6 +1,7 @@
{
mkDerivation, lib, extra-cmake-modules, qtbase
, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
+, fetchpatch
}:
mkDerivation {
@@ -8,7 +9,7 @@ mkDerivation {
meta = { maintainers = [ lib.maintainers.bkchr ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
- qtbase qtdeclarative kconfig kcoreaddons
+ qtbase qtdeclarative kconfig kcoreaddons
ki18n kio kirigami2
];
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
index 070b11f6bf..dbc74b8311 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -1,670 +1,670 @@
# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/
{ fetchurl, mirror }:
{
attica = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz";
- sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a";
- name = "attica-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz";
+ sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22";
+ name = "attica-5.76.0.tar.xz";
};
};
baloo = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz";
- sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe";
- name = "baloo-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz";
+ sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9";
+ name = "baloo-5.76.0.tar.xz";
};
};
bluez-qt = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz";
- sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4";
- name = "bluez-qt-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz";
+ sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835";
+ name = "bluez-qt-5.76.0.tar.xz";
};
};
breeze-icons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz";
- sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b";
- name = "breeze-icons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz";
+ sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b";
+ name = "breeze-icons-5.76.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz";
- sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4";
- name = "extra-cmake-modules-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz";
+ sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32";
+ name = "extra-cmake-modules-5.76.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz";
- sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3";
- name = "frameworkintegration-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz";
+ sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb";
+ name = "frameworkintegration-5.76.0.tar.xz";
};
};
kactivities = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz";
- sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a";
- name = "kactivities-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz";
+ sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422";
+ name = "kactivities-5.76.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz";
- sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a";
- name = "kactivities-stats-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz";
+ sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14";
+ name = "kactivities-stats-5.76.0.tar.xz";
};
};
kapidox = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz";
- sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5";
- name = "kapidox-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz";
+ sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97";
+ name = "kapidox-5.76.0.tar.xz";
};
};
karchive = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz";
- sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f";
- name = "karchive-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz";
+ sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a";
+ name = "karchive-5.76.0.tar.xz";
};
};
kauth = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz";
- sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9";
- name = "kauth-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz";
+ sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89";
+ name = "kauth-5.76.0.tar.xz";
};
};
kbookmarks = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz";
- sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51";
- name = "kbookmarks-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz";
+ sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af";
+ name = "kbookmarks-5.76.0.tar.xz";
};
};
kcalendarcore = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz";
- sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713";
- name = "kcalendarcore-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz";
+ sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae";
+ name = "kcalendarcore-5.76.0.tar.xz";
};
};
kcmutils = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz";
- sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9";
- name = "kcmutils-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz";
+ sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009";
+ name = "kcmutils-5.76.0.tar.xz";
};
};
kcodecs = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz";
- sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67";
- name = "kcodecs-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz";
+ sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1";
+ name = "kcodecs-5.76.0.tar.xz";
};
};
kcompletion = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz";
- sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a";
- name = "kcompletion-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz";
+ sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a";
+ name = "kcompletion-5.76.0.tar.xz";
};
};
kconfig = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz";
- sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e";
- name = "kconfig-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz";
+ sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686";
+ name = "kconfig-5.76.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz";
- sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e";
- name = "kconfigwidgets-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz";
+ sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4";
+ name = "kconfigwidgets-5.76.0.tar.xz";
};
};
kcontacts = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz";
- sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb";
- name = "kcontacts-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz";
+ sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5";
+ name = "kcontacts-5.76.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz";
- sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51";
- name = "kcoreaddons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz";
+ sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6";
+ name = "kcoreaddons-5.76.0.tar.xz";
};
};
kcrash = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz";
- sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583";
- name = "kcrash-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz";
+ sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993";
+ name = "kcrash-5.76.0.tar.xz";
};
};
kdav = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz";
- sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31";
- name = "kdav-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz";
+ sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72";
+ name = "kdav-5.76.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz";
- sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba";
- name = "kdbusaddons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz";
+ sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a";
+ name = "kdbusaddons-5.76.0.tar.xz";
};
};
kdeclarative = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz";
- sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598";
- name = "kdeclarative-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz";
+ sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3";
+ name = "kdeclarative-5.76.0.tar.xz";
};
};
kded = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz";
- sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895";
- name = "kded-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz";
+ sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516";
+ name = "kded-5.76.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz";
- sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b";
- name = "kdelibs4support-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz";
+ sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d";
+ name = "kdelibs4support-5.76.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz";
- sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2";
- name = "kdesignerplugin-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz";
+ sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71";
+ name = "kdesignerplugin-5.76.0.tar.xz";
};
};
kdesu = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz";
- sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d";
- name = "kdesu-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz";
+ sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642";
+ name = "kdesu-5.76.0.tar.xz";
};
};
kdewebkit = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz";
- sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b";
- name = "kdewebkit-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz";
+ sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba";
+ name = "kdewebkit-5.76.0.tar.xz";
};
};
kdnssd = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz";
- sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d";
- name = "kdnssd-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz";
+ sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753";
+ name = "kdnssd-5.76.0.tar.xz";
};
};
kdoctools = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz";
- sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d";
- name = "kdoctools-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz";
+ sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4";
+ name = "kdoctools-5.76.0.tar.xz";
};
};
kemoticons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz";
- sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778";
- name = "kemoticons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz";
+ sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99";
+ name = "kemoticons-5.76.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz";
- sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894";
- name = "kfilemetadata-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz";
+ sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68";
+ name = "kfilemetadata-5.76.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz";
- sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f";
- name = "kglobalaccel-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz";
+ sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4";
+ name = "kglobalaccel-5.76.0.tar.xz";
};
};
kguiaddons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz";
- sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350";
- name = "kguiaddons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz";
+ sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125";
+ name = "kguiaddons-5.76.0.tar.xz";
};
};
kholidays = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz";
- sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab";
- name = "kholidays-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz";
+ sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b";
+ name = "kholidays-5.76.0.tar.xz";
};
};
khtml = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz";
- sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262";
- name = "khtml-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz";
+ sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4";
+ name = "khtml-5.76.0.tar.xz";
};
};
ki18n = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz";
- sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689";
- name = "ki18n-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz";
+ sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a";
+ name = "ki18n-5.76.0.tar.xz";
};
};
kiconthemes = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz";
- sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356";
- name = "kiconthemes-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz";
+ sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3";
+ name = "kiconthemes-5.76.0.tar.xz";
};
};
kidletime = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz";
- sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2";
- name = "kidletime-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz";
+ sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62";
+ name = "kidletime-5.76.0.tar.xz";
};
};
kimageformats = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz";
- sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b";
- name = "kimageformats-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz";
+ sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d";
+ name = "kimageformats-5.76.0.tar.xz";
};
};
kinit = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz";
- sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770";
- name = "kinit-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz";
+ sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546";
+ name = "kinit-5.76.0.tar.xz";
};
};
kio = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz";
- sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66";
- name = "kio-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz";
+ sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b";
+ name = "kio-5.76.0.tar.xz";
};
};
kirigami2 = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz";
- sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb";
- name = "kirigami2-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz";
+ sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a";
+ name = "kirigami2-5.76.0.tar.xz";
};
};
kitemmodels = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz";
- sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371";
- name = "kitemmodels-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz";
+ sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0";
+ name = "kitemmodels-5.76.0.tar.xz";
};
};
kitemviews = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz";
- sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727";
- name = "kitemviews-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz";
+ sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001";
+ name = "kitemviews-5.76.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz";
- sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf";
- name = "kjobwidgets-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz";
+ sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf";
+ name = "kjobwidgets-5.76.0.tar.xz";
};
};
kjs = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz";
- sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5";
- name = "kjs-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz";
+ sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a";
+ name = "kjs-5.76.0.tar.xz";
};
};
kjsembed = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz";
- sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3";
- name = "kjsembed-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz";
+ sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88";
+ name = "kjsembed-5.76.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz";
- sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2";
- name = "kmediaplayer-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz";
+ sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89";
+ name = "kmediaplayer-5.76.0.tar.xz";
};
};
knewstuff = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz";
- sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e";
- name = "knewstuff-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz";
+ sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b";
+ name = "knewstuff-5.76.0.tar.xz";
};
};
knotifications = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz";
- sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c";
- name = "knotifications-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz";
+ sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2";
+ name = "knotifications-5.76.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz";
- sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4";
- name = "knotifyconfig-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz";
+ sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e";
+ name = "knotifyconfig-5.76.0.tar.xz";
};
};
kpackage = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz";
- sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f";
- name = "kpackage-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz";
+ sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772";
+ name = "kpackage-5.76.0.tar.xz";
};
};
kparts = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz";
- sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2";
- name = "kparts-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz";
+ sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d";
+ name = "kparts-5.76.0.tar.xz";
};
};
kpeople = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz";
- sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4";
- name = "kpeople-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz";
+ sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545";
+ name = "kpeople-5.76.0.tar.xz";
};
};
kplotting = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz";
- sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14";
- name = "kplotting-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz";
+ sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e";
+ name = "kplotting-5.76.0.tar.xz";
};
};
kpty = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz";
- sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c";
- name = "kpty-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz";
+ sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7";
+ name = "kpty-5.76.0.tar.xz";
};
};
kquickcharts = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz";
- sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe";
- name = "kquickcharts-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz";
+ sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2";
+ name = "kquickcharts-5.76.0.tar.xz";
};
};
kross = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz";
- sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e";
- name = "kross-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz";
+ sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291";
+ name = "kross-5.76.0.tar.xz";
};
};
krunner = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz";
- sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09";
- name = "krunner-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz";
+ sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda";
+ name = "krunner-5.76.0.tar.xz";
};
};
kservice = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz";
- sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b";
- name = "kservice-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz";
+ sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf";
+ name = "kservice-5.76.0.tar.xz";
};
};
ktexteditor = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz";
- sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18";
- name = "ktexteditor-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz";
+ sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2";
+ name = "ktexteditor-5.76.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz";
- sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5";
- name = "ktextwidgets-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz";
+ sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84";
+ name = "ktextwidgets-5.76.0.tar.xz";
};
};
kunitconversion = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz";
- sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935";
- name = "kunitconversion-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz";
+ sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c";
+ name = "kunitconversion-5.76.0.tar.xz";
};
};
kwallet = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz";
- sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1";
- name = "kwallet-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz";
+ sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc";
+ name = "kwallet-5.76.0.tar.xz";
};
};
kwayland = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz";
- sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe";
- name = "kwayland-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz";
+ sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7";
+ name = "kwayland-5.76.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz";
- sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6";
- name = "kwidgetsaddons-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz";
+ sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6";
+ name = "kwidgetsaddons-5.76.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz";
- sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8";
- name = "kwindowsystem-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz";
+ sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7";
+ name = "kwindowsystem-5.76.0.tar.xz";
};
};
kxmlgui = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz";
- sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb";
- name = "kxmlgui-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz";
+ sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82";
+ name = "kxmlgui-5.76.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz";
- sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047";
- name = "kxmlrpcclient-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz";
+ sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de";
+ name = "kxmlrpcclient-5.76.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz";
- sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd";
- name = "modemmanager-qt-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz";
+ sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1";
+ name = "modemmanager-qt-5.76.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz";
- sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f";
- name = "networkmanager-qt-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz";
+ sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90";
+ name = "networkmanager-qt-5.76.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz";
- sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc";
- name = "oxygen-icons5-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz";
+ sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1";
+ name = "oxygen-icons5-5.76.0.tar.xz";
};
};
plasma-framework = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz";
- sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93";
- name = "plasma-framework-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz";
+ sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a";
+ name = "plasma-framework-5.76.0.tar.xz";
};
};
prison = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz";
- sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87";
- name = "prison-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz";
+ sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78";
+ name = "prison-5.76.0.tar.xz";
};
};
purpose = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz";
- sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32";
- name = "purpose-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz";
+ sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d";
+ name = "purpose-5.76.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz";
- sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd";
- name = "qqc2-desktop-style-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz";
+ sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3";
+ name = "qqc2-desktop-style-5.76.0.tar.xz";
};
};
solid = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz";
- sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933";
- name = "solid-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz";
+ sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d";
+ name = "solid-5.76.0.tar.xz";
};
};
sonnet = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz";
- sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c";
- name = "sonnet-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz";
+ sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b";
+ name = "sonnet-5.76.0.tar.xz";
};
};
syndication = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz";
- sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954";
- name = "syndication-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz";
+ sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292";
+ name = "syndication-5.76.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz";
- sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b";
- name = "syntax-highlighting-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz";
+ sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3";
+ name = "syntax-highlighting-5.76.0.tar.xz";
};
};
threadweaver = {
- version = "5.73.0";
+ version = "5.76.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz";
- sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38";
- name = "threadweaver-5.73.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz";
+ sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039";
+ name = "threadweaver-5.76.0.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix
index dc83209c14..869d7ae1b0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/keystone/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
};
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ];
+
nativeBuildInputs = [
pkg-config
cmake
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
index 168ce0c9e5..54dbb349eb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libabigail";
- version = "1.7";
+ version = "1.8";
outputs = [ "bin" "out" "dev" ];
src = fetchurl {
url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7";
+ sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
index 3c97ce21ce..787745a6bd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
@@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null;
stdenv.mkDerivation rec {
pname = "libarchive";
- version = "3.4.3";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "libarchive";
repo = "libarchive";
rev = "v${version}";
- sha256 = "1y0v03p6zyv6plr2p0pid1qfgmk8hd427spj8xa93mcdmq5yc3s0";
+ sha256 = "0dj01ayyac3q5a62rqxyskr4fjiq6iappd85zn3rx64xny5fl07d";
};
outputs = [ "out" "lib" "dev" ];
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
compressed with gzip, bzip2, lzma, xz, ...
'';
homepage = "http://libarchive.org";
+ changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}";
license = stdenv.lib.licenses.bsd3;
platforms = with stdenv.lib.platforms; all;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
index 829d16e59d..df1558a1e4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ];
propagatedBuildInputs = [ dbus-glib ];
+ enableParallelBuilding = true;
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
index 35707834c0..b571e816fc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libctemplate/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
pname = "ctemplate";
+ version = "2.4";
- version = "2.3";
-
- src = fetchurl {
- url = "https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-${version}.tar.gz";
- sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr";
+ src = fetchFromGitHub {
+ owner = "OlafvdSpek";
+ repo = "ctemplate";
+ rev = "ctemplate-${version}";
+ sha256 = "1x0p5yym6vvcx70pm8ihnbxxrl2wnblfp72ih5vjyg8mzkc8cxrr";
};
- buildInputs = [ python2 ];
+ nativeBuildInputs = [ python3 autoconf automake libtool ];
postPatch = ''
patchShebangs .
'';
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
meta = {
description = "A simple but powerful template language for C++";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix
index 8413d5be44..874f45cae7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DWITH_PROCPS=Off" ];
+ # CMake is hardcoded to always build static library which causes linker
+ # failure for Haskell applications depending on haskellPackages.hevm on macOS.
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
+ '';
+
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost gmp openssl ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
index 469633afb1..4984d95ffa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "libfprint";
- version = "1.90.4";
+ version = "1.90.5";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "libfprint";
repo = pname;
rev = "v${version}";
- sha256 = "0grhck0h29i7hm7npvby7pn7wdc446kv0r4mkpbssp46lqbjb96b";
+ sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
index 93c98bb1f1..89bca2ee75 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
- version = "2.5.23";
+ version = "2.5.26";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
- sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2";
+ sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6";
};
patches = [];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
index 18a5dcbab6..dff2ca8295 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
@@ -27,14 +27,14 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libinput";
- version = "1.16.3";
+ version = "1.16.4";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = version;
- sha256 = "0dj2m92kh3xpnjmzp416c73hpw6ban0f6yj39chwxckdgyliak6z";
+ sha256 = "1c81429kh9av9fanxmnjw5rvsjbzcyi7d0dx0gkyq5yysmpmrppi";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
index d627bf81cb..7e14c1b533 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
stdenv.mkDerivation rec {
- name = "libksba-1.4.0";
+ name = "libksba-1.5.0";
src = fetchurl {
url = "mirror://gnupg/libksba/${name}.tar.bz2";
- sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz";
+ sha256 = "1fm0mf3wq9fmyi1rmc1vk2fafn6liiw2mgxml3g7ybbb44lz2jmf";
};
outputs = [ "out" "dev" "info" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
index 231f18377e..2d38a5021e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, file }:
let
version = "0.8.9.0";
@@ -6,6 +6,12 @@ in stdenv.mkDerivation rec {
pname = "libmodplug";
inherit version;
+ preConfigure = ''
+ substituteInPlace configure \
+ --replace ' -mmacosx-version-min=10.5' "" \
+ --replace /usr/bin/file ${file}/bin/file
+ '';
+
meta = with stdenv.lib; {
description = "MOD playing library";
homepage = "http://modplug-xmms.sourceforge.net/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
index f79bc104fc..a0d32f5178 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/fedora-modularity/libmodulemd";
license = licenses.mit;
maintainers = with maintainers; [ ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin ;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix
index d2333ac0ca..e7b01ca29c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnice/default.nix
@@ -16,13 +16,14 @@
}:
stdenv.mkDerivation rec {
- name = "libnice-0.1.16";
+ pname = "libnice";
+ version = "0.1.18";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
- url = "https://nice.freedesktop.org/releases/${name}.tar.gz";
- sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6";
+ url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz";
+ sha256 = "1x3kj9b3dy9m2h6j96wgywfamas1j8k2ca43k5v82kmml9dx5asy";
};
patches = [
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
It provides a GLib-based library, libnice and a Glib-free library,
libstun as well as GStreamer elements.'';
- homepage = "https://nice.freedesktop.org/wiki/";
+ homepage = "https://libnice.freedesktop.org/";
platforms = platforms.linux;
license = with licenses; [ lgpl21 mpl11 ];
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix
index 1f67e1fc79..d7e83e7a9e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libow/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
stdenv.mkDerivation rec {
- version = "3.2p3";
+ version = "3.2p4";
pname = "libow";
src = fetchFromGitHub {
owner = "owfs";
repo = "owfs";
rev = "v${version}";
- sha256 = "02l3r4ixhicph5iqxdjanck2gbqkfs9vnnac112bzlvlw3x9r03m";
+ sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
new file mode 100644
index 0000000000..adabbe11cb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/librtprocess/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "librtprocess";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "CarVac";
+ repo = pname;
+ rev = version;
+ sha256 = "1bivy3rymmmkdx5phbxq4qaq15hw633dgpks57z9ara15mh817xx";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/CarVac/librtprocess";
+ description = "Highly optimized library for processing RAW images";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ hjones2199 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
index ab1df8d2bc..a0414f5ba5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# src input for buildPythonPackage calls
postInstall = ''
cp -R ./src/python/ tmp-pythonsrc/
- tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
+ tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
'';
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
new file mode 100644
index 0000000000..bb3de08cf7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }:
+
+stdenv.mkDerivation rec {
+ name = "libsmartcols";
+ version = "v2.36.1";
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig python3 ];
+
+ src = fetchFromGitHub {
+ owner = "karelzak";
+ repo = "util-linux";
+ rev = version;
+ sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs";
+ };
+
+ configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ];
+
+ buildPhase = ''
+ make libsmartcols.la
+ '';
+
+ installTargets = [ "install-am" "install-pkgconfigDATA" ];
+
+ meta = {
+ description = "smart column output alignment library";
+ homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
+ license = stdenv.lib.licenses.gpl2Plus;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ maintainers = with stdenv.lib.maintainers; [ rb2k ];
+ };
+}
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix
index 65ab87a0cf..d75d9cc078 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "A free package dependency solver";
homepage = "https://github.com/openSUSE/libsolv";
license = licenses.bsd3;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ copumpkin ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix
rename to third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
similarity index 71%
rename from third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
rename to third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
index 91e5a54bab..9a165780b7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
@@ -1,10 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
-, zlib, boost, openssl, libtool, python, libiconv, ncurses
+{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf
+, zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
}:
let
- version = "1.2.6";
- formattedVersion = lib.replaceChars ["."] ["_"] version;
+ version = "1.2.11";
# Make sure we override python, so the correct version is chosen
# for the bindings, if overridden
@@ -17,13 +16,17 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "arvidn";
repo = "libtorrent";
- rev = "libtorrent-${formattedVersion}";
- sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr";
+ rev = "v${version}";
+ sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b";
};
enableParallelBuilding = true;
- nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
- buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
+
+ nativeBuildInputs = [ automake autoconf libtool pkg-config ];
+
+ buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+
preConfigure = "./autotool.sh";
postInstall = ''
@@ -45,6 +48,7 @@ in stdenv.mkDerivation {
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
+ broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
new file mode 100644
index 0000000000..e9c59ed97e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake
+, zlib, boost, openssl, python, ncurses, SystemConfiguration
+}:
+
+let
+ version = "2.0.1";
+
+ # Make sure we override python, so the correct version is chosen
+ boostPython = boost.override { enablePython = true; inherit python; };
+
+in stdenv.mkDerivation {
+ pname = "libtorrent-rasterbar";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "arvidn";
+ repo = "libtorrent";
+ rev = "v${version}";
+ sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ boostPython openssl zlib python ncurses ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+
+ postInstall = ''
+ moveToOutput "include" "$dev"
+ moveToOutput "lib/${python.libPrefix}" "$python"
+ '';
+
+ outputs = [ "out" "dev" "python" ];
+
+ cmakeFlags = [
+ "-Dpython-bindings=on"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://libtorrent.org/";
+ description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.phreedom ];
+ broken = stdenv.isDarwin;
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
index 0f0143b9c1..3816788f92 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoreconfHook, xz }:
+{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }:
stdenv.mkDerivation rec {
pname = "libunwind";
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
- outputs = [ "out" "dev" ];
+ outputs = [ "out" "dev" "devman" ];
+
+ # Without latex2man, no man pages are installed despite being
+ # prebuilt in the source tarball.
+ configureFlags = "LATEX2MAN=${coreutils}/bin/true";
propagatedBuildInputs = [ xz ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
index 8499e16c29..10310e22da 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
@@ -13,13 +13,13 @@ assert enableUdev -> udev != null;
stdenv.mkDerivation rec {
pname = "libusb";
- version = "1.0.23";
+ version = "1.0.24";
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb";
rev = "v${version}";
- sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";
+ sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7";
};
outputs = [ "out" "dev" ];
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
license = licenses.lgpl21Plus;
- maintainers = [ ];
+ maintainers = with maintainers; [ prusnak ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
index f6c8c9d0bb..f37780f5d6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
- version = "2.9.1"; # Also update the hash for libva-utils!
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva";
rev = version;
- sha256 = "1c9rwrz30q2p47spzb9gsakwci9c5mw6i309z7p7hr2d8233ay4x";
+ sha256 = "1xyxnxmq04s3s6135v6av1rl5z809j9vxvg7af9wvyh3dgsxrlds";
};
outputs = [ "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix
index 675d85508b..f860c328fe 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
- inherit (libva) version;
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
- sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k";
+ sha256 = "14v4mw0asjgg4l0683hn87d8jai8lrmcpbfcm9z93p4mpn2sp7aw";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix
new file mode 100644
index 0000000000..b5fe6e5935
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libzra/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libzra";
+ version = "unstable-2020-08-10";
+
+ src = fetchFromGitHub {
+ owner = "zraorg";
+ repo = "zra";
+ rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b";
+ sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/zraorg/ZRA";
+ description = "Library for ZStandard random access";
+ platforms = platforms.all;
+ maintainers = [ maintainers.ivar ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix
index 97cc4f7ff2..49ffade854 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "malcontent";
- version = "0.9.0";
+ version = "0.10.0";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = pname;
rev = version;
- sha256 = "DEtibrGgHSgRjaarAzizzLN1xsJKXl+LCQ29FmpPoJo=";
+ sha256 = "1b6rgf7h9gj2kw1b7ba0mvhsb89riwf9p4pviqjfzd1i5nmbmnyx";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 891e11dbad..578763478f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -31,7 +31,7 @@ with stdenv.lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
- version = "20.2.3";
+ version = "20.2.4";
branch = versions.major version;
in
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
- sha256 = "0axqrqg1fas91fx30qjwhcp4yasdvk919hjds4lga7ak247286xf";
+ sha256 = "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5";
};
prePatch = "patchShebangs .";
@@ -64,12 +64,8 @@ stdenv.mkDerivation {
# TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available
(fetchpatch {
name = "nine_debug-Make-tid-more-type-correct";
- # Patch adjusted for version `20.1`, before the big mesa dirs change
- # `gallium: rename 'state tracker' to 'frontend'`.
- # Patch for versions after that change is at
- # https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e3b4745ef16d0e833300ad67044.patch
- url = "https://gitlab.freedesktop.org/nh2/mesa/commit/3385c49684375f1153a52ed7ccda3f5135268a41.patch";
- sha256 = "1ci694sqjll44c9g2md4krhk6qlvq51r7ad5rnnfdnf3l8ys0i50";
+ url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
+ sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
})
]
# do not prefix user provided dri-drivers-path
@@ -101,6 +97,10 @@ stdenv.mkDerivation {
'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"'
substituteInPlace src/util/meson.build --replace \
"get_option('datadir')" "'${placeholder "out"}'"
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ substituteInPlace meson.build --replace \
+ "find_program('nm')" \
+ "find_program('${stdenv.cc.targetPrefix}nm')"
'';
outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
index a4e76506a2..84b86b4715 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "nlohmann_json";
- version = "3.7.3";
+ version = "3.9.1";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w";
+ sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix
index ef1cef84df..17dc93c9f1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix
@@ -15,7 +15,7 @@ let
# It will rebuild itself using the version of this package (NSS) and if
# an update is required do the required changes to the expression.
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
- version = "3.59";
+ version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6";
+ sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix
index 3fac142189..b0a9227b8c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }:
stdenv.mkDerivation rec {
pname = "nuspell";
- version = "4.0.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "nuspell";
repo = "nuspell";
rev = "v${version}";
- sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf";
+ sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ=";
};
nativeBuildInputs = [ cmake pkgconfig pandoc ];
- buildInputs = [ boost icu ];
+ buildInputs = [ icu ];
outputs = [ "out" "lib" "dev" "man" ];
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Free and open source C++ spell checking library";
homepage = "https://nuspell.github.io/";
+ platforms = platforms.all;
maintainers = with maintainers; [ fpletz ];
license = licenses.lgpl3Plus;
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix
index 7f27f7d1c1..22d48c8c60 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
let
- version = "4.0.2";
+ version = "4.1.0";
libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
in stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
owner = "oracle";
repo = "odpi";
rev = "v${version}";
- sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl";
+ sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
index 6dc4bd704d..2b399e9ebc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
- version = "1.7";
+ version = "2.0";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
- sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj";
+ sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
index a723ded6bb..c6547f118d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
@@ -162,15 +162,11 @@ stdenv.mkDerivation {
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
- # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
- # what appears to be some stray headers in dnn/misc/tensorflow
- # in contrib when generating the Python bindings:
patches = [
./cmake-don-t-use-OpenCVFindOpenEXR.patch
] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
postPatch = ''
sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
- sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
'';
preConfigure =
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
index c4a9a4a018..fcd12ba587 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
};
openssl_1_1 = common {
- version = "1.1.1h";
- sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
+ version = "1.1.1i";
+ sha256 = "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8";
patches = [
./1.1/nix-ssl-cert-file.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix
index b127eb0a31..8f06630882 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "pcre2";
- version = "10.35";
+ version = "10.36";
src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
- sha256 = "04s6kmk9qdd4rjz477h547j4bx7hfz0yalpvrm381rqc5ghaijww";
+ sha256 = "0p3699msps07p40g9426lvxa3b41rg7k2fn7qxl2jm0kh4kkkvx9";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix
index 66f2d433ee..160f2f64cf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, doxygen
+{ stdenv, fetchurl, cmake, doxygen, darwin
, zlib }:
let
@@ -14,7 +14,8 @@ let
nativeBuildInputs = [ cmake doxygen ];
- buildInputs = [ zlib ];
+ buildInputs = [ zlib ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
enableParallelBuilding = true;
@@ -32,7 +33,7 @@ let
homepage = "http://icculus.org/physfs/";
description = "Library to provide abstract access to various archives";
license = licenses.free;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
index 85ad11b79b..42014949c0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -42,22 +42,22 @@ in
{
name = "G4EMLOW";
- version = "7.9.1";
- sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342";
+ version = "7.13";
+ sha256 = "0scczd4ismvd4g3vfshbvwv92bzkdjz0ma7y21n6qxxy96v9cj1p";
envvar = "LE";
}
{
name = "G4PhotonEvaporation";
- version = "5.5";
- sha256 = "1mvnbs7yvkii41blks6bkqr8qhxgnj3xxvv1i3vdg2y14shxv5ar";
+ version = "5.7";
+ sha256 = "1rg7fygfxx06h98ywlci6b0b9ih74q8diygr76c3vppxdzjl47kn";
envvar = "LEVELGAMMA";
}
{
name = "G4RadioactiveDecay";
- version = "5.4";
- sha256 = "0qaark6mqzxr3lqawv6ai8z5211qihlp5x2hn86vzx8kgpd7j1r4";
+ version = "5.6";
+ sha256 = "1w8d9zzc4ss7sh1f8cxv5pmrx2b74p1y26377rw9hnlfkiy0g1iq";
envvar = "RADIOACTIVE";
}
@@ -70,8 +70,8 @@ in
{
name = "G4PARTICLEXS";
- version = "2.1";
- sha256 = "0h8ba8jk197npbd9lzq2qlfiklbjgqwk45m1cc6piy5vf8ri0k89";
+ version = "3.1";
+ sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0";
envvar = "PARTICLEXS";
}
@@ -98,15 +98,15 @@ in
{
name = "G4ENSDFSTATE";
- version = "2.2";
- sha256 = "19p0sq0rmyg48j9hddqy24dn99md7ddiyq09lyj381q7cbpjfznx";
+ version = "2.3";
+ sha256 = "00wjir59rrrlk0a12vi8rsnhyya71rdi1kmark9sp487hbhcai4l";
envvar = "ENSDFSTATE";
}
{
name = "G4RealSurface";
- version = "2.1.1";
- sha256 = "0l3gs0nlp10cjlwiln3f72zfch0av2g1r8m2ny9afgvwgbwiyj4h";
+ version = "2.2";
+ sha256 = "08382y1258ifs7nap6zaaazvabg72blr0dkqgwk32lrg07hdwm4r";
envvar = "REALSURFACE";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
index dc809d5893..7caae2c52d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
@@ -48,20 +48,20 @@ let
in
stdenv.mkDerivation rec {
- version = "10.6.3";
+ version = "10.7.0";
pname = "geant4";
src = fetchurl{
- url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz";
- sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb";
+ url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz";
+ sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp";
};
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
postPatch = ''
# Fix for boost 1.67+
substituteInPlace environments/g4py/CMakeLists.txt \
- --replace "find_package(Boost REQUIRED python)" \
- "find_package(Boost REQUIRED COMPONENTS $boost_python_lib)"
+ --replace "REQUIRED python" \
+ "REQUIRED COMPONENTS $boost_python_lib"
substituteInPlace environments/g4py/G4PythonHelpers.cmake \
--replace "Boost::python" "Boost::$boost_python_lib"
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index abf37def8c..f95328964b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rivet";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
- sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0";
+ sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
index 273566adc0..3a8fbbbdd5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yoda";
- version = "1.8.4";
+ version = "1.8.5";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
- sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x";
+ sha256 = "1z9jmabsaddhs003zzq73fpq2absd12rnc2sa5qn45zwf62nnbjc";
};
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index d07c77f4e2..c9697ee1a4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
@@ -24,7 +24,7 @@
, nixosTests
, gstreamerSupport ? true, gst_all_1 ? null
, ffmpegSupport ? true, ffmpeg ? null
-, bluezSupport ? true, bluez ? null, sbc ? null
+, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null
, nativeHspSupport ? true
, ofonoSupport ? true
, hsphfpdSupport ? true
@@ -39,7 +39,7 @@ let
in
stdenv.mkDerivation rec {
pname = "pipewire";
- version = "0.3.17";
+ version = "0.3.18";
outputs = [
"out"
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "pipewire";
rev = version;
- sha256 = "1gzdahji23fsgjycc08h7zzv8filmzdrkyvpkljc881l4cb5l58n";
+ sha256 = "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g";
};
patches = [
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
systemd
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
++ lib.optional ffmpegSupport ffmpeg
- ++ lib.optionals bluezSupport [ bluez sbc ];
+ ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc ];
mesonFlags = [
"-Ddocs=true"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix
index 60215c9531..f68833bdac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix
@@ -3,7 +3,7 @@
} :
let
- version = "3.2.1";
+ version = "3.2.2";
in stdenv.mkDerivation {
pname = "pmix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
repo = "openpmix";
owner = "openpmix";
rev = "v${version}";
- sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh";
+ sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix
index a51db09db8..f1c93e0fa7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
};
patches = [(fetchpatch {
- name = "ppl.patch";
- url = "http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=patch;h=c39f6a07b51f89e365b05ba4147aa2aa448febd7";
+ name = "clang5-support.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ppl/patches/clang5-support.patch?h=9.2";
sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87";
})];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
index 90d4cb45ce..b941021cb6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
"BLAS=-L${blas}/lib -lblas"
"PREFIX=${placeholder "out"}"
${stdenv.lib.optionalString blas.isILP64
- # Use their FFLAGS along with `-fdefault-integer-8`. If another
- # application intends to use arpack, it should add this to it's FFLAGS as
- # well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339
- "FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8"
+ # If another application intends to use qrupdate compiled with blas with
+ # 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
+ # https://savannah.gnu.org/bugs/?50339
+ "FFLAGS=-fdefault-integer-8"
}
)
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index b4e3d681c7..2712b45bdd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -57,6 +57,12 @@ let
# Downgrade minimal required SDK to 10.12
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
+ ./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
# Patch framework detection to support X.framework/X.tbd,
@@ -77,22 +83,19 @@ let
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
- qtwebengine = [
- # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
- (fetchpatch {
- name = "qtwebengine-bison-3.7-build.patch";
- url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
- sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
- stripLen = 1;
- extraPrefix = "src/3rdparty/";
- })
- ]
+ qtwebengine = [ ]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
- qtwebkit = [ ./qtwebkit.patch ]
- ++ optionals stdenv.isDarwin [
- ./qtwebkit-darwin-no-readline.patch
- ./qtwebkit-darwin-no-qos-classes.patch
- ];
+ qtwebkit = [
+ (fetchpatch {
+ name = "qtwebkit-bison-3.7-build.patch";
+ url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
+ sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
+ })
+ ./qtwebkit.patch
+ ] ++ optionals stdenv.isDarwin [
+ ./qtwebkit-darwin-no-readline.patch
+ ./qtwebkit-darwin-no-qos-classes.patch
+ ];
qttools = [ ./qttools.patch ];
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh
index 97829a133c..70e6dbe82a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ )
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
new file mode 100644
index 0000000000..de75ecbd0c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
@@ -0,0 +1,47 @@
+From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 12:32:29 -0500
+Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag
+ item"
+
+This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc.
+---
+ src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+index 4bd1b129bd..a506126c72 100644
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems()
+ // 0. We start from URLs, which can be actually in a list (thus technically
+ // only ONE item in the pasteboard. The fact it's only one does not help, we are
+ // still getting an exception because of the number of items/images mismatch ...
+- // We only set the image for the first item and nil for the rest, the image already
+- // contains a combined picture for all urls we drag.
+- auto imageOrNil = dragImage;
+ for (const auto &qtUrl : qtUrls) {
+ NSURL *nsUrl = qtUrl.toNSURL();
+ auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
+ const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
+ dragImage.size.width,
+ dragImage.size.height);
+-
+- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
+- imageOrNil = nil;
++ [newItem setDraggingFrame:itemFrame contents:dragImage];
+ [dragItems addObject:newItem];
+ }
+ // 1. Repeat for non-url items, if any:
+@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
+ const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
+ dragImage.size.width,
+ dragImage.size.height);
+- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
++ [newItem setDraggingFrame:itemFrame contents:dragImage];
+ [dragItems addObject:newItem];
+ }
+
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
new file mode 100644
index 0000000000..ee3a2d9f5a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
@@ -0,0 +1,40 @@
+From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 12:32:31 -0500
+Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours
+ and populated"
+
+This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7.
+---
+ src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+index a506126c72..c6ee4323ce 100644
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+ m_drag = o;
+ m_executed_drop_action = Qt::IgnoreAction;
+
+- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
+- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
+- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
+-
+ if (maybeDragMultipleItems())
+ return m_executed_drop_action;
+
+@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+ NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
+ Q_ASSERT(dragImage);
+
++ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
++ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
++ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
++
+ NSPoint event_location = [m_lastEvent locationInWindow];
+ NSWindow *theWindow = [m_lastEvent window];
+ Q_ASSERT(theWindow);
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
new file mode 100644
index 0000000000..55211fca64
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
@@ -0,0 +1,27 @@
+From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 12:32:32 -0500
+Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix
+ erroneous size check"
+
+This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd.
+---
+ src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+index c6ee4323ce..ab6863a432 100644
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
+ const auto &qtUrls = m_drag->mimeData()->urls();
+ NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
+
+- if (qtUrls.size() <= 1) {
++ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
+ // Good old -dragImage: works perfectly for this ...
+ return false;
+ }
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
new file mode 100644
index 0000000000..7b568a9194
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
@@ -0,0 +1,192 @@
+From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 12:32:34 -0500
+Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if
+ possible"
+
+This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f.
+---
+ src/plugins/platforms/cocoa/qcocoadrag.h | 6 --
+ src/plugins/platforms/cocoa/qcocoadrag.mm | 90 -------------------
+ .../platforms/cocoa/qnsview_dragging.mm | 9 +-
+ 3 files changed, 1 insertion(+), 104 deletions(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h
+index 975741c270..5a5b985c6e 100644
+--- a/src/plugins/platforms/cocoa/qcocoadrag.h
++++ b/src/plugins/platforms/cocoa/qcocoadrag.h
+@@ -48,8 +48,6 @@
+ #include
+ #include
+
+-#include
+-
+ QT_BEGIN_NAMESPACE
+
+ class QCocoaDrag : public QPlatformDrag
+@@ -71,15 +69,11 @@ public:
+ void setLastMouseEvent(NSEvent *event, NSView *view);
+
+ void setAcceptedAction(Qt::DropAction act);
+- void exitDragLoop();
+ private:
+ QDrag *m_drag;
+ NSEvent *m_lastEvent;
+ NSView *m_lastView;
+ Qt::DropAction m_executed_drop_action;
+- QEventLoop internalDragLoop;
+-
+- bool maybeDragMultipleItems();
+
+ QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const;
+ };
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+index ab6863a432..b4a16ab912 100644
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -44,9 +44,6 @@
+ #include
+ #endif
+ #include
+-#include
+-
+-#include
+
+ QT_BEGIN_NAMESPACE
+
+@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+ m_drag = o;
+ m_executed_drop_action = Qt::IgnoreAction;
+
+- if (maybeDragMultipleItems())
+- return m_executed_drop_action;
+-
+ QPoint hotSpot = m_drag->hotSpot();
+ QPixmap pm = dragPixmap(m_drag, hotSpot);
+ NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
+@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+ return m_executed_drop_action;
+ }
+
+-bool QCocoaDrag::maybeDragMultipleItems()
+-{
+- Q_ASSERT(m_drag && m_drag->mimeData());
+- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction);
+-
+- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) {
+- // -dragImage: stopped working in 10.14 first.
+- return false;
+- }
+-
+- const QMacAutoReleasePool pool;
+-
+- NSWindow *theWindow = [m_lastEvent window];
+- Q_ASSERT(theWindow);
+-
+- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)])
+- return false;
+-
+- auto *sourceView = static_cast*>(theWindow.contentView);
+-
+- const auto &qtUrls = m_drag->mimeData()->urls();
+- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
+-
+- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
+- // Good old -dragImage: works perfectly for this ...
+- return false;
+- }
+-
+- std::vector nonUrls;
+- for (NSPasteboardItem *item in dragBoard.pasteboardItems) {
+- bool isUrl = false;
+- for (NSPasteboardType type in item.types) {
+- using NSStringRef = NSString *;
+- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) {
+- isUrl = true;
+- break;
+- }
+- }
+-
+- if (!isUrl)
+- nonUrls.push_back(item);
+- }
+-
+- QPoint hotSpot = m_drag->hotSpot();
+- const auto pixmap = dragPixmap(m_drag, hotSpot);
+- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()];
+- Q_ASSERT(dragImage);
+-
+- NSMutableArray *dragItems = [[[NSMutableArray alloc] init] autorelease];
+- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint();
+- // 0. We start from URLs, which can be actually in a list (thus technically
+- // only ONE item in the pasteboard. The fact it's only one does not help, we are
+- // still getting an exception because of the number of items/images mismatch ...
+- for (const auto &qtUrl : qtUrls) {
+- NSURL *nsUrl = qtUrl.toNSURL();
+- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
+- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
+- dragImage.size.width,
+- dragImage.size.height);
+- [newItem setDraggingFrame:itemFrame contents:dragImage];
+- [dragItems addObject:newItem];
+- }
+- // 1. Repeat for non-url items, if any:
+- for (auto *pbItem : nonUrls) {
+- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease];
+- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
+- dragImage.size.width,
+- dragImage.size.height);
+- [newItem setDraggingFrame:itemFrame contents:dragImage];
+- [dragItems addObject:newItem];
+- }
+-
+- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView];
+- internalDragLoop.exec();
+- return true;
+-}
+-
+ void QCocoaDrag::setAcceptedAction(Qt::DropAction act)
+ {
+ m_executed_drop_action = act;
+ }
+
+-void QCocoaDrag::exitDragLoop()
+-{
+- if (internalDragLoop.isRunning())
+- internalDragLoop.exit();
+-}
+-
+-
+ QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
+ {
+ const QMimeData* data = drag->mimeData();
+diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
+index 978d73f7d9..463e3c5579 100644
+--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
++++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
+@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
+ if (!target)
+ return;
+
+- auto *nativeDrag = QCocoaIntegration::instance()->drag();
+- Q_ASSERT(nativeDrag);
+- nativeDrag->exitDragLoop();
+-
+ QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
+
+ qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
+@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
+ if (!target)
+ return;
+
+- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
+- Q_ASSERT(nativeDrag);
+- nativeDrag->exitDragLoop();
+- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
++ QCocoaIntegration::instance()->drag();
+
+ // Qt starts drag-and-drop on a mouse button press event. Cococa in
+ // this case won't send the matching release event, so we have to
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
new file mode 100644
index 0000000000..f93f800559
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
@@ -0,0 +1,26 @@
+From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 12:32:37 -0500
+Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState"
+
+This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd.
+---
+ src/plugins/styles/mac/qmacstyle_mac.mm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
+index d1febd81d4..b5e6e60ec0 100644
+--- a/src/plugins/styles/mac/qmacstyle_mac.mm
++++ b/src/plugins/styles/mac/qmacstyle_mac.mm
+@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
+ pbCell = static_cast(pb.cell);
+ oldPosition = pbCell.arrowPosition;
+ pbCell.arrowPosition = NSPopUpNoArrow;
+- if (pb.state == NSControlStateValueOff) {
++ if (pb.state == NSOffState) {
+ // NSPopUpButton in this state is smaller.
+ rAdjusted.origin.x -= 3;
+ rAdjusted.size.width += 6;
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
new file mode 100644
index 0000000000..b5c634aff7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
@@ -0,0 +1,77 @@
+From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001
+From: Dmitry Kalinkin
+Date: Mon, 7 Dec 2020 13:22:02 -0500
+Subject: [PATCH 6/6] git checkout v5.15.0 --
+ src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+
+---
+ .../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++----------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+index 5ad1f9d7bb..c9fa035d87 100644
+--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
++++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
+
+ - (void)updateQtColor
+ {
+- // Discard the color space and pass the color components to QColor. This
+- // is a good option as long as QColor is color-unmanaged: we preserve the
+- // exact RGB value from the color picker, which is predictable. Further,
+- // painting with the color will reproduce the same color on-screen, as
+- // long as the the same screen is used for selecting the color.
+- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased];
+- switch (componentColor.colorSpace.colorSpaceModel)
+- {
+- case NSColorSpaceModelGray: {
+- CGFloat white = 0, alpha = 0;
+- [componentColor getWhite:&white alpha:&alpha];
+- mQtColor.setRgbF(white, white, white, alpha);
+- } break;
+- case NSColorSpaceModelRGB: {
+- CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha];
+- mQtColor.setRgbF(red, green, blue, alpha);
+- } break;
+- case NSColorSpaceModelCMYK: {
++ NSColor *color = [mColorPanel color];
++ NSString *colorSpaceName = [color colorSpaceName];
++ if (colorSpaceName == NSDeviceCMYKColorSpace) {
+ CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0;
+- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
++ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
+ mQtColor.setCmykF(cyan, magenta, yellow, black, alpha);
+- } break;
+- default:
+- qWarning("QNSColorPanelDelegate: Unsupported color space model");
+- break;
++ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) {
++ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
++ [color getRed:&red green:&green blue:&blue alpha:&alpha];
++ mQtColor.setRgbF(red, green, blue, alpha);
++ } else if (colorSpaceName == NSNamedColorSpace) {
++ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
++ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
++ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
++ mQtColor.setRgbF(red, green, blue, alpha);
++ } else {
++ NSColorSpace *colorSpace = [color colorSpace];
++ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){
++ CGFloat components[5];
++ [color getComponents:components];
++ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]);
++ } else {
++ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
++ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
++ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
++ mQtColor.setRgbF(red, green, blue, alpha);
++ }
+ }
+-
+ if (mHelper)
+ emit mHelper->currentColorChanged(mQtColor);
+ }
+--
+2.21.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix
index c88e896286..70e9c3a802 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -4,339 +4,339 @@
{
qt3d = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz";
- sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd";
- name = "qt3d-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
+ sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
+ name = "qt3d-everywhere-src-5.15.2.tar.xz";
};
};
qtactiveqt = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz";
- sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51";
- name = "qtactiveqt-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
+ sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
+ name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
};
};
qtandroidextras = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz";
- sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671";
- name = "qtandroidextras-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
+ sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
+ name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
};
};
qtbase = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz";
- sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5";
- name = "qtbase-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
+ sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
+ name = "qtbase-everywhere-src-5.15.2.tar.xz";
};
};
qtcharts = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz";
- sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7";
- name = "qtcharts-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
+ sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
+ name = "qtcharts-everywhere-src-5.15.2.tar.xz";
};
};
qtconnectivity = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz";
- sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd";
- name = "qtconnectivity-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
+ sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
+ name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
};
};
qtdatavis3d = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz";
- sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3";
- name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
+ sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
+ name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
};
};
qtdeclarative = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz";
- sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699";
- name = "qtdeclarative-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
+ name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
};
};
qtdoc = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz";
- sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f";
- name = "qtdoc-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
+ sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
+ name = "qtdoc-everywhere-src-5.15.2.tar.xz";
};
};
qtgamepad = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz";
- sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a";
- name = "qtgamepad-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
+ name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
};
};
qtgraphicaleffects = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
- sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda";
- name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
+ sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
+ name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
};
};
qtimageformats = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz";
- sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8";
- name = "qtimageformats-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
+ sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
+ name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
};
};
qtlocation = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz";
- sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f";
- name = "qtlocation-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
+ sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
+ name = "qtlocation-everywhere-src-5.15.2.tar.xz";
};
};
qtlottie = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz";
- sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833";
- name = "qtlottie-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
+ sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
+ name = "qtlottie-everywhere-src-5.15.2.tar.xz";
};
};
qtmacextras = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz";
- sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439";
- name = "qtmacextras-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
+ sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
+ name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
};
};
qtmultimedia = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz";
- sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7";
- name = "qtmultimedia-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
+ sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
+ name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
};
};
qtnetworkauth = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz";
- sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85";
- name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
+ sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
+ name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
};
};
qtpurchasing = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz";
- sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16";
- name = "qtpurchasing-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
+ sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
+ name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
};
};
qtquick3d = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz";
- sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb";
- name = "qtquick3d-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
+ sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
+ name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
};
};
qtquickcontrols = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz";
- sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee";
- name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
+ name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
};
};
qtquickcontrols2 = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
- sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f";
- name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
+ sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
+ name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
};
};
qtquicktimeline = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz";
- sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00";
- name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
+ sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
+ name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
};
};
qtremoteobjects = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz";
- sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf";
- name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
+ sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
+ name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
};
};
qtscript = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz";
- sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373";
- name = "qtscript-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
+ sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
+ name = "qtscript-everywhere-src-5.15.2.tar.xz";
};
};
qtscxml = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz";
- sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72";
- name = "qtscxml-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
+ sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
+ name = "qtscxml-everywhere-src-5.15.2.tar.xz";
};
};
qtsensors = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz";
- sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da";
- name = "qtsensors-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
+ sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
+ name = "qtsensors-everywhere-src-5.15.2.tar.xz";
};
};
qtserialbus = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz";
- sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379";
- name = "qtserialbus-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
+ sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
+ name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
};
};
qtserialport = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz";
- sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67";
- name = "qtserialport-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
+ sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
+ name = "qtserialport-everywhere-src-5.15.2.tar.xz";
};
};
qtspeech = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz";
- sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61";
- name = "qtspeech-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
+ name = "qtspeech-everywhere-src-5.15.2.tar.xz";
};
};
qtsvg = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz";
- sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d";
- name = "qtsvg-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
+ sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
+ name = "qtsvg-everywhere-src-5.15.2.tar.xz";
};
};
qttools = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz";
- sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437";
- name = "qttools-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
+ name = "qttools-everywhere-src-5.15.2.tar.xz";
};
};
qttranslations = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz";
- sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe";
- name = "qttranslations-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
+ sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
+ name = "qttranslations-everywhere-src-5.15.2.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
- sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be";
- name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
+ sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
+ name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
};
};
qtwayland = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz";
- sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb";
- name = "qtwayland-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
+ sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
+ name = "qtwayland-everywhere-src-5.15.2.tar.xz";
};
};
qtwebchannel = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz";
- sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f";
- name = "qtwebchannel-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
+ sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
+ name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
};
};
qtwebengine = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz";
- sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df";
- name = "qtwebengine-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
+ sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
+ name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
};
};
qtwebglplugin = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz";
- sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15";
- name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
+ sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
+ name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
};
};
qtwebsockets = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz";
- sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092";
- name = "qtwebsockets-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
+ sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
+ name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
};
};
qtwebview = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz";
- sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660";
- name = "qtwebview-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
+ sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
+ name = "qtwebview-everywhere-src-5.15.2.tar.xz";
};
};
qtwinextras = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz";
- sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0";
- name = "qtwinextras-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
+ sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
+ name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
};
};
qtx11extras = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz";
- sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1";
- name = "qtx11extras-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
+ sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
+ name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
};
};
qtxmlpatterns = {
- version = "5.15.0";
+ version = "5.15.2";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
- sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507";
- name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
+ sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
+ name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index b31e57f380..3d9e72bb54 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -72,7 +72,6 @@ qtModule {
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta = {
- broken = lib.versionAtLeast qtbase.version "5.15";
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
index 7b3d5b3db1..da595dfb3b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
- sha256 = "0qm9rvvkqypqh0vpgkrlqgaxkqdvs3finpr5niwxc6ypblc3ir1g";
+ sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
index 938f64d06e..4dec2f3cfc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (rec {
pname = "rnnoise";
- version = "2019-04-24";
+ version = "2020-06-28";
src = fetchFromGitHub {
owner = "xiph";
repo = "rnnoise";
- rev = "9acc1e5a633e0961a5895a73204df24744f199b6";
- sha256 = "17xip4z0skpzas7wrdyi87j46mbz9jncpj554m8654bqpkxis0pr";
+ rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c";
+ sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
index 55b2f0ff18..5e6ce5d679 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocclr";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${version}";
- hash = "sha256-P36JKFgXSZagWzHB6WB2WlDu7jkVvfYVo1BaV0b8iEk=";
+ hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
index e6546e0d33..f825499101 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "rocm-comgr";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
index 54c7cb9a10..7c50e37522 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "rocm-device-libs";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index 4681267da1..ecd9e0f7e8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "rocm-opencl-runtime";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
index 4df954f4b2..15435e7914 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "rocm-runtime";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
index bf0a05fe73..535f686f23 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rocm-thunk";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${version}";
- hash = "sha256-FLH+GHXA0zepbR1wPPSez/hx1hiG2kkCTneDKhJJRjU=";
+ hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4=";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
index 7c78f61af6..fba8bcb936 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -12,7 +12,7 @@
}:
let
- version = "1.7.0";
+ version = "1.7.1";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index 6048fe8676..7f815a31a5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -1,14 +1,14 @@
version: {
x86_64-darwin-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";
- sha256 = "1912lklil0i7i10j1fm4qzcq96cc8c281l9fn5gfbwa2wwry0r59";
+ sha256 = "0n93r7bq6wjjxkczp8r5pjm1nvl75wns5higsvh7gsir0j6k7b5b";
};
x86_64-linux-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";
- sha256 = "0jdd7bjcy20xz2gfv8f61zdrbzxz5425bnqaaqgrwpzvd45ay8px";
+ sha256 = "0gpcj90nxyc69p53jiqwamd4gi7wzssk29csxfsyxsrzg3h36s7z";
};
x86_64-linux-cuda = {
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
- sha256 = "1ag6lvf3a400ivqq4g9cxpmxzlfrga0y5ssjy0rfpw6i1xljibn6";
+ sha256 = "01z61ryrflq306x7ay97k2fqc2q2z9c4c1zcnjfzr6412vg4fjb8";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
index 608064353c..a1e9d1e305 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "petsc";
- version = "3.14.1";
+ version = "3.14.2";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
- sha256 = "1y3fhg0l69qp9qn6vjyqdhqhhbvsa7jp8g7zcm0pwzm7gkcldqnx";
+ sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9";
};
nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
new file mode 100644
index 0000000000..63ad97cbe2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "simdjson";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "simdjson";
+ repo = "simdjson";
+ rev = "v${version}";
+ sha256 = "14gi2zq430nfjy424q6r57imc2gnz30nhx4r0wbajzp9qvna819w";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DSIMDJSON_JUST_LIBRARY=ON"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://simdjson.org/";
+ description = "Parsing gigabytes of JSON per second";
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ chessai ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix
index 3a7c0b3c41..e6fb1d7caf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix
@@ -4,7 +4,7 @@
, curl
}:
let
- version = "2020.1.3";
+ version = "2020.3.4";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
- sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6";
+ sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smesh/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smesh/default.nix
index 529f910c35..9a52c42c93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/smesh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/smesh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade }:
stdenv.mkDerivation rec {
pname = "smesh";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0";
};
+ patches = [
+ (fetchpatch {
+ name = "fix-build-with-clang.patch";
+ url = "https://github.com/tpaviot/smesh/commit/e32c430f526f1637ec5973c9723acbc5be571ae3.patch";
+ sha256 = "0s4j5rb70g3jvvkgfbrxv7q52wk6yjyjiaya61gy2j64khplcjlb";
+ })
+ ];
+
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ opencascade ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
index fc42ab989e..270e418174 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }:
+{ stdenv
+, autoconf
+, automake
+, darwin
+, fetchsvn
+, makeWrapper
+, pkg-config
+, SDL2
+}:
stdenv.mkDerivation rec {
- name = "smpeg2-svn${version}";
- version = "412";
+ pname = "smpeg2";
+ version = "unstable-2017-10-18";
src = fetchsvn {
url = "svn://svn.icculus.org/smpeg/trunk";
- rev = version;
- sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96";
+ rev = "413";
+ sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
};
patches = [
- ./gcc6.patch
- ./sdl2.patch
+ ./hufftable-uint_max.patch
];
- nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
+ nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
@@ -25,10 +32,8 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- sed -e 's,#include "\(SDL.*.h\)",#include ,' -i $out/include/smpeg2/*.h
-
wrapProgram $out/bin/smpeg2-config \
- --prefix PATH ":" "${pkgconfig}/bin" \
+ --prefix PATH ":" "${pkg-config}/bin" \
--prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig"
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch
rename to third_party/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch b/third_party/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
deleted file mode 100644
index 63bc352976..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/smpeg2-config.in b/smpeg2-config.in
-index 5cce954..0e61939 100644
---- a/smpeg2-config.in
-+++ b/smpeg2-config.in
-@@ -42,7 +42,7 @@ while test $# -gt 0; do
- if test @includedir@ != /usr/include ; then
- includes=-I@includedir@
- fi
-- echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
-+ echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
- ;;
- --libs)
- if [ "`uname`" = "SunOS" ]; then
-@@ -50,7 +50,7 @@ while test $# -gt 0; do
- else
- libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
- fi
-- echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
-+ echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
- ;;
- *)
- echo "${usage}" 1>&2
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index 2022ec7caa..fbe7af1825 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, fmt }:
let
generic = { version, sha256 }:
@@ -14,12 +14,14 @@ let
};
nativeBuildInputs = [ cmake ];
+ buildInputs = [ fmt ];
cmakeFlags = [
"-DSPDLOG_BUILD_SHARED=ON"
"-DSPDLOG_BUILD_EXAMPLE=OFF"
"-DSPDLOG_BUILD_BENCH=OFF"
"-DSPDLOG_BUILD_TESTS=ON"
+ "-DSPDLOG_FMT_EXTERNAL=ON"
];
outputs = [ "out" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index 4393b63146..f0bbc93a6f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
- version = "3.33.0";
+ version = "3.34.0";
# NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
- sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh";
+ sha256 = "1vlsvlp5nvhd5pdjpmdczfsv7mml2gsalykl6x3palbxwgxbfvdz";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index 3ac1f61786..0eb913adb3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -4,11 +4,11 @@ let
archiveVersion = import ./archive-version.nix stdenv.lib;
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
inherit pname;
- version = "3.33.0";
+ version = "3.34.0";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
- sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh";
+ sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701hm5";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix
deleted file mode 100644
index ae22f0be17..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv
-, cmake
-, fetchurl
-, python
-# GNU Octave needs KLU for ODE solvers
-, suitesparse
-, blas, lapack
-, gfortran
-, lapackSupport ? true }:
-
-assert (!blas.isILP64) && (!lapack.isILP64);
-
-stdenv.mkDerivation rec {
- pname = "sundials";
- version = "2.7.0";
-
- buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [
- gfortran
- suitesparse
- ];
- nativeBuildInputs = [ cmake ];
-
- src = fetchurl {
- url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk";
- };
-
- patches = [
- (fetchurl {
- # https://github.com/LLNL/sundials/pull/19
- url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
- sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
- })
- ];
-
- cmakeFlags = [
- "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
- ] ++ stdenv.lib.optionals (lapackSupport) [
- "-DSUNDIALS_INDEX_TYPE=int32_t"
- # GNU Octave needs KLU for ODE solvers
- "-DKLU_ENABLE=ON"
- "-DKLU_INCLUDE_DIR=${suitesparse}/include"
- "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
- "-DLAPACK_ENABLE=ON"
- "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}"
- ];
-
- # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
- doCheck = false;
- checkPhase = "make test";
-
- meta = with stdenv.lib; {
- description = "Suite of nonlinear differential/algebraic equation solvers";
- homepage = "https://computation.llnl.gov/projects/sundials";
- platforms = platforms.all;
- maintainers = with maintainers; [ idontgetoutmuch ];
- license = licenses.bsd3;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix
index ee50d65479..e37db9f253 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, fetchpatch
, gettext
, meson
, ninja
@@ -43,6 +44,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
+
+ # Fix consistency error with sqlite 3.34
+ # https://gitlab.gnome.org/GNOME/tracker/merge_requests/353
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch";
+ sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs=";
+ })
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
index 1c0b70f689..9911c3e68c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
@@ -41,7 +41,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = true;
+ # Test fail with libusb 1.0.24
+ doCheck = false;
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
index 05b23e25af..ea455e2c92 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix
@@ -2,19 +2,21 @@
stdenv.mkDerivation rec {
pname = "utf8proc";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "JuliaStrings";
repo = pname;
rev = "v${version}";
- sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1";
+ sha256 = "1zqc6airkzkssbjxanx5v8blfk90180gc9id0dx8ncs54f1ib8w7";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
+ "-DUTF8PROC_ENABLE_TESTING=ON"
+ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
# the pkg-config file is not created in the cmake installation
@@ -23,6 +25,8 @@ stdenv.mkDerivation rec {
preConfigure = "make libutf8proc.pc prefix=$out";
postInstall = "install -Dm644 ../libutf8proc.pc -t $out/lib/pkgconfig/";
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "A clean C library for processing UTF-8 Unicode data";
homepage = "https://juliastrings.github.io/utf8proc/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix
index 4ef140a099..114c5d1939 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
};
+ patches = [
+ # Fix compilation with Qt 5.15
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch?id=3ca9613d7ad604c93d714e29b116952561e4e41c";
+ sha256 = "sha256-BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ]
diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix
index 66a1b7ab14..0f1e36b357 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix
@@ -1,16 +1,23 @@
{ stdenv
, fetchFromGitLab
, lib
-, cmake
+, meson
+, ninja
, libGL
-, libglvnd
+, libglvnd ? null
, makeWrapper
, pkg-config
-, wayland
-, libxcb
-, libX11
+, python3
+, x11Support ? true, libxcb ? null, libX11 ? null
+, waylandSupport ? true, wayland ? null
+, useGbm ? true, mesa ? null, libudev ? null
}:
+assert x11Support -> (libxcb != null && libX11 != null);
+assert waylandSupport -> wayland != null;
+assert useGbm -> (mesa != null && libudev != null);
+assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null;
+
stdenv.mkDerivation rec {
pname = "waffle";
version = "1.6.1";
@@ -25,20 +32,26 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL
+ ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
libglvnd
+ ] ++ stdenv.lib.optionals x11Support [
libX11
libxcb
+ ] ++ stdenv.lib.optionals waylandSupport [
wayland
+ ] ++ stdenv.lib.optionals useGbm [
+ mesa
+ libudev
];
nativeBuildInputs = [
- cmake
+ meson
+ ninja
makeWrapper
pkg-config
+ python3
];
- cmakeFlags = [ "-Dplatforms=x11,wayland" ];
-
postInstall = ''
wrapProgram $out/bin/wflinfo \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix
index 6a7b091b53..d04cadb483 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/websocket++/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy";
};
- buildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://www.zaphoyd.com/websocketpp/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
index 7bfc96fbf4..db5e91b74d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "wxsqlite3";
- version = "4.6.1";
+ version = "4.6.2";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
- sha256 = "0q5glzr49rjnpp6iqrx7zr9bz4n2ca0q0i0phk7y27rmxzrgpxk1";
+ sha256 = "10jlb4p3ahck9apcy2c2mrrjynv4c1dfwwbf1vwd8dl17pgv4kgs";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
index 0015600f97..ea786d770e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,21 +1,56 @@
-{ stdenv, zookeeper, bash }:
+{ stdenv
+, fetchurl
+, autoreconfHook
+, jre
+, openssl
+, pkg-config
+# We depend on ZooKeeper for the Jute compiler.
+, zookeeper
+}:
stdenv.mkDerivation rec {
- name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
+ pname = "zookeeper_mt";
+ version = stdenv.lib.getVersion zookeeper;
- src = zookeeper.src;
+ src = fetchurl {
+ url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
+ sha512 = "16994067d460a1b6af6a71f3458c64ee32629e876a1ff6646d57be62f1a5adab57462af84074ecaded4186dd3fde035ee24cd9d578b8e5044073eb05f4ab9c3e";
+ };
- setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
+ sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
- NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation";
+ nativeBuildInputs = [
+ autoreconfHook
+ jre
+ ];
- buildInputs = [ zookeeper bash ];
+ buildInputs = [
+ openssl
+ pkg-config
+ zookeeper
+ ];
+
+ # Generate the C marshallers/unmarshallers for the Jute-encoded
+ # definitions.
+ preConfigure = ''
+ mkdir generated
+ cd generated
+ java -cp ${zookeeper}/lib/${zookeeper.pname}-jute-${version}.jar \
+ org.apache.jute.compiler.generated.Rcc -l c \
+ ../../../zookeeper-jute/src/main/resources/zookeeper.jute
+ cd ..
+ '';
+
+ configureFlags = [
+ # We're not going to start test servers in the sandbox anyway.
+ "--without-cppunit"
+ ];
meta = with stdenv.lib; {
- homepage = "http://zookeeper.apache.org";
+ homepage = "https://zookeeper.apache.org";
description = "Apache Zookeeper";
license = licenses.asl20;
- maintainers = [ maintainers.commandodev ];
+ maintainers = with maintainers; [ commandodev ztzg ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
index b7cab4cef6..c85886c73d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -4,25 +4,19 @@
buildDunePackage rec {
pname = "biocaml";
- version = "0.10.1";
+ version = "0.11.1";
useDune2 = true;
- minimumOCamlVersion = "4.07";
+ minimumOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "biocaml";
repo = pname;
rev = "v${version}";
- sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj";
+ sha256 = "1il84vvypgkhdyc2j5fmgh14a58069s6ijbd5dvyl2i7jdxaazji";
};
- # fix compilation without and disable -unsafe-string, needed for Ocaml 4.10:
- patches = [ (fetchpatch {
- url = "https://github.com/biocaml/biocaml/commit/597fa7b0d203684e45ffe03f56c74335b6173ffc.patch";
- sha256 = "0b8jdg215cv2k4y3ww7vak2ag5v6v9w8b76qjivr5d1qxz47mqxv";
- }) ];
-
buildInputs = [ ppx_jane ppx_sexp_conv ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix
index 78ca63ab90..197a3eaf69 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix
@@ -15,15 +15,22 @@ buildDunePackage rec {
sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38";
};
+ patches = [
# The following patch adds support for core.v0.13
- patches = [(fetchpatch {
+ (fetchpatch {
url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch";
sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd";
- })];
+ })
+ # The following patch adds support for core.v0.14
+ (fetchpatch {
+ url = "https://github.com/pveber/bistro/commit/afbdcb2af7777ef7711c7f3c45dff605350a27b2.patch";
+ sha256 = "0ix6lx9qjnn3vqp0164c6l5an8b4rq69h2mxrg89piyk2g1yv0zg";
+ })
+ ];
propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ];
- minimumOCamlVersion = "4.07";
+ minimumOCamlVersion = "4.08";
meta = {
inherit (src.meta) homepage;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
index 0ec1949f56..d0fcf5be83 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "cfstream";
version = "1.3.1";
+ useDune2 = true;
+
minimumOCamlVersion = "4.04.1";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index 4734d83d55..de2955e57c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
@@ -14,11 +14,11 @@ else
stdenv.mkDerivation rec
{
pname = "eliom";
- version = "6.12.1";
+ version = "6.12.4";
src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
- sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx";
+ sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
};
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix
deleted file mode 100644
index 9ab45aa5b3..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix
+++ /dev/null
@@ -1,601 +0,0 @@
-{ janePackage
-, ctypes
-, dune-configurator
-, num
-, octavius
-, ppxlib
-, re
-, openssl
-, zarith
-}:
-
-rec {
-
- ocaml-compiler-libs = janePackage {
- pname = "ocaml-compiler-libs";
- version = "0.12.1";
- hash = "0hpk54fcsfcjp536fgwr80mjjf88hjk58q7jwnyrhk2ljd8xzgiv";
- meta.description = "OCaml compiler libraries repackaged";
- };
-
- sexplib0 = janePackage {
- pname = "sexplib0";
- hash = "1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y";
- meta.description = "Library containing the definition of S-expressions and some base converters";
- };
-
- base = janePackage {
- pname = "base";
- version = "0.13.1";
- hash = "08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw";
- meta.description = "Full standard library replacement for OCaml";
- propagatedBuildInputs = [ sexplib0 ];
- };
-
- stdio = janePackage {
- pname = "stdio";
- hash = "1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh";
- meta.description = "Standard IO library for OCaml";
- propagatedBuildInputs = [ base ];
- };
-
- ppx_sexp_conv = janePackage {
- pname = "ppx_sexp_conv";
- hash = "0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf";
- meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_here = janePackage {
- pname = "ppx_here";
- hash = "1ahidrrjsyi0al06bhv5h6aqmdk7ryz8dybfhqjsn1zp9q056q35";
- meta.description = "Expands [%here] into its location";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_compare = janePackage {
- pname = "ppx_compare";
- hash = "14pnqa47gsvq93z1b8wb5pyq8zw90aaw71j4pwlyid4s86px454j";
- meta.description = "Generation of comparison functions from types";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_cold = janePackage {
- pname = "ppx_cold";
- hash = "0wnfwsgbzk4i5aqjlcaqp6lkvrq5345vazryvx2klbbrd4759h9f";
- meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_assert = janePackage {
- pname = "ppx_assert";
- hash = "08dada2xcp3w5mir90z56qrdyd317lygml4qlfssj897534bwiqr";
- meta.description = "Assert-like extension nodes that raise useful errors on failure";
- propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ];
- };
-
- ppx_inline_test = janePackage {
- pname = "ppx_inline_test";
- hash = "135qzbhqy33lmigbq1rakr9i3y59y3pczh4laanqjyss9b9kfs60";
- meta.description = "Syntax extension for writing in-line tests in ocaml code";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_custom_printf = janePackage {
- pname = "ppx_custom_printf";
- hash = "0kvfkdk4wg2z8x705bajvl1f8wiyy3aya203wdzc9425h73nqm5p";
- meta.description = "Printf-style format-strings for user-defined string conversion";
- propagatedBuildInputs = [ ppx_sexp_conv ];
- };
-
- fieldslib = janePackage {
- pname = "fieldslib";
- hash = "0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa";
- meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
- propagatedBuildInputs = [ base ];
- };
-
- ppx_fields_conv = janePackage {
- pname = "ppx_fields_conv";
- hash = "0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4";
- meta.description = "Generation of accessor and iteration functions for ocaml records";
- propagatedBuildInputs = [ fieldslib ppxlib ];
- };
-
- variantslib = janePackage {
- pname = "variantslib";
- hash = "04nps65v1n0nv9n1c1kj5k9jyqsfsxb6h2w3vf6cibhjr5m7z8xc";
- meta.description = "Part of Jane Street's Core library";
- propagatedBuildInputs = [ base ];
- };
-
- ppx_variants_conv = janePackage {
- pname = "ppx_variants_conv";
- hash = "1ssinizz11bws06qzjky486cj1zrflij1f7hi16d02j40qmyjz7b";
- meta.description = "Generation of accessor and iteration functions for ocaml variant types";
- propagatedBuildInputs = [ variantslib ppxlib ];
- };
-
- ppx_expect = janePackage {
- pname = "ppx_expect";
- hash = "1hhcga960wjvhcx5pk7rcywl1p9n2ycvqa294n24m8dhzqia6i47";
- meta.description = "Cram like framework for OCaml";
- propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ];
- };
-
- ppx_enumerate = janePackage {
- pname = "ppx_enumerate";
- hash = "0hsg6f2nra1mb35jdgym5rf7spm642bs6qqifbikm9hg8f7z3ql4";
- meta.description = "Generate a list containing all values of a finite type";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_hash = janePackage {
- pname = "ppx_hash";
- hash = "1f7mfyx4wgk67hchi57w3142m61ka3vgy1969cbkwr3akv6ifly2";
- meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
- propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
- };
-
- ppx_js_style = janePackage {
- pname = "ppx_js_style";
- hash = "1zlhcn0an5k9xjymk5z5m2vqi8zajy6nvcbl5sdn19pjl3zv645x";
- meta.description = "Code style checker for Jane Street Packages";
- propagatedBuildInputs = [ octavius ppxlib ];
- };
-
- ppx_base = janePackage {
- pname = "ppx_base";
- hash = "0dkqc85x7bgbb6lgx9rghvj1q4dpdgy9qgjl88ywi4c8l9rgnnkz";
- meta.description = "Base set of ppx rewriters";
- propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
- };
-
- ppx_bench = janePackage {
- pname = "ppx_bench";
- hash = "0snmy05d3jgihmppixx3dzamkykijqa2v43vpd7q4z8dpnip620g";
- meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
- propagatedBuildInputs = [ ppx_inline_test ];
- };
-
- ppx_sexp_message = janePackage {
- pname = "ppx_sexp_message";
- hash = "03jhx3ajcv22iwxkg1jf1jjvd14gyrwi1yc6c5ryqi5ha0fywfw6";
- meta.description = "A ppx rewriter for easy construction of s-expressions";
- propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
- };
-
- splittable_random = janePackage {
- pname = "splittable_random";
- hash = "1kgcd6k31vsd7638g8ip77bp1b7vzgkbvgvij4jm2igl09132r85";
- meta.description = "PRNG that can be split into independent streams";
- propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ];
- };
-
- ppx_let = janePackage {
- pname = "ppx_let";
- hash = "0qplsvbv10h7kwf6dhhgvi001gfphv1v66s83zjr5zbypyaarg5y";
- meta.description = "Monadic let-bindings";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- base_quickcheck = janePackage {
- pname = "base_quickcheck";
- hash = "0ik8llm01m2xap4gia0vpsh7yq311hph7a2kf5109ag4988s8p0w";
- meta.description = "Randomized testing framework, designed for compatibility with Base";
- propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ];
- };
-
- ppx_stable = janePackage {
- pname = "ppx_stable";
- hash = "0h7ls1bs0bsd8c4na4aj0nawwhvfy50ybm7sza7yz3qli9jammjk";
- meta.description = "Stable types conversions generator";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- bin_prot = janePackage {
- pname = "bin_prot";
- hash = "1nnr21rljlfglmhiji27d7c1d6gg5fk4cc5rl3750m98w28mfdjw";
- meta.description = "A binary protocol generator";
- propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
- };
-
- ppx_bin_prot = janePackage {
- pname = "ppx_bin_prot";
- hash = "14nfjgqisdqqg8wg4qzvc859zil82y0qpr8fm4nhq05mgxp37iyc";
- meta.description = "Generation of bin_prot readers and writers from types";
- propagatedBuildInputs = [ bin_prot ppx_here ];
- };
-
- ppx_fail = janePackage {
- pname = "ppx_fail";
- hash = "165mikjg4a1lahq3n9q9y2h36jbln5g3l2hapx17irvf0l0c3vn5";
- meta.description = "Add location to calls to failwiths";
- propagatedBuildInputs = [ ppx_here ];
- };
-
- jst-config = janePackage {
- pname = "jst-config";
- hash = "15lj6f83hz555xhjy9aayl3adqwgl1blcjnja693a1ybi3ca8w0y";
- meta.description = "Compile-time configuration for Jane Street libraries";
- buildInputs = [ ppx_assert ];
- };
-
- ppx_optcomp = janePackage {
- pname = "ppx_optcomp";
- hash = "13db395swqf7v87pgl9qiyj4igmvj57hpl8blx3kkrzj6ddh38a8";
- meta.description = "Optional compilation for OCaml";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- jane-street-headers = janePackage {
- pname = "jane-street-headers";
- hash = "1qjg2ari0xn40dlbk0h9xkwr37k97ldkxpkv792fbl6wc2jlv3x5";
- meta.description = "Jane Street C header files";
- };
-
- time_now = janePackage {
- pname = "time_now";
- hash = "1if234kz1ssmv22c0vh1cwhbivab6yy3xvy37ny1q4k5ibjc3v0n";
- meta.description = "Reports the current time";
- buildInputs = [ jst-config ppx_optcomp ];
- propagatedBuildInputs = [ jane-street-headers base ppx_base ];
- };
-
- ppx_module_timer = janePackage {
- pname = "ppx_module_timer";
- hash = "13kv5fzwf41wsaksj41hnvcpx8pnbmzcainlq6f5shj9671hpnhb";
- meta.description = "Ppx rewriter that records top-level module startup times";
- propagatedBuildInputs = [ time_now ];
- };
-
- ppx_optional = janePackage {
- pname = "ppx_optional";
- hash = "1nwb9jvmszxddj9wxgv9g02qhr10yymm2q1w1gjfqd97m2m1mx4n";
- meta.description = "Pattern matching on flat options";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_pipebang = janePackage {
- pname = "ppx_pipebang";
- hash = "0ybj0flsi95pf13ayzz1lcrqhqvkv1lm2dz6y8w49f12583496mc";
- meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
- propagatedBuildInputs = [ ppxlib ];
- };
-
- ppx_sexp_value = janePackage {
- pname = "ppx_sexp_value";
- hash = "18k5015awv9yjl44cvdmp3pn894cgsxmn5s7picxapm9675xqcg9";
- meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
- propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
- };
-
- typerep = janePackage {
- pname = "typerep";
- hash = "116hlifww2cqq1i9vwpl7ziwkc1na7p9icqi9srpdxnvn8ibcsas";
- meta.description = "Typerep is a library for runtime types";
- propagatedBuildInputs = [ base ];
- };
-
- ppx_typerep_conv = janePackage {
- pname = "ppx_typerep_conv";
- hash = "1jlmga9i79inr412l19n4vvmgafzp1bznqxwhy42x309wblbhxx9";
- meta.description = "Generation of runtime types from type declarations";
- propagatedBuildInputs = [ ppxlib typerep ];
- };
-
- ppx_jane = janePackage {
- pname = "ppx_jane";
- hash = "1a86rvnry8lvjhsg2k73f5bgz7l2962k5i49yzmzn8w66kj0yz60";
- meta.description = "Standard Jane Street ppx rewriters";
- propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ];
- };
-
- base_bigstring = janePackage {
- pname = "base_bigstring";
- hash = "1i3zr8bn71l442vl5rrvjpwphx20frp2vaw1qc05d348j76sxfp7";
- meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
- propagatedBuildInputs = [ ppx_jane ];
- };
-
- parsexp = janePackage {
- pname = "parsexp";
- hash = "0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38";
- meta.description = "S-expression parsing library";
- propagatedBuildInputs = [ base sexplib0 ];
- };
-
- sexplib = janePackage {
- pname = "sexplib";
- hash = "059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn";
- meta.description = "Library for serializing OCaml values to and from S-expressions";
- propagatedBuildInputs = [ num parsexp ];
- };
-
- core_kernel = janePackage {
- version = "0.13.1";
- pname = "core_kernel";
- hash = "1ynyz6jkf23q0cwbn6kv06mgyjd644qxb0qkrydq0cglcaa4kjhp";
- meta.description = "System-independent part of Core";
- buildInputs = [ jst-config ];
- propagatedBuildInputs = [ base_bigstring sexplib ];
- };
-
- spawn = janePackage {
- pname = "spawn";
- hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
- meta.description = "Spawning sub-processes";
- buildInputs = [ ppx_expect ];
- };
-
- core = janePackage {
- pname = "core";
- hash = "1i5z9myl6i7axd8dz4b71gdsz9la6k07ib9njr4bn12yn0y76b1m";
- meta.description = "System-independent part of Core";
- buildInputs = [ jst-config ];
- propagatedBuildInputs = [ core_kernel spawn ];
- };
-
- async_kernel = janePackage {
- pname = "async_kernel";
- hash = "1rrbyy3pyh31qwv0jiarhpgdyq2z2gx6axmaplgpxshk4qx6gsld";
- meta.description = "Monadic concurrency library";
- propagatedBuildInputs = [ core_kernel ];
- };
-
- protocol_version_header = janePackage {
- pname = "protocol_version_header";
- hash = "19wscd81jlj355f9din1sg21m3af456a0id2a37bx38r390wrghc";
- meta.description = "Protocol versioning";
- propagatedBuildInputs = [ core_kernel ];
- };
-
- async_rpc_kernel = janePackage {
- pname = "async_rpc_kernel";
- hash = "1k3f2psyd1xcf7nkk0q1fq57yyhfqbzyynsz821n7mrnm37simac";
- meta.description = "Platform-independent core of Async RPC library";
- propagatedBuildInputs = [ async_kernel protocol_version_header ];
- };
-
- async_unix = janePackage {
- pname = "async_unix";
- version = "0.13.1";
- hash = "1sb8grbj4bv6ih3yfdihxhn5c9rqczr56b5bhl85wy2mi92m17xv";
- meta.description = "Monadic concurrency library";
- propagatedBuildInputs = [ async_kernel core ];
- };
-
- async_extra = janePackage {
- pname = "async_extra";
- hash = "06q1farx7dwi4h490xi1azq7ym57ih2d23sq17g2jfvw889kf4n1";
- meta.description = "Monadic concurrency library";
- propagatedBuildInputs = [ async_rpc_kernel async_unix ];
- };
-
- textutils = janePackage {
- pname = "textutils";
- hash = "1wnyqj9dzfgl0kddmdl4n9rkl16hwy432dd2i4ksvk2z5g9kkb0d";
- meta.description = "Text output utilities";
- propagatedBuildInputs = [ core ];
- };
-
- async = janePackage {
- pname = "async";
- hash = "002j9yxpw0ghi12a84163vaqa3n9h8j35f4i72nbxnilxwvy95sr";
- meta.description = "Monadic concurrency library";
- propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ];
- };
-
- async_find = janePackage {
- pname = "async_find";
- hash = "0l8cfhyrx2rb2avdcfx5m70aj6rx2d57qxqvfycad5afqz4xx2n9";
- meta.description = "Directory traversal with Async";
- propagatedBuildInputs = [ async ];
- };
-
- async_interactive = janePackage {
- pname = "async_interactive";
- hash = "1ma24pi3hqzrs1k12sc0aarhf42fap8nl1h7id6k01wp6s3yqi5d";
- meta.description = "Utilities for building simple command-line based user interfaces";
- propagatedBuildInputs = [ async ];
- };
-
- re2 = janePackage {
- pname = "re2";
- hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0";
- meta.description = "OCaml bindings for RE2, Google's regular expression library";
- propagatedBuildInputs = [ core_kernel ];
- prePatch = ''
- substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
- substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
- '';
- };
-
- shell = janePackage {
- pname = "shell";
- hash = "190ymhm0z9b7hngbcpg88wwrfxwfcdh339d7rd2xhmrhi4z99r18";
- meta.description = "Yet another implementation of fork&exec and related functionality";
- buildInputs = [ jst-config ];
- propagatedBuildInputs = [ re2 textutils ];
- };
-
- async_shell = janePackage {
- pname = "async_shell";
- hash = "0bfxyvdmyv23zfr49pb4c3bgfkjr4s3nb3z07xrw6szia3j1kp4j";
- meta.description = "Shell helpers for Async";
- propagatedBuildInputs = [ async shell ];
- };
-
- async_ssl = janePackage {
- pname = "async_ssl";
- useDune2 = true;
- hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k";
- meta.description = "Async wrappers for SSL";
- buildInputs = [ dune-configurator ];
- propagatedBuildInputs = [ async ctypes openssl ];
- };
-
- core_bench = janePackage {
- pname = "core_bench";
- hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm";
- meta.description = "Benchmarking library";
- propagatedBuildInputs = [ textutils ];
- };
-
- core_extended = janePackage {
- pname = "core_extended";
- hash = "0zh1wwkg5cxkz633dl9zbbl65aksvzb5mss1q8f7w6i1sv3n0135";
- meta.description = "Extra components that are not as closely vetted or as stable as Core";
- propagatedBuildInputs = [ core ];
- };
-
- sexp_pretty = janePackage {
- pname = "sexp_pretty";
- hash = "1a59xc9frmvi7n0i32dzs8gpf5ral80xkwv97a13zv5cyg8l6216";
- meta.description = "S-expression pretty-printer";
- propagatedBuildInputs = [ ppx_base re sexplib ];
- };
-
- expect_test_helpers_kernel = janePackage {
- pname = "expect_test_helpers_kernel";
- hash = "11m0i7mj6b1cmqnwhmsrqdc814s0lk3sip8rh97k75grngazmjvn";
- meta.description = "Helpers for writing expectation tests";
- buildInputs = [ ppx_jane ];
- propagatedBuildInputs = [ core_kernel sexp_pretty ];
- };
-
- expect_test_helpers = janePackage {
- pname = "expect_test_helpers";
- hash = "0sw9yam8d9hdam8p194q0hgc4i26vvwj5qi2cba1jxfhdzhy8jdd";
- meta.description = "Async helpers for writing expectation tests";
- propagatedBuildInputs = [ async expect_test_helpers_kernel ];
- };
-
- patience_diff = janePackage {
- pname = "patience_diff";
- hash = "012rlbnw21yq2lsbfk3f7l4m4qq3jdx238146z36v54vnhhs6r2r";
- meta.description = "Diff library using Bram Cohen's patience diff algorithm";
- propagatedBuildInputs = [ core_kernel ];
- };
-
- ecaml = janePackage {
- pname = "ecaml";
- hash = "0jmmsi1m7d4cl5mnw6v9h4ng29anwxy73a6qfi28lgpzafn452bc";
- meta.description = "Library for writing Emacs plugin in OCaml";
- propagatedBuildInputs = [ async expect_test_helpers_kernel ];
- };
-
- posixat = janePackage {
- pname = "posixat";
- hash = "122fmd6v7fhiiivkxra539b5w3p5xkkd8mcjzvyb2msyq5zc6xa2";
- propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ];
- meta.description = "Binding to the posix *at functions";
- };
-
- shexp = janePackage {
- pname = "shexp";
- hash = "0zdcyix0gdn4xmvbjzhbig63xw9jnw8ixj3ngs6g4k2vk77rs0gk";
- propagatedBuildInputs = [ posixat spawn ];
- meta.description = "Process library and s-expression based shell";
- };
-
- csvfields = janePackage {
- pname = "csvfields";
- hash = "19pnq9m9lkdgqfy9l21w779d6c8djr1dvvjq7r9kbgfwb04symmr";
- propagatedBuildInputs = [ core expect_test_helpers ];
- meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
- };
-
- sexp_diff_kernel = janePackage {
- pname = "sexp_diff_kernel";
- hash = "125gssd24vfcfbkpjlqbxijlc4jyw2n0wv1cnddcfvpn1f7cghzb";
- propagatedBuildInputs = [ core_kernel ];
- meta.description = "Code for computing the diff of two sexps";
- };
-
- sexp_macro = janePackage {
- pname = "sexp_macro";
- hash = "1rqs2r2ihwsqzgnqsdr0db6dqzz4q6s9hi1hvnwf0cb2vnkhsjln";
- propagatedBuildInputs = [ async sexplib ];
- meta.description = "Sexp macros";
- };
-
- sexp_select = janePackage {
- pname = "sexp_select";
- hash = "02yckmin937scqs2i45r2qqp56rqa6j2q04nfhnnxvn3bkb0qnb1";
- propagatedBuildInputs = [ base ppx_jane ];
- meta.description = "A library to use CSS-style selectors to traverse sexp trees";
- };
-
- sexp = janePackage {
- pname = "sexp";
- hash = "0cqp6syc4ap2nxgg1mvwwz2pmib48kp3gigzpjwh20wr38qq0p1r";
- propagatedBuildInputs = [
- async
- core
- csvfields
- re2
- sexp_diff_kernel
- sexp_macro
- sexp_pretty
- sexp_select
- ];
- patches = ./sexp.patch;
- meta.description = "S-expression swiss knife";
- };
-
- zarith_stubs_js = janePackage {
- pname = "zarith_stubs_js";
- hash = "0dldnf85rfyx8z63qjly9n8plj8nnkw4i5zrj5vbm7s2wjcfjzj1";
- meta.description = "Javascripts stubs for the Zarith library";
- };
-
- bignum = janePackage {
- pname = "bignum";
- hash = "0qldyl5mhlffnyps7n9y8qykm0ylrdiw5ii8zlww82zmmpp8zv5x";
- propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ];
- meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
- };
-
- delimited_parsing = janePackage {
- pname = "delimited_parsing";
- hash = "0siz746q28241wk0sv435lfvvips7sl151z5a1sbqanr3lm4s17w";
- propagatedBuildInputs = [ async core_extended ];
- meta.description = "Parsing of character (e.g., comma) separated and fixed-width values";
- };
-
- ### Packages at version 0.11, with dependencies at version 0.12
-
- configurator = janePackage {
- pname = "configurator";
- version = "0.11.0";
- hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk";
- propagatedBuildInputs = [ stdio ];
- meta.description = "Helper library for gathering system configuration";
- };
-
- ppx_core = janePackage {
- pname = "ppx_core";
- version = "0.11.0";
- hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx";
- propagatedBuildInputs = [ ppxlib ];
- meta.description = "Deprecated (see ppxlib)";
- };
-
- ppx_driver = janePackage {
- pname = "ppx_driver";
- version = "0.11.0";
- hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi";
- propagatedBuildInputs = [ ppxlib ];
- meta.description = "Deprecated (see ppxlib)";
- };
-
- ppx_type_conv = janePackage {
- pname = "ppx_type_conv";
- version = "0.11.0";
- hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf";
- propagatedBuildInputs = [ ppxlib ];
- meta.description = "Deprecated (see ppxlib)";
- };
-
-}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
new file mode 100644
index 0000000000..29b18e0bf9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -0,0 +1,857 @@
+{ janePackage
+, alcotest
+, angstrom
+, angstrom-async
+, base64
+, cryptokit
+, ctypes
+, dune-configurator
+, faraday
+, inotify
+, js_of_ocaml
+, js_of_ocaml-ppx
+, lambdasoup
+, magic-mime
+, num
+, octavius
+, ppxlib
+, re
+, tyxml
+, uri-sexp
+, zarith
+, openssl
+, ounit
+, zstd
+}:
+
+rec {
+
+ accessor = janePackage {
+ pname = "accessor";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.09";
+ hash = "0wm2081kzd5zsqs516cn3f975bnnmnyynv8fa818gmfa65i6mxm8";
+ meta.description = "A library that makes it nicer to work with nested functional data structures";
+ propagatedBuildInputs = [ higher_kinded ];
+ };
+
+ accessor_async = janePackage {
+ pname = "accessor_async";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.09";
+ hash = "1193hzvlzm7vcl9p67fs8al2pvkw9n2wz009m2l3lp35mrx8aq1w";
+ meta.description = "Accessors for Async types, for use with the Accessor library";
+ propagatedBuildInputs = [ accessor_core async_kernel ];
+ };
+
+ accessor_base = janePackage {
+ pname = "accessor_base";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.09";
+ hash = "1xjbvvijkyw4dlys47x4896y3kqm2zn0yg60cqrp57i2dwxg0nsj";
+ meta.description = "Accessors for Base types, for use with the Accessor library";
+ propagatedBuildInputs = [ ppx_accessor ];
+ };
+
+ accessor_core = janePackage {
+ minimumOCamlVersion = "4.09";
+ pname = "accessor_core";
+ version = "0.14.1";
+ hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2";
+ meta.description = "Accessors for Core types, for use with the Accessor library";
+ propagatedBuildInputs = [ accessor_base core_kernel ];
+ };
+
+ async = janePackage {
+ pname = "async";
+ hash = "086v93div4h9l02n7wzv3xx3i6xvddazydm9qlfa72ad55x3vzy0";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ];
+ doCheck = false; # we don't have netkit_sockets
+ };
+
+ async_extra = janePackage {
+ pname = "async_extra";
+ hash = "16cnz9h4jkc3b0837s5z0iv92q7n5nw77g8qshq8pwq639y8ail4";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_kernel ];
+ };
+
+ async_find = janePackage {
+ pname = "async_find";
+ hash = "0vlcpdr15bgrwrmixvs6ij88kvk8vzzrijz3zm0svxih0naf8ylx";
+ meta.description = "Directory traversal with Async";
+ propagatedBuildInputs = [ async ];
+ };
+
+ async_inotify = janePackage {
+ pname = "async_inotify";
+ hash = "0i0hf7nsir316ijixdj43qf0p3b6yapvcm2jzp7bhpf4r2kxislv";
+ meta.description = "Async wrapper for inotify";
+ propagatedBuildInputs = [ async_find inotify ];
+ };
+
+ async_interactive = janePackage {
+ pname = "async_interactive";
+ hash = "1cnmv9mipa6k6xd303ngdbxmiab2202f3w3pgq8l1970w8hb78il";
+ meta.description = "Utilities for building simple command-line based user interfaces";
+ propagatedBuildInputs = [ async ];
+ };
+
+ async_js = janePackage {
+ pname = "async_js";
+ hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v";
+ meta.description = "A small library that provide Async support for JavaScript platforms";
+ buildInputs = [ js_of_ocaml-ppx ];
+ propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ];
+ };
+
+ async_kernel = janePackage {
+ pname = "async_kernel";
+ hash = "17giakwl0xhyxvxrkn12dwjdghc53q8px81z7cc3k6f102bsbdy6";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ async_rpc_kernel = janePackage {
+ pname = "async_rpc_kernel";
+ hash = "1bwq3gkq057dd1fhrqz9kqq8a956nn87zaxvr0qcpiczzjv3zmvm";
+ meta.description = "Platform-independent core of Async RPC library";
+ propagatedBuildInputs = [ async_kernel protocol_version_header ];
+ };
+
+ async_sendfile = janePackage {
+ pname = "async_sendfile";
+ hash = "1w3gwwpgfzqjhblxnxh64g64q6kgjzzxx90inswfhycc88pnvdna";
+ meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files";
+ propagatedBuildInputs = [ async_unix ];
+ };
+
+ async_shell = janePackage {
+ pname = "async_shell";
+ hash = "1r00z620nqv2jxz2xrp2gsyc30h8dd2w9qsnys2fkqbgpxlbgdc7";
+ meta.description = "Shell helpers for Async";
+ propagatedBuildInputs = [ async shell ];
+ };
+
+ async_smtp = janePackage {
+ pname = "async_smtp";
+ hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck";
+ meta.description = "SMTP client and server";
+ propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ];
+ };
+
+ async_ssl = janePackage {
+ pname = "async_ssl";
+ hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy";
+ meta.description = "Async wrappers for SSL";
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ async ctypes openssl ];
+ };
+
+ async_unix = janePackage {
+ pname = "async_unix";
+ hash = "1wgnr0vdsknqrfnf6irmwnvyngndsnvvl1sfnj3v6fhwk4nswnrs";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_kernel core ];
+ };
+
+ base = janePackage {
+ pname = "base";
+ hash = "1d5ynzzq58g9qammhba5dasrg734p9vndq28a7kg80bdxb8gh3kp";
+ minimumOCamlVersion = "4.07";
+ meta.description = "Full standard library replacement for OCaml";
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ sexplib0 ];
+ checkInputs = [ alcotest ];
+ };
+
+ base_bigstring = janePackage {
+ pname = "base_bigstring";
+ hash = "1ald2m7qywhxbygv58dzpgaj54p38zn0aiqd1z7i95kf3bsnsjqa";
+ minimumOCamlVersion = "4.07";
+ meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
+ propagatedBuildInputs = [ ppx_jane ];
+ };
+
+ base_quickcheck = janePackage {
+ pname = "base_quickcheck";
+ hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Randomized testing framework, designed for compatibility with Base";
+ propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ];
+ };
+
+ bignum = janePackage {
+ pname = "bignum";
+ hash = "009ygr64q810p9iq4mykzz4ci00i5mzgpmq35jiyaiqm27bjam21";
+ propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ];
+ meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
+ };
+
+ bin_prot = janePackage {
+ pname = "bin_prot";
+ hash = "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "A binary protocol generator";
+ propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_variants_conv ];
+ };
+
+ bonsai = janePackage {
+ pname = "bonsai";
+ hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a";
+ meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+ buildInputs = [ ppx_pattern_bind ];
+ propagatedBuildInputs = [ incr_dom ];
+ };
+
+ cinaps = janePackage {
+ pname = "cinaps";
+ hash = "0ms1j2kh7i5slyw9v4w9kdz52dkwl5gqcnvn89prgimhk2vmichj";
+ minimumOCamlVersion = "4.07";
+ meta.description = "Trivial metaprogramming tool";
+ propagatedBuildInputs = [ re ];
+ checkInputs = [ ppx_jane ];
+ };
+
+ core = janePackage {
+ pname = "core";
+ hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3";
+ meta.description = "System-independent part of Core";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ core_kernel spawn timezone ];
+ doCheck = false; # we don't have quickcheck_deprecated
+ };
+
+ core_bench = janePackage {
+ pname = "core_bench";
+ hash = "04h6hzxk347pqyrrbgqrw9576sq4yf70fgq9xam3kajrqwdh3dhx";
+ meta.description = "Benchmarking library";
+ propagatedBuildInputs = [ textutils ];
+ };
+
+ core_extended = janePackage {
+ pname = "core_extended";
+ hash = "1pbm6xbc3h0fhrymyr1yb9b1jk7n88gfi3pylqz2cs8haxr2pb3a";
+ meta.description = "Extra components that are not as closely vetted or as stable as Core";
+ propagatedBuildInputs = [ core ];
+ };
+
+ core_kernel = janePackage {
+ pname = "core_kernel";
+ hash = "012sp02v35j41lzkvf073620602fgiswz2n224j06mk3bm8jmjms";
+ meta.description = "System-independent part of Core";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ base_bigstring sexplib ];
+ doCheck = false; # we don't have quickcheck_deprecated
+ };
+
+ csvfields = janePackage {
+ pname = "csvfields";
+ hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz";
+ propagatedBuildInputs = [ core num ];
+ meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
+ };
+
+ delimited_parsing = janePackage {
+ pname = "delimited_parsing";
+ hash = "1dnr5wqacryx1kj38i9iifc3457pchr887xphzz2nhlbizq3d7qa";
+ propagatedBuildInputs = [ async core_extended ];
+ meta.description = "Parsing of character (e.g., comma) separated and fixed-width values";
+ };
+
+ ecaml = janePackage {
+ pname = "ecaml";
+ hash = "052qglpwzrx3c4gy3zr6dmsmfbi5gj4fs2jhx9yrsqb9hj8g36mj";
+ meta.description = "Library for writing Emacs plugin in OCaml";
+ propagatedBuildInputs = [ async expect_test_helpers_core ];
+ };
+
+ email_message = janePackage {
+ pname = "email_message";
+ hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n";
+ meta.description = "E-mail message parser";
+ propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ];
+ };
+
+ expect_test_helpers_async = janePackage {
+ pname = "expect_test_helpers_async";
+ hash = "175sjkx3b10d8vacp369rv53nxbiaxw1xhwy832g7ffk1by8l2m1";
+ meta.description = "Async helpers for writing expectation tests";
+ propagatedBuildInputs = [ async expect_test_helpers_core ];
+ };
+
+ expect_test_helpers_core = janePackage {
+ pname = "expect_test_helpers_core";
+ hash = "1drl15akp4jz4wf26dr2y2nblvnhz14xsnb3ai8dg45y711svs2i";
+ meta.description = "Helpers for writing expectation tests";
+ propagatedBuildInputs = [ core_kernel sexp_pretty ];
+ };
+
+ fieldslib = janePackage {
+ pname = "fieldslib";
+ hash = "0nxx35lrb4f6zfs5l80a7cg7azf19c6g31vn9qjjpaxf6lgkck2n";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
+ propagatedBuildInputs = [ base ];
+ };
+
+ higher_kinded = janePackage {
+ pname = "higher_kinded";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.09";
+ hash = "05jvxgqsx3j2v8rqpd91ah76dgc1q2dz38kjklmx0vms4r4gvlsx";
+ meta.description = "A library with an encoding of higher kinded types in OCaml";
+ propagatedBuildInputs = [ base ppx_jane ];
+ };
+
+ incr_dom = janePackage {
+ pname = "incr_dom";
+ hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx";
+ meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
+ buildInputs = [ js_of_ocaml-ppx ];
+ propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ];
+ };
+
+ incr_map = janePackage {
+ pname = "incr_map";
+ hash = "0s0s7qfydvvvnqby4v5by5jdnd5kxqsdr65mhm11w4fn125skryz";
+ meta.description = "Helpers for incremental operations on map like data structures";
+ buildInputs = [ ppx_pattern_bind ];
+ propagatedBuildInputs = [ incremental ];
+ };
+
+ incr_select = janePackage {
+ pname = "incr_select";
+ hash = "18ril6z57mw89gzc9zhz6p1phwm1xr6phppicvqpqmi0skvvnrg6";
+ meta.description = "Handling of large set of incremental outputs from a single input";
+ propagatedBuildInputs = [ incremental ];
+ };
+
+ incremental = janePackage {
+ pname = "incremental";
+ hash = "0nyaiy7r2spvn2ij9z5rghd5gbjk1y3ai4jn0i8q81arp7cf6zc7";
+ meta.description = "Library for incremental computations";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ jane-street-headers = janePackage {
+ pname = "jane-street-headers";
+ hash = "12n40mlgjnc09fxc0hp0npsxdlxja2w828683zpb32nrzqkg6z4c";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Jane Street C header files";
+ };
+
+ jst-config = janePackage {
+ pname = "jst-config";
+ hash = "0hzw0crgj0kjxsvr10wng7gqy948v98hnijh30lgq3v62jdsjra8";
+ meta.description = "Compile-time configuration for Jane Street libraries";
+ buildInputs = [ dune-configurator ppx_assert stdio ];
+ };
+
+ ocaml-compiler-libs = janePackage {
+ pname = "ocaml-compiler-libs";
+ version = "0.12.3";
+ minimumOCamlVersion = "4.04.1";
+ hash = "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5";
+ meta.description = "OCaml compiler libraries repackaged";
+ };
+
+ parsexp = janePackage {
+ pname = "parsexp";
+ hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "S-expression parsing library";
+ propagatedBuildInputs = [ base sexplib0 ];
+ };
+
+ patience_diff = janePackage {
+ pname = "patience_diff";
+ hash = "1np88s226ndhbwynpdqygrycahp8m1mx28f1xk54kvds8znnq2i0";
+ meta.description = "Diff library using Bram Cohen's patience diff algorithm";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ posixat = janePackage {
+ pname = "posixat";
+ hash = "0aana1lzq4514kna7hr301b5iv6gcg6zhgrx8s8vaad1q38yfp6c";
+ minimumOCamlVersion = "4.07";
+ propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ];
+ meta.description = "Binding to the posix *at functions";
+ };
+
+ ppx_accessor = janePackage {
+ pname = "ppx_accessor";
+ version = "0.14.2";
+ minimumOCamlVersion = "4.09";
+ hash = "01nifsh7gap28cpvff6i569lqr1gmyhrklkisgri538cp4pf1wq1";
+ meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries";
+ propagatedBuildInputs = [ accessor ];
+ };
+
+ ppx_assert = janePackage {
+ pname = "ppx_assert";
+ hash = "03mzgm4smrczp5dg3mpr6zc2v6a54n0r01k4ww820yrr25hcf8ip";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Assert-like extension nodes that raise useful errors on failure";
+ propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ];
+ };
+
+ ppx_base = janePackage {
+ pname = "ppx_base";
+ hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Base set of ppx rewriters";
+ propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
+ };
+
+ ppx_bench = janePackage {
+ pname = "ppx_bench";
+ version = "0.14.1";
+ hash = "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
+ propagatedBuildInputs = [ ppx_inline_test ];
+ };
+
+ ppx_bin_prot = janePackage {
+ pname = "ppx_bin_prot";
+ hash = "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Generation of bin_prot readers and writers from types";
+ propagatedBuildInputs = [ bin_prot ppx_here ];
+ doCheck = false; # circular dependency with ppx_jane
+ };
+
+ ppx_cold = janePackage {
+ pname = "ppx_cold";
+ hash = "0ciqs6f9ab73gq4krj14xzzba4ydcxph214m87i1s0xp25hwxr8v";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_compare = janePackage {
+ pname = "ppx_compare";
+ hash = "11pj76dimx2f7l8m85myzp6yzx9xcg0bqi97s7ayssvkckm57390";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Generation of comparison functions from types";
+ propagatedBuildInputs = [ ppxlib base ];
+ doCheck = false; # test build rule broken
+ };
+
+ ppx_custom_printf = janePackage {
+ pname = "ppx_custom_printf";
+ hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Printf-style format-strings for user-defined string conversion";
+ propagatedBuildInputs = [ ppx_sexp_conv ];
+ };
+
+ ppx_enumerate = janePackage {
+ pname = "ppx_enumerate";
+ hash = "1sriid4vh10p80wwvn46v1g16m646qw5r5xzwlymyz5gbvq2zf40";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Generate a list containing all values of a finite type";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_expect = janePackage {
+ pname = "ppx_expect";
+ hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Cram like framework for OCaml";
+ propagatedBuildInputs = [ ppx_here ppx_inline_test re ];
+ doCheck = false; # circular dependency with ppx_jane
+ };
+
+ ppx_fields_conv = janePackage {
+ pname = "ppx_fields_conv";
+ version = "0.14.2";
+ hash = "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Generation of accessor and iteration functions for ocaml records";
+ propagatedBuildInputs = [ fieldslib ppxlib ];
+ };
+
+ ppx_fixed_literal = janePackage {
+ pname = "ppx_fixed_literal";
+ hash = "0s7rb4dhz4ibhh42a9sfxjj3zbwfyfmaihr92hpdv5j9xqn3n8mi";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Simpler notation for fixed point literals";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_hash = janePackage {
+ pname = "ppx_hash";
+ hash = "1zf03xdrg4jig7pdcrdpbabyjkdpifb31z2z1bf9wfdawybdhwkq";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+ propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+ };
+
+ ppx_here = janePackage {
+ pname = "ppx_here";
+ hash = "09zcyigaalqccs9s0h7n0535clgfmqb9s4p1jbgcqji9zj8w426s";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Expands [%here] into its location";
+ propagatedBuildInputs = [ ppxlib ];
+ doCheck = false; # test build rules broken
+ };
+
+ ppx_inline_test = janePackage {
+ pname = "ppx_inline_test";
+ version = "0.14.1";
+ hash = "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Syntax extension for writing in-line tests in ocaml code";
+ propagatedBuildInputs = [ ppxlib time_now ];
+ doCheck = false; # test build rules broken
+ };
+
+ ppx_jane = janePackage {
+ pname = "ppx_jane";
+ hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Standard Jane Street ppx rewriters";
+ propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ];
+ };
+
+ ppx_js_style = janePackage {
+ pname = "ppx_js_style";
+ hash = "1ahk4mv63s9cw8ji62598ggw6b3lqpaljqa2ya7w91lify3lb76q";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Code style checker for Jane Street Packages";
+ propagatedBuildInputs = [ octavius ppxlib ];
+ };
+
+ ppx_let = janePackage {
+ pname = "ppx_let";
+ hash = "1jq3g88xv9g6y9im67hiig3cfn5anwwnq09mp7yn7a86ha5r9w3i";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Monadic let-bindings";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_module_timer = janePackage {
+ pname = "ppx_module_timer";
+ hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Ppx rewriter that records top-level module startup times";
+ propagatedBuildInputs = [ time_now ];
+ };
+
+ ppx_optcomp = janePackage {
+ pname = "ppx_optcomp";
+ hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Optional compilation for OCaml";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_optional = janePackage {
+ pname = "ppx_optional";
+ hash = "1d7rsdqiccxp2w4ykb9klarddm2qrrym3brbnhzx2hm78iyj3hzv";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Pattern matching on flat options";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_pattern_bind = janePackage {
+ pname = "ppx_pattern_bind";
+ hash = "0yxkwnn30nxgrspi191zma95bgrh134aqh2bnpj3wg0245ki55zv";
+ minimumOCamlVersion = "4.07";
+ meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
+ propagatedBuildInputs = [ ppx_let ];
+ };
+
+ ppx_pipebang = janePackage {
+ pname = "ppx_pipebang";
+ hash = "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_sexp_conv = janePackage {
+ pname = "ppx_sexp_conv";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.04.2";
+ hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
+ meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
+ propagatedBuildInputs = [ ppxlib sexplib0 base ];
+ };
+
+ ppx_sexp_message = janePackage {
+ pname = "ppx_sexp_message";
+ hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "A ppx rewriter for easy construction of s-expressions";
+ propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
+ };
+
+ ppx_sexp_value = janePackage {
+ pname = "ppx_sexp_value";
+ hash = "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+ propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
+ };
+
+ ppx_stable = janePackage {
+ pname = "ppx_stable";
+ version = "0.14.1";
+ hash = "1sp1kn23qr0pfypa4ilvhqq5y11y13xpfygfl582ra9kik5xqfa1";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Stable types conversions generator";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_string = janePackage {
+ pname = "ppx_string";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.04.2";
+ hash = "0a8khmg0y32kyn3q6idwgh0d6d1s6ms1w75gj3dzng0v7y4h6jx4";
+ meta.description = "Ppx extension for string interpolation";
+ propagatedBuildInputs = [ ppx_base ppxlib stdio ];
+ };
+
+ ppx_typerep_conv = janePackage {
+ pname = "ppx_typerep_conv";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.04.2";
+ hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh";
+ meta.description = "Generation of runtime types from type declarations";
+ propagatedBuildInputs = [ ppxlib typerep ];
+ };
+
+ ppx_variants_conv = janePackage {
+ pname = "ppx_variants_conv";
+ version = "0.14.1";
+ minimumOCamlVersion = "4.04.2";
+ hash = "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84";
+ meta.description = "Generation of accessor and iteration functions for ocaml variant types";
+ propagatedBuildInputs = [ variantslib ppxlib ];
+ };
+
+ protocol_version_header = janePackage {
+ pname = "protocol_version_header";
+ hash = "0lfblv2yqw01bl074ga6vxii0p9mqwlqw1g9b9z7pfdva9wqilrd";
+ meta.description = "Protocol versioning";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ re2 = janePackage {
+ pname = "re2";
+ hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc";
+ meta.description = "OCaml bindings for RE2, Google's regular expression library";
+ propagatedBuildInputs = [ core_kernel ];
+ prePatch = ''
+ substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
+ substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
+ '';
+ };
+
+ re2_stable = janePackage {
+ pname = "re2_stable";
+ hash = "0kjc0ff6b3509s3b9n4q8ilb06d5fngdh3z58cm95vg7zkcas9w3";
+ meta.description = "Re2_stable adds an incomplete but stable serialization of Re2";
+ propagatedBuildInputs = [ core re2 ];
+ };
+
+ resource_cache = janePackage {
+ pname = "resource_cache";
+ hash = "197z9s535q74h00365ydhggg7hyzpyqvislgwwyi69sl1vy6dr0j";
+ meta.description = "General resource cache";
+ propagatedBuildInputs = [ async_rpc_kernel ];
+ };
+
+ sexp = janePackage {
+ pname = "sexp";
+ hash = "1x08pyrkd78233kgj70wxlc79w6jjhfrjdamm2xr7jzdc8ycfigf";
+ propagatedBuildInputs = [
+ async
+ core
+ csvfields
+ re2
+ sexp_diff_kernel
+ sexp_macro
+ sexp_pretty
+ sexp_select
+ ];
+ patches = ./sexp.patch;
+ meta.description = "S-expression swiss knife";
+ };
+
+ sexp_diff_kernel = janePackage {
+ pname = "sexp_diff_kernel";
+ hash = "1pljcs019hs2ffhhb7rjh3xz7cbrk8vsv967jzmip3rv9w21c9kh";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Code for computing the diff of two sexps";
+ };
+
+ sexp_macro = janePackage {
+ pname = "sexp_macro";
+ hash = "1ih1g7vpb1j8vhzm9a5mjrrzgqrhjqdhf6vjrg8kxfqg5i5b8nyx";
+ propagatedBuildInputs = [ async sexplib ];
+ meta.description = "Sexp macros";
+ };
+
+ sexp_pretty = janePackage {
+ pname = "sexp_pretty";
+ hash = "0dax0wm511zgvr7p6kcd5gygi58118by7hsv7hymy8ldfcky5cwd";
+ minimumOCamlVersion = "4.07";
+ meta.description = "S-expression pretty-printer";
+ propagatedBuildInputs = [ ppx_base re sexplib ];
+ };
+
+ sexp_select = janePackage {
+ pname = "sexp_select";
+ hash = "1lchhfqw4afw38fnarwylqc2qp7k6xwx3j7m9gy8ygjgd0vgd729";
+ minimumOCamlVersion = "4.07";
+ propagatedBuildInputs = [ base ppx_jane ];
+ meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+ };
+
+ sexplib0 = janePackage {
+ pname = "sexplib0";
+ hash = "06sb3zqhb3dwqsmn15d769hfgqwqhxnm52iqim9l767gvlwpmibb";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Library containing the definition of S-expressions and some base converters";
+ };
+
+ sexplib = janePackage {
+ pname = "sexplib";
+ hash = "03c3j1ihx4pjbb0x3arrcif3wvp3iva2ivnywhiak4mbbslgsnzr";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Library for serializing OCaml values to and from S-expressions";
+ propagatedBuildInputs = [ num parsexp ];
+ };
+
+ shell = janePackage {
+ pname = "shell";
+ hash = "1c4zmpf6s1lk7nficip32c324if6zhm62h9h03d84zgvhvymi0r1";
+ meta.description = "Yet another implementation of fork&exec and related functionality";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ textutils ];
+ checkInputs = [ ounit ];
+ };
+
+ shexp = janePackage {
+ pname = "shexp";
+ hash = "1h6hsnbg6bk32f8iv6kd6im4mv2pjsjpd1mjsfx80p1n9273xack";
+ minimumOCamlVersion = "4.07";
+ propagatedBuildInputs = [ posixat spawn ];
+ meta.description = "Process library and s-expression based shell";
+ };
+
+ spawn = janePackage {
+ pname = "spawn";
+ version = "0.13.0";
+ minimumOCamlVersion = "4.02.3";
+ hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
+ meta.description = "Spawning sub-processes";
+ buildInputs = [ ppx_expect ];
+ doCheck = false; # tests are broken on NixOS (absolute paths)
+ };
+
+ splay_tree = janePackage {
+ pname = "splay_tree";
+ hash = "1xbzzbqb054hl1v1zcgfwdgzqihni3a0dmvrric9xggmgn4ycmqq";
+ meta.description = "A splay tree implementation";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ splittable_random = janePackage {
+ pname = "splittable_random";
+ hash = "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14";
+ meta.description = "PRNG that can be split into independent streams";
+ propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ];
+ };
+
+ stdio = janePackage {
+ pname = "stdio";
+ hash = "0vv6d8absy4hvjd1babv7avpsdlvjpnd5hq691h39d0h3pvs6l98";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Standard IO library for OCaml";
+ propagatedBuildInputs = [ base ];
+ };
+
+ textutils = janePackage {
+ pname = "textutils";
+ hash = "1ggd0530lc5dkc419y3xw1wb52b4b5j3z78991gn5yxf2s50a8d4";
+ meta.description = "Text output utilities";
+ propagatedBuildInputs = [ core ];
+ };
+
+ time_now = janePackage {
+ pname = "time_now";
+ hash = "1lyq8zdz93hvpi4hpxh88kds30k5ljil8js9clcqyxrldp5n9mw0";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Reports the current time";
+ buildInputs = [ jst-config ppx_optcomp ];
+ propagatedBuildInputs = [ jane-street-headers base ppx_base ];
+ };
+
+ timezone = janePackage {
+ pname = "timezone";
+ hash = "0zf075k94nk2wxnzpxia7pnm655damwp1b58xf2s9disia1ydxg7";
+ meta.description = "Time-zone handling";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ topological_sort = janePackage {
+ pname = "topological_sort";
+ hash = "17iz7956zln31p0xnm3jlhj863zi84bcx41jylzf7gk23qsm95m8";
+ meta.description = "Topological sort algorithm";
+ propagatedBuildInputs = [ ppx_jane stdio ];
+ };
+
+ typerep = janePackage {
+ pname = "typerep";
+ hash = "0wc7h853ka3s3lxxgm61ypidl0lzgc9abdkil6f72anl0c417y90";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Typerep is a library for runtime types";
+ propagatedBuildInputs = [ base ];
+ };
+
+ variantslib = janePackage {
+ pname = "variantslib";
+ hash = "0vy0hpiaawmydh08nqlwjx52pasp74383yi0pshwbdxin99n9mxd";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Part of Jane Street's Core library";
+ propagatedBuildInputs = [ base ];
+ };
+
+ vcaml = janePackage {
+ pname = "vcaml";
+ hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs";
+ meta.description = "OCaml bindings for the Neovim API";
+ propagatedBuildInputs = [ angstrom-async async_extra faraday ];
+ };
+
+ virtual_dom = janePackage {
+ pname = "virtual_dom";
+ hash = "0vcydxx0jhbd5hbriahgp947mc7n3xymyrsfny1c4adk6aaq3c5w";
+ meta.description = "OCaml bindings for the virtual-dom library";
+ buildInputs = [ js_of_ocaml-ppx ];
+ propagatedBuildInputs = [ core_kernel js_of_ocaml lambdasoup tyxml ];
+ };
+
+ zarith_stubs_js = janePackage {
+ pname = "zarith_stubs_js";
+ hash = "16p4bn5spkrx31fr4np945v9mwdq55706v3wl19s5fy6x83gvb86";
+ minimumOCamlVersion = "4.04.2";
+ meta.description = "Javascripts stubs for the Zarith library";
+ doCheck = false; # requires workspace with zarith
+ };
+
+ zstandard = janePackage {
+ pname = "zstandard";
+ hash = "1vf76v5m9wsh5f77w9z4i8sxm05wr5digyi95x4wvzdi7q3qg6m8";
+ meta.description = "OCaml bindings to Zstandard";
+ buildInputs = [ ppx_jane ];
+ propagatedBuildInputs = [ core ctypes zstd ];
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
similarity index 53%
rename from third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix
rename to third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
index b92bcead95..9675c8d019 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
@@ -1,11 +1,17 @@
-{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.13.0" }:
+{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.14.0" }:
-{ pname, version ? defaultVersion, hash, ...}@args:
+{ pname
+, version ? defaultVersion
+, hash
+, minimumOCamlVersion ? "4.08"
+, doCheck ? true
+, ...}@args:
buildDunePackage (args // {
+ useDune2 = true;
inherit version;
- minimumOCamlVersion = "4.08";
+ inherit minimumOCamlVersion;
src = fetchFromGitHub {
owner = "janestreet";
@@ -14,6 +20,8 @@ buildDunePackage (args // {
sha256 = hash;
};
+ inherit doCheck;
+
meta.license = lib.licenses.mit;
meta.homepage = "https://github.com/janestreet/${pname}";
})
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index 0db0164589..0391498c37 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -2,6 +2,8 @@
, stdlib-shims
, ppx_yojson_conv_lib
, ocaml-syntax-shims
+, yojson
+, result
, omd
, octavius
, dune-build-info
@@ -12,10 +14,10 @@
, lib
}:
let
- version = "1.1.0";
+ version = "1.4.0";
src = fetchzip {
- url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz";
- sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb";
+ url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
+ sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33";
};
# unvendor some (not all) dependencies.
@@ -23,7 +25,7 @@ let
# ocaml-lsp without messing with your opam switch, but nix should prevent
# this type of problems without resorting to vendoring.
preBuild = ''
- rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
+ rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
'';
buildInputs = [
@@ -36,6 +38,7 @@ let
dune-build-info
omd
cmdliner
+ jsonrpc
];
lsp = buildDunePackage {
@@ -47,6 +50,15 @@ let
inherit buildInputs preBuild;
};
+ jsonrpc = buildDunePackage {
+ pname = "jsonrpc";
+ inherit version src;
+ useDune2 = true;
+ minimumOCamlVersion = "4.06";
+
+ buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ];
+ };
+
in
buildDunePackage {
pname = "ocaml-lsp-server";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix
index 71e77b24ce..d76a98fc05 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix
@@ -1,14 +1,20 @@
-{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }:
+{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R
+, alcotest
+}:
buildDunePackage rec {
pname = "ocaml-r";
- version = "0.2.0";
+ version = "0.4.0";
+
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "pveber";
repo = pname;
rev = "v${version}";
- sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy";
+ sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri";
};
# Without the following patch, stub generation fails with:
@@ -17,9 +23,14 @@ buildDunePackage rec {
substituteInPlace stubgen/stubgen.ml --replace \
'failwithf "not supported: %s" name ()' \
'sprintf "(* not supported: %s *)" name'
+ substituteInPlace lib/config/discover.ml --replace \
+ ' libRmath"' '"'
'';
- buildInputs = [ configurator pkg-config R stdio ];
+ buildInputs = [ pkg-config R dune-configurator stdio ];
+
+ doCheck = true;
+ checkInputs = [ alcotest ];
meta = {
description = "OCaml bindings for the R interpreter";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix
index 422729e6d0..fdb8ba33d5 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix
@@ -3,6 +3,8 @@
buildDunePackage rec {
pname = "opam-format";
+ useDune2 = true;
+
inherit (opam-core) src version;
minimumOCamlVersion = "4.02.3";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix
index 1801a9e1c8..1480a7d591 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02";
+ useDune2 = true;
+
inherit (opam-format) src version;
patches = [ ./download-tool.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix
index 156976a4a5..d841631dfd 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
inherit (opam) src version;
+ useDune2 = true;
+
# get rid of check for curl at configure time
# opam-state does not call curl at run time
configureFlags = [ "--disable-checks" ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 1873a4e0c5..27b6ed3f98 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,23 +1,24 @@
{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
-, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }:
+, alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }:
buildDunePackage rec {
pname = "phylogenetics";
- version = "unstable-2020-01-25";
+ version = "unstable-2020-11-23";
useDune2 = true;
src = fetchFromGitHub {
owner = "biocaml";
repo = pname;
- rev = "752a7d0324709ba919ef43630a270afd45d6b734";
- sha256 = "1zsxpl1yjbw6y6n1q7qk3h0l7c0lxhh8yp8bkxlwnpzlkqq28ycg";
+ rev = "e6e10efa0a3a8fd61bf4ab69e91a09549cc1ded6";
+ sha256 = "0pmypzp0rvlpzm8zpbcfkphwnhrpyfwfv44kshvx2f8nslmksh8c";
};
minimumOCamlVersion = "4.08"; # e.g., uses Float.min
checkInputs = [ alcotest ];
- propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ];
+ buildInputs = [ menhir ];
+ propagatedBuildInputs = [ angstrom-unix biocaml gnuplot gsl lacaml owl ppx_deriving printbox ];
doCheck = false; # many tests require bppsuite
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
index 8821e56212..d5b09b1ddc 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,24 +1,34 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
-, legacy ? false
+, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
+, stdlib-shims
}:
-let param =
- if legacy then {
- version = "0.8.1";
+let param = {
+ "0.8.1" = {
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
- } else {
- version = "0.12.0";
- sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1";
- }; in
+ max_version = "4.10";
+ };
+ "0.13.0" = {
+ sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
+ };
+ "0.15.0" = {
+ sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
+ min_version = "4.07";
+ useDune2 = true;
+ };
+}."${version}"; in
-if lib.versionAtLeast ocaml.version "4.10" && legacy
-then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}"
+if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
+|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
+then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec {
pname = "ppxlib";
- inherit (param) version;
+ inherit version;
+
+ useDune2 = param.useDune2 or false;
src = fetchFromGitHub {
owner = "ocaml-ppx";
@@ -29,6 +39,7 @@ buildDunePackage rec {
propagatedBuildInputs = [
ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
+ stdlib-shims
];
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix
deleted file mode 100644
index df6b6f0854..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, buildDunePackage, ocaml_lwt
-, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
-}:
-
-buildDunePackage rec {
- pname = "sqlexpr";
- version = "0.9.0";
-
- src = fetchurl {
- url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz";
- sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
- };
-
- buildInputs = [ lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
- propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
- doCheck = true;
-
- preBuild = "rm META.sqlexpr";
-
- meta = {
- description = "Type-safe, convenient SQLite database access";
- homepage = "https://github.com/mfp/ocaml-sqlexpr";
- license = stdenv.lib.licenses.lgpl21;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
deleted file mode 100644
index 572ff59361..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ buildDunePackage, sqlexpr, ounit
-, ppxlib, ppx_tools_versioned, re, lwt_ppx
-}:
-
-buildDunePackage {
- pname = "ppx_sqlexpr";
- inherit (sqlexpr) version src meta;
-
- minimumOCamlVersion = "4.06";
-
- postPatch = ''
- substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib
- '';
-
- buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ];
- doCheck = true;
-}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
index 0e2bdf7311..ebb5b9b9c2 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, cmdliner
, ctypes
+, dune-configurator
, npy
, ocaml-compiler-libs
, ppx_custom_printf
@@ -16,17 +17,21 @@
buildDunePackage rec {
pname = "torch";
- version = "0.10";
+ version = "0.11";
- minimumOCamlVersion = "4.07";
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "LaurentMazare";
repo = "ocaml-${pname}";
rev = version;
- sha256 = "1rqrv6hbical8chk0bl2nf60q6m4b5d1gab9fc5q03vkz2987f9b";
+ sha256 = "19zbl9zn6fslrcm6x9cis6nswhwz8mc57nrhkada658n7rcdmskr";
};
+ buildInputs = [ dune-configurator ];
+
propagatedBuildInputs = [
cmdliner
ctypes
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
index 35cdfc3a9a..c8d9436461 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
@@ -1,23 +1,29 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, cppo, ppx_tools, ppx_deriving, result }:
+{ lib, buildDunePackage, fetchFromGitLab, ppx_tools, ppx_deriving, result, cppo }:
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-visitors-20190711";
+buildDunePackage rec {
+ pname = "visitors";
+ version = "20200210";
- src = fetchurl {
- url = "http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz";
- sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg";
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.02.3";
+
+ src = fetchFromGitLab {
+ owner = "fpottier";
+ repo = pname;
+ rev = version;
+ domain = "gitlab.inria.fr";
+ sha256 = "12i099h1hc1walabiwqbinnpgcxkc1wn72913v7v6vvyif21rb5a";
};
- buildInputs = [ ocaml findlib ocamlbuild cppo ];
+ buildInputs = [ cppo ];
+
propagatedBuildInputs = [ ppx_tools ppx_deriving result ];
- createFindlibDestdir = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://gitlab.inria.fr/fpottier/visitors";
license = licenses.lgpl21;
description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures";
- inherit (ocaml.meta) platforms;
maintainers = [ maintainers.marsam ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
index 3145f88b70..781b5abbc3 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
@@ -2,8 +2,8 @@
buildPecl {
pname = "event";
- version = "3.0.1";
- sha256 = "12629hi2ddyavzgl5ala53fi8m55l0xsmqsywy040f0grzp9r6rc";
+ version = "3.0.2";
+ sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
configureFlags = [
"--with-event-libevent-dir=${pkgs.libevent.dev}"
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
index 504e15ae16..8f9eed0c1c 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
@@ -12,9 +12,14 @@ buildPecl {
url = "https://github.com/Imagick/imagick/pull/336.patch";
sha256 = "nuRdh02qaMx0s/5OzlfWjyYgZG1zgrYnAjsZ/UVIrUM=";
})
+ # Fix detection of ImageMagick 7.
+ (fetchpatch {
+ url = "https://github.com/Imagick/imagick/commit/09551fbf38c16cdaf4ade7c08744501cd82d2747.patch";
+ sha256 = "qUeQHP08kKOzuQdEpR8RSZ18Yhi0U9z24KwQcAx1UVg=";
+ })
];
- configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ];
+ configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ];
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pcre' ];
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
index de8e17f8f2..76465a77fd 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "php-cs-fixer";
- version = "2.16.7";
+ version = "2.17.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh";
+ sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12";
};
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
index 7ac33ab3c1..6bd3fb00c4 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "phpstan";
- version = "0.12.58";
+ version = "0.12.59";
in
mkDerivation {
inherit pname version;
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "1509z783rhrnlx32a3yg58sy81971dv1sf8nzs8am2m9qnpmdcll";
+ sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa";
};
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
index 98944d3bab..64a2b8028c 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
@@ -3,8 +3,8 @@
buildPecl {
pname = "rdkafka";
- version = "4.0.4";
- sha256 = "18a8p43i2g93fv7qzvk2hk66z5iv0mk1rqn097x49bjigliv60mn";
+ version = "4.1.1";
+ sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x";
buildInputs = [ pkgs.rdkafka pcre' ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
index 11ac2b7599..1a58562ab0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "JPype1";
- version = "1.1.2";
+ version = "1.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c6e36de9f7ef826ff27f6d5260acc710ebc585a534c12cbac905db088ab1d992";
+ sha256 = "62ca03e7f7963ba4ac1065ee48ff661f752b3db3c23549ed8933ab40196a3157";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix
index e9156b5c6a..e63a26e5f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix
@@ -1,6 +1,5 @@
{ buildPythonPackage
, certbot
-, pytest
, cryptography
, pyasn1
, pyopenssl
@@ -25,7 +24,9 @@ buildPythonPackage rec {
werkzeug mock ndg-httpsclient josepy
];
- checkInputs = [ pytest ];
+ # does not contain any tests
+ doCheck = false;
+ pythonImportsCheck = [ "acme" ];
sourceRoot = "source/${pname}";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix
index 6f40e03c35..66a9550053 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "aenum";
- version = "2.2.4";
+ version = "2.2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0r1812bjm72x73pl7y4yhffr4zbdjgxa08avsy4b3di0pqgqv0l1";
+ sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae";
};
# For Python 3, locale has to be set to en_US.UTF-8 for
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
index f1e3bf0cd5..6371fa804b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
@@ -3,7 +3,7 @@
, brotli, fontmath, mutatormath, booleanoperations
, ufoprocessor, ufonormalizer, psautohint, tqdm
, setuptools_scm
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -52,10 +52,18 @@ buildPythonPackage rec {
# https://github.com/adobe-type-tools/afdko/issues/1163
# https://github.com/adobe-type-tools/afdko/issues/1216
doCheck = stdenv.isx86_64;
- checkInputs = [ pytest ];
- checkPhase = ''
- PATH="$PATH:$out/bin" py.test
- '';
+ checkInputs = [ pytestCheckHook ];
+ preCheck = "export PATH=$PATH:$out/bin";
+ disabledTests = [
+ # Disable slow tests, reduces test time ~25 %
+ "test_report"
+ "test_post_overflow"
+ "test_cjk"
+ "test_extrapolate"
+ "test_filename_without_dir"
+ "test_overwrite"
+ "test_options"
+ ];
meta = with stdenv.lib; {
description = "Adobe Font Development Kit for OpenType";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
index 938ef94db4..04963f1d09 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "aioprocessing";
- version = "1.0.1";
+ version = "1.1.0";
disabled = !(pythonAtLeast "3.4");
src = fetchPypi {
inherit pname version;
- sha256 = "1yq1gfsky2kjimwdmzqk893sp6387vbl4bw0sbha5hl6cm3jp5dn";
+ sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66";
};
# Tests aren't included in pypi package
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
index a39b456641..7d6276e53e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "aiounifi";
- version = "25";
+ version = "26";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1777effcc4ec8683e53603437887c43fa650f09ef4d148904ce06e2aa11044b7";
+ sha256 = "3dd0f9fc59edff5d87905ddef3eecc93f974c209d818d3a91061b05925da04af";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix
index 71463efb91..c800756632 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta";
- version = "8.2.0";
+ version = "8.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a689b2551655ffeb1fa0af2b652653c9355e4f612a3cb8265fcb53c47f83f7c0";
+ sha256 = "83c7d751bad0cb9bd7886700da4cd83c5451b2e8eb8d4cc697966e02d6a565f8";
};
propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
index 76775acb16..df115cf7c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
@@ -4,6 +4,8 @@ buildPythonPackage rec {
pname = "ansi2html";
version = "1.6.0";
+ disabled = !isPy3k;
+
src = fetchPypi {
inherit pname version;
sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
@@ -22,6 +24,5 @@ buildPythonPackage rec {
homepage = "https://github.com/ralphbean/ansi2html";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ davidtwco ];
- platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix
index 2af445b48c..79844afe31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "auth0-python";
- version = "3.13.0";
+ version = "3.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2e968d01364c8c94fbe85154ab77ebe9e51a3f8282405bb33748071452063004";
+ sha256 = "ac7808d00676c5e7ffa9eaa228807ca1f8db7a0f4dc115337c80fb6d7eb2b50a";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
index 6a919c768c..9b9ca52b94 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
@@ -1,34 +1,35 @@
{ lib
, buildPythonPackage
, fetchPypi
+, cmake
+, numba
, numpy
-, pandas
-, pytestrunner
-, pytest
-, h5py
+, pytestCheckHook
+, rapidjson
}:
buildPythonPackage rec {
pname = "awkward";
- version = "0.14.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204";
+ sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb";
};
- nativeBuildInputs = [ pytestrunner ];
- checkInputs = [ pandas pytest h5py ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ rapidjson ];
propagatedBuildInputs = [ numpy ];
- checkPhase = ''
- py.test
- '';
+ dontUseCmakeConfigure = true;
+
+ checkInputs = [ pytestCheckHook numba ];
+ dontUseSetuptoolsCheck = true;
meta = with lib; {
- description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
- homepage = "https://github.com/scikit-hep/awkward-array";
+ description = "Manipulate JSON-like data with NumPy-like idioms";
+ homepage = "https://github.com/scikit-hep/awkward-1.0";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ veprbl ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
new file mode 100644
index 0000000000..4441d131e6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pandas
+, pytestrunner
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "awkward0";
+ version = "0.15.1";
+
+ src = fetchFromGitHub {
+ owner = "scikit-hep";
+ repo = "awkward-0.x";
+ rev = version;
+ sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz";
+ };
+
+ nativeBuildInputs = [ pytestrunner ];
+
+ propagatedBuildInputs = [ numpy ];
+
+ checkInputs = [ pandas pytestCheckHook ];
+
+ checkPhase = ''
+ # Almost all tests in this file fail
+ rm tests/test_persist.py
+ py.test
+ '';
+
+ meta = with lib; {
+ description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
+ homepage = "https://github.com/scikit-hep/awkward-array";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ costrouc SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
deleted file mode 100644
index dae8a235d8..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cmake
-, numba
-, numpy
-, pytestCheckHook
-, rapidjson
-}:
-
-buildPythonPackage rec {
- pname = "awkward1";
- version = "0.4.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ rapidjson ];
- propagatedBuildInputs = [ numpy ];
-
- dontUseCmakeConfigure = true;
-
- checkInputs = [ pytestCheckHook numba ];
- dontUseSetuptoolsCheck = true;
-
- meta = with lib; {
- description = "Manipulate JSON-like data with NumPy-like idioms";
- homepage = "https://github.com/scikit-hep/awkward-1.0";
- license = licenses.bsd3;
- maintainers = with maintainers; [ veprbl ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 92597b3b91..a186017a4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba";
+ sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 8a06199105..229cf58cea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "6b902eb7b9ccdf612e0a1738f42096f591dbf9c19d20b6d398a6361db278d4a7";
+ sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
index 2135853ff9..22b6281fa7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-synapse";
- version = "0.5.0";
+ version = "0.6.0";
disabled = pythonOlder "3";
src = fetchPypi {
inherit pname version;
- sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837";
+ sha256 = "f81cb52b220774aab93ffcf25bdc17e03fd84b6916836640789f86fbf636b984";
extension = "zip";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
index a46202b6f1..1f8ba7dbe8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "azure-synapse-accesscontrol";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5cead7051df3816a3382a74033efa0b8774cb7f8cdf5871c6825dd1638289189";
+ sha256 = "a4f32423d9facaae512c433f5460b4ceec73a6c20b44b00e9de9de7a0e86dacd";
extension = "zip";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
index a55eeff511..b85c642787 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -13,9 +13,14 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ];
+ # does not contain tests
+ doCheck = false;
+ pythonImportsCheck = [ "backports.unittest_mock" ];
+
meta = with stdenv.lib; {
description = "Provides a function install() which makes the mock module";
homepage = "https://github.com/jaraco/backports.unittest_mock";
license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix
index 20dcbbc21a..8039286539 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "bandit";
- version = "1.6.3";
+ version = "1.7.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "d02dfe250f4aa2d166c127ad81d192579e2bfcdb8501717c0e2005e35a6bcf60";
+ sha256 = "8a4c7415254d75df8ff3c3b15cfe9042ecee628a1e40b44c15a98890fbfc2608";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
index b139a88820..22807bb353 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "1.5.7";
+ version = "1.5.8";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
- sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2";
+ sha256 = "5b8c3b9047d2e00e25746d55f56f62071f0a82dd2de59371a1ee589fe28b2852";
};
# needs packages which are not available in nixpkgs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix
index f0a25dfb0b..3346afbb4a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix
@@ -5,6 +5,7 @@
, appdirs
, attrs
, click
+, dataclasses
, mypy-extensions
, pathspec
, regex
@@ -59,7 +60,7 @@ buildPythonPackage rec {
toml
typed-ast
typing-extensions
- ];
+ ] ++ lib.optional (pythonOlder "3.7") dataclasses;
meta = with lib; {
description = "The uncompromising Python code formatter";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
index 09ba8f7b5f..91d94fcd72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "bleak";
- version = "0.9.1";
+ version = "0.10.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588";
+ sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix
index 8174ef240d..0042bcaf92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "19557b14763253ca3d4f6cfc9c9fe2eed3d65db14fa273ced8b0c17ce2bfda4a";
+ sha256 = "7daa615a97d4f28db0f332b710bfe1900b15d0c25841c6d727965e4fd91e09cf";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 1688882e57..29445c6d79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.16.31"; # N.B: if you change this, change botocore too
+ version = "1.16.43"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "0c9q7njargrhxcl99mdc7xbb29imp8kpyg3d0vwq2crlzxln8y49";
+ sha256 = "sha256-pJs6tL+i9jlLpgFlz8RoQQeX3UEPMu7UfiL2FFHumG4=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index add0f54e29..e687718aa4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.19.31"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.19.43"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "0z8pmkr7j2w90qpd25wv0j1z4kqx90j6ch8c8irlyj84wx61skk2";
+ sha256 = "sha256-c5jJANvU49YWRyaSFTluo+gIL0lPPntl2basoEnB1GM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index 729b9f9f24..e283c9ee6b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
- version = "4.24.1";
+ version = "4.25.1";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d8e47ba4b975f3228a13daf481762f784f87d1e6e87a01619360d59e558d2fc0";
+ sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5";
};
propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
index 37c91127a2..25de097f1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "bugwarrior";
- version = "1.7.0";
+ version = "1.8.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks";
+ sha256 = "f024c29d2089b826f05481cace33a62aa984f33e98d226f6e41897e6f11b3f51";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index 55ff34b252..31a342b762 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k,
+{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
- txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
+ txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales, nixosTests }:
@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "2.8.4";
+ version = "2.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv";
+ sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v";
};
propagatedBuildInputs = [
@@ -51,7 +51,7 @@ let
checkInputs = [
treq
txrequests
- pyjade
+ pypugjs
boto3
moto
mock
@@ -73,13 +73,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
-
- # fix compatibility with the latest SQLAlchemy
- (fetchpatch {
- url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch";
- sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n";
- stripLen = 1;
- })
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
index ff61f98810..70073eb5c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc";
+ sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai";
};
postPatch = ''
@@ -15,6 +15,11 @@ buildPythonPackage rec {
substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
'';
+ # No tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "buildbot_pkg" ];
+
disabled = !isPy3k;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
index 9a39cc90b6..43bc8717e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s";
+ sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h";
+ sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj";
+ sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz";
+ sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn";
+ sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq";
};
buildInputs = [ buildbot-pkg ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
index f0eaa7e81a..942c82f15a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib";
+ sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
index 37ddae1503..e2938e0f32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
- version = "0.7.18";
+ version = "0.8.0";
propagatedBuildInputs = [six];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "3217d4fd3ec767448d742f3b6ff527cc3817f2421b9a9a8456e1d8ee4a9b1087";
+ sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index bb111bfbbd..51b66ef951 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.10.0";
+ version = "0.14.0";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "13r8alja25yd5gk5124y1v6frwphmz6wl5z5gz1fafb5nv2zgqw9";
+ sha256 = "0k5dhhlypilpa7h6ncqldvc14bv70c8mb2bbj7vyzfwahy57zb29";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index a28acadbd7..224ff33d5f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.21.4";
+ version = "1.21.7";
src = fetchPypi {
inherit pname version;
- sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c";
+ sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8";
};
checkInputs = [ watchdog pytest hypothesis mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix
new file mode 100644
index 0000000000..420a57c07d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi, lib, requests }:
+
+buildPythonPackage rec {
+ pname = "ciscomobilityexpress";
+ version = "0.3.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0kj0i1963afxqw9apk0yxzj1f7kpi1949ggnkzkb8v90kxpgymma";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ meta = {
+ description = "Module to interact with Cisco Mobility Express APIs to fetch connected devices";
+ homepage = "https://pypi.python.org/pypi/${pname}/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ uvnikita ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix
index 9cb88b5cbc..a1addcfc97 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "clickhouse-driver";
- version = "0.1.5";
+ version = "0.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1827cm5z2zd6mxn9alq54bbzw6vhz4a30a54vacqn7nz691qs1gd";
+ sha256 = "62d37f93872d5a13eb6b0d52bab2b593ed0e14cf9200949aa2d02f9801064c0f";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix
index 72b6a2fa30..e2ef3ea5bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix
@@ -10,7 +10,7 @@
, repeated_test
, pygments
, unittest2
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -22,12 +22,17 @@ buildPythonPackage rec {
sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187";
};
+ # Remove overly restrictive version constraints
+ postPatch = ''
+ substituteInPlace setup.py --replace "attrs>=19.1.0,<20" "attrs"
+ '';
+
checkInputs = [
+ pytestCheckHook
dateutil
pygments
repeated_test
unittest2
- pytest
];
propagatedBuildInputs = [
@@ -38,14 +43,11 @@ buildPythonPackage rec {
six
];
- checkPhase = ''
- pytest
- '';
+ pythonImportsCheck = [ "clize" ];
meta = with stdenv.lib; {
description = "Command-line argument parsing for Python";
homepage = "https://github.com/epsy/clize";
license = licenses.mit;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
index 19daa2de57..b9ffd35bf9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "clldutils";
- version = "3.5.4";
+ version = "3.6.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "clld";
repo = pname;
rev = "v${version}";
- sha256 = "0yirww9abp6hffxz57ms7ljyjw0pamw2bhfrf7cshpwwb6sx5ycf";
+ sha256 = "10jcd2x99z5ym2aki92c54caw97b3xgrkjj83qpln26hbdwpaz99";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
index 84e1b9048e..1cae57c6fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
@@ -2,8 +2,8 @@
, fetchPypi
, buildPythonPackage
, urllib3
+, geojson
, isPy3k
-, mock
, sqlalchemy
, pytestCheckHook
}:
@@ -20,12 +20,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [
urllib3
+ sqlalchemy
+ geojson
];
checkInputs = [
pytestCheckHook
- sqlalchemy
- mock
];
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
similarity index 81%
rename from third_party/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
index 3cde505428..a76e62dd4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix
@@ -22,24 +22,31 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "2.9.2"; # Also update the hash in vectors.nix
+ version = "3.3.1"; # Also update the hash in vectors-3.3.nix
src = fetchPypi {
inherit pname version;
- sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0";
+ sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy";
};
- patches = [ ./CVE-2020-25659.patch ];
+ patches = [ ./cryptography-py27-warning.patch ];
outputs = [ "out" "dev" ];
+ nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+ cffi
+ ];
+
buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
propagatedBuildInputs = [
packaging
six
- ] ++ stdenv.lib.optional (!isPyPy) cffi
- ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ];
+ ] ++ stdenv.lib.optionals (!isPyPy) [
+ cffi
+ ] ++ stdenv.lib.optionals isPy27 [
+ ipaddress enum34
+ ];
checkInputs = [
cryptography_vectors
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch
deleted file mode 100644
index a353757be1..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Backported of:
-
-From 58494b41d6ecb0f56b7c5f05d5f5e3ca0320d494 Mon Sep 17 00:00:00 2001
-From: Alex Gaynor
-Date: Sun, 25 Oct 2020 21:16:42 -0400
-Subject: [PATCH] Attempt to mitigate Bleichenbacher attacks on RSA decryption
- (#5507)
-
-diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
-index 6e4675d..ce66c28 100644
---- a/docs/spelling_wordlist.txt
-+++ b/docs/spelling_wordlist.txt
-@@ -6,6 +6,7 @@ backend
- Backends
- backends
- bcrypt
-+Bleichenbacher
- Blowfish
- boolean
- Botan
-diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
-index 3e4c2fd..6303f95 100644
---- a/src/cryptography/hazmat/backends/openssl/rsa.py
-+++ b/src/cryptography/hazmat/backends/openssl/rsa.py
-@@ -117,40 +117,19 @@ def _enc_dec_rsa_pkey_ctx(backend, key, data, padding_enum, padding):
-
- outlen = backend._ffi.new("size_t *", buf_size)
- buf = backend._ffi.new("unsigned char[]", buf_size)
-+ # Everything from this line onwards is written with the goal of being as
-+ # constant-time as is practical given the constraints of Python and our
-+ # API. See Bleichenbacher's '98 attack on RSA, and its many many variants.
-+ # As such, you should not attempt to change this (particularly to "clean it
-+ # up") without understanding why it was written this way (see
-+ # Chesterton's Fence), and without measuring to verify you have not
-+ # introduced observable time differences.
- res = crypt(pkey_ctx, buf, outlen, data, len(data))
-+ resbuf = backend._ffi.buffer(buf)[: outlen[0]]
-+ backend._lib.ERR_clear_error()
- if res <= 0:
-- _handle_rsa_enc_dec_error(backend, key)
--
-- return backend._ffi.buffer(buf)[:outlen[0]]
--
--
--def _handle_rsa_enc_dec_error(backend, key):
-- errors = backend._consume_errors()
-- backend.openssl_assert(errors)
-- backend.openssl_assert(errors[0].lib == backend._lib.ERR_LIB_RSA)
-- if isinstance(key, _RSAPublicKey):
-- backend.openssl_assert(
-- errors[0].reason == backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE
-- )
-- raise ValueError(
-- "Data too long for key size. Encrypt less data or use a "
-- "larger key size."
-- )
-- else:
-- decoding_errors = [
-- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_01,
-- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_02,
-- backend._lib.RSA_R_OAEP_DECODING_ERROR,
-- # Though this error looks similar to the
-- # RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE, this occurs on decrypts,
-- # rather than on encrypts
-- backend._lib.RSA_R_DATA_TOO_LARGE_FOR_MODULUS,
-- ]
-- if backend._lib.Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR:
-- decoding_errors.append(backend._lib.RSA_R_PKCS_DECODING_ERROR)
--
-- backend.openssl_assert(errors[0].reason in decoding_errors)
-- raise ValueError("Decryption failed.")
-+ raise ValueError("Encryption/decryption failed.")
-+ return resbuf
-
-
- def _rsa_sig_determine_padding(backend, key, padding, algorithm):
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch
new file mode 100644
index 0000000000..8233af78a9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch
@@ -0,0 +1,14 @@
+Delete the warning that breaks tests of dependent projects.
+
+--- a/src/cryptography/__init__.py
++++ b/src/cryptography/__init__.py
+@@ -33,9 +32,0 @@ __all__ = [
+-
+-if sys.version_info[0] == 2:
+- warnings.warn(
+- "Python 2 is no longer supported by the Python core team. Support for "
+- "it is now deprecated in cryptography, and will be removed in the "
+- "next release.",
+- CryptographyDeprecationWarning,
+- stacklevel=2,
+- )
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index 41802f0d06..0bee19c3f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "3.2.1"; # Also update the hash in vectors.nix
+ version = "3.3.1"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
- sha256 = "1qxz02kfsrihq1h4afyqwcsv9nh3s9mmrr6y9lhi4angw05y3mfk";
+ sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-2.9.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix
similarity index 90%
rename from third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-2.9.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix
index 096eab77be..94526c8268 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-2.9.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r";
+ sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03";
};
# No tests included
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index 567ce23783..94526c8268 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "12dq1grn0bjj7c6sj6apd6328525n7xq4kbbmww63sn3x7081vls";
+ sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03";
};
# No tests included
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
index 4b0d469180..ee2c9ded18 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.1.2";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
+ sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
};
# This differs slightly from the default python installPhase in that it pip-installs
@@ -26,7 +26,7 @@ buildPythonPackage rec {
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
# install "." instead of "*.whl"
- ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir .
+ ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache
'';
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
index 80fa1c35d6..cbd80333b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
@@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
pname = "daphne";
- version = "2.5.0";
+ version = "3.0.1";
disabled = !isPy3k;
@@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
- sha256 = "0qkhmblj3a5s3z65cgz46xsvq1b6x4m3kr6aljjnxnv7hcwib02n";
+ sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index 74eca940fb..1c4261c92b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "7.1.10";
+ version = "7.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "bae28fab1e08b709553c8efbeefc5b0ee4f5540a13a04e61fb3d348814823e16";
+ sha256 = "c720298b05648f5de8f17de03f93d60ffb30c2d55ce2750e63c17c341a8de5e4";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
index 216e636385..bbca0df8d8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "dbus-next";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "altdesktop";
repo = "python-dbus-next";
rev = "v${version}";
- sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr";
+ sha256 = "0x78ghkci4las13gwbrm8fzg671lx1q2cn8h0f64ki8yag1myia1";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
index 75a11d8cf2..beb5ba9c46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
@@ -4,7 +4,6 @@
, fetchFromGitHub
, substituteAll
, gdb
-, colorama
, flask
, psutil
, pytest-timeout
@@ -18,13 +17,13 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "Microsoft";
repo = pname;
rev = "v${version}";
- sha256 = "1r5w5ngipj5fgjylrmlw3jrh5y2n67n68l91sj9329549x4ww8dh";
+ sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq";
};
patches = [
@@ -65,7 +64,6 @@ buildPythonPackage rec {
)'';
checkInputs = [
- colorama
flask
psutil
pytest-timeout
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix
index 5b3a6e7281..bc84df26a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "deform";
- version = "2.0.14";
+ version = "2.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
+ sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index 8961d82341..a9c0b517a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
buildPythonPackage rec {
pname = "dependency-injector";
- version = "4.5.3";
+ version = "4.5.4";
src = fetchPypi {
inherit pname version;
- sha256 = "345bfa4185802a712e27903b5612d4748a1e2483c3d5da8d840d8a401aeb75ea";
+ sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002";
};
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
index e2a4625c60..4f78464253 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
@@ -23,8 +23,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp websockets ];
patchPhase = ''
substituteInPlace "requirements.txt" \
- --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \
- --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6"
+ --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp" \
+ --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets"
'' + lib.optionalString withVoice ''
substituteInPlace "discord/opus.py" \
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
index 6dc4ad3402..313ae32f04 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-cors-headers";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a";
+ sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f";
};
propagatedBuildInputs = [ django ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
index ecf400b21d..455eeebddd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "django-extensions";
- version = "3.0.8";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1z2si9wpc8irqhi5i2wp4wr05dqxyw4mn2vj3amp0rvsvydws92c";
+ sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec=";
};
LC_ALL = "en_US.UTF-8";
@@ -49,10 +49,11 @@ buildPythonPackage rec {
werkzeug
];
- # tests not compatible with pip>=20
+ # remove tests that need network access
checkPhase = ''
rm tests/management/commands/test_pipchecker.py
- ${python.interpreter} setup.py test
+ DJANGO_SETTINGS_MODULE=tests.testapp.settings \
+ pytest django_extensions tests
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index c0467bbba7..e3e48bda68 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-storages";
- version = "1.10.1";
+ version = "1.11";
src = fetchPypi {
inherit pname version;
- sha256 = "652275ab7844538c462b62810276c0244866f345878256a9e0e86f5b1283ae18";
+ sha256 = "7af56611c62a1c174aab4e862efb7fdd98296dccf76f42135f5b6851fc313c97";
};
propagatedBuildInputs = [ django ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix
index 9b32bab7d6..0fa202addb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
- version = "2.18.200";
+ version = "2.19.202";
# No source available from official repo
src = fetchPypi {
inherit pname version;
- sha256 = "340848e67e1389b32b44d16a100aed1ebb0a6f0519b0f3cbce7cd0de6478fd6c";
+ sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
index 6e03a33f29..cc7a330e97 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock, pytestpep8
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
, pytest_xdist, covCore, glibcLocales }:
buildPythonPackage rec {
@@ -16,7 +16,6 @@ buildPythonPackage rec {
pytest
pytestcov
mock
- pytestpep8
pytest_xdist
covCore
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
index 573b01d239..8f403469e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
- version = "7.10.0";
+ version = "7.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9053ca99bc9db84f5d80e124a79a32dfa0f7079b2112b546a03241c0dbeda36d";
+ sha256 = "a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48";
};
# Check is disabled because running them destroy the content of the local cluster!
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/feedparser/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedparser/5.nix
new file mode 100644
index 0000000000..31fc61053b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/feedparser/5.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "feedparser";
+ version = "5.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
+ };
+
+ # lots of networking failures
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/kurtmckee/feedparser";
+ description = "Universal feed parser";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ domenkozar ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix
index 9a13ebac64..f2b7222c3d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
"--benchmark-disable"
"--deselect=tests/test_inputs.py::URLTest::test_check"
"--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check"
+ "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix
index 43fdae8cca..c694c15f55 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix
@@ -1,19 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, python
, fonttools, lxml, fs, unicodedata2
, defcon, fontpens, fontmath, booleanoperations
-, pytest
+, pytest, setuptools_scm
}:
buildPythonPackage rec {
pname = "fontParts";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z";
+ sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy";
extension = "zip";
};
+ nativeBuildInputs = [ setuptools_scm ];
+
propagatedBuildInputs = [
booleanoperations
fonttools
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index 17944b4528..bda80fe9e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "genanki";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b4049621469be115bb13b6ff90994c4c68ef9e7e72e6a98d4a3ada629f163a11";
+ sha256 = "ced1ddcaecc37289c65c26affb20027705e3821e692327e354e0d5b9b0fd8446";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
index 1f7975abe5..cfc481a90a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix
@@ -10,7 +10,7 @@
let
pname = "gmpy2";
- version = "2.1a4";
+ version = "2.1.0b5";
in
buildPythonPackage {
@@ -22,20 +22,9 @@ buildPythonPackage {
owner = "aleaxit";
repo = "gmpy";
rev = "gmpy2-${version}";
- sha256 = "1wg4w4q2l7n26ksrdh4rwqmifgfm32n7x29cgdvmmbv5lmilb5hz";
+ sha256 = "1mqzyp7qwqqyk6jbicgx22svdy2106xwhmhfvdf0vpnmwswcxclb";
};
- patches = [
- # Backport of two bugfixes (including a segfault):
- # https://github.com/aleaxit/gmpy/pull/217
- # https://github.com/aleaxit/gmpy/pull/218
- (fetchpatch {
- name = "bugfixes.patch";
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gmpy2/patches/PR217_PR218_conversion_methods.patch?id=b7fbb9a4dac5d6882f6b83a57447dd79ecafb84c";
- sha256 = "1x3gwvqac36k4ypclxq37fcvi6p790k4xdpm2bj2b3xsvjb80ycz";
- })
- ];
-
buildInputs = [ gmp mpfr libmpc ];
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index cea0608c3f..3255475fbf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.4.0";
+ version = "2.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2d53d6fed1c25c9c0ce361dad1c64203c96b2344f7156357a501630d1cb08445";
+ sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef";
};
disabled = pythonOlder "3.6";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
index 4d170d1c8b..c5415b84ba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ce641b3ffaef407d5fe9b798955c6c6f2d1bfb58d6e11b4f87eb6fbb745a2711";
+ sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911";
};
disabled = pythonOlder "3.6";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
index 80bdcd1b83..d4fb4c59a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
- version = "0.32.0";
+ version = "0.32.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a";
+ sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad";
};
disabled = pythonOlder "3.5";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
index 60f9e3e11a..1049895bda 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759";
+ sha256 = "6183168465749f007449ef4125356d03cca0114ed49faf7ed64f34ec3edd4fe8";
};
disabled = pythonOlder "3.6";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
index 1739183c3a..90ff3df89e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -1,20 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub
, acme, aiohttp, snitun, attrs, pycognito, warrant
-, pytest-aiohttp, asynctest, atomicwrites, pytest, pythonOlder }:
+, pytest-aiohttp, asynctest, atomicwrites, pytest }:
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.37.2";
+ version = "0.39.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "0gv8p9nba7269qhc05ds0i79wz4419qjfhn7k9kcngfj1yngb6dm";
+ sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w";
};
postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
+ sed -i 's/"attrs.*"/"attrs"/' setup.py
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
index 909606c25e..3f601eacc4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
- pytest --doctest-modules --pyargs hmmlearn
+ pytest --pyargs hmmlearn
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
index 5b8cb6cecb..cc6003fa95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "howdoi";
- version = "2.0.7";
+ version = "2.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "09362f7390119dffd83c61a942801ad4d19aee499340ef7e8d5871167391d3d6";
+ sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
index 9961288281..9944816f8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
@@ -6,19 +6,21 @@
buildPythonPackage rec {
pname = "hstspreload";
- version = "2020.6.9";
+ version = "2020.11.21";
disabled = isPy27;
src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = version;
- sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2";
+ sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij";
};
# tests require network connection
doCheck = false;
+ pythonImportsCheck = [ "hstspreload" ];
+
meta = with lib; {
description = "Chromium HSTS Preload list as a Python package and updated daily";
homepage = "https://github.com/sethmlarson/hstspreload";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
index a3cd4d5ec4..9ce859c9b7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hvac";
- version = "0.10.5";
+ version = "0.10.6";
src = fetchPypi {
inherit pname version;
- sha256 = "87dc2a3183c1d4595990203e752b430155d7582a60850dfe0756189a233d4b57";
+ sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada";
};
propagatedBuildInputs = [ requests six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix
index 08799a9fb4..30661c9bc9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, tatsu, arrow
-, pytestCheckHook, pytestpep8, pytest-flakes
+, pytestCheckHook, pytest-flakes
}:
buildPythonPackage rec {
@@ -20,9 +20,10 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "arrow>=0.11,<0.15" "arrow"
+ substituteInPlace setup.cfg --replace "--pep8" ""
'';
- checkInputs = [ pytestCheckHook pytestpep8 pytest-flakes ];
+ checkInputs = [ pytestCheckHook pytest-flakes ];
meta = with stdenv.lib; {
description = "Pythonic and easy iCalendar library (RFC 5545)";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
index f652ac60ce..843537453c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "imagecorruptions";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "011e7c84a01f3e41465e5ad1ee48291cd6fd8032f45c836c5ddaad6e09fe0ae2";
+ sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
index 141412d5bd..bc2f39ad21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.12.0";
+ version = "1.13.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "0b4xr8nwrnikj2rnyrrcl6pym2il8iirr9f9cyg6vzfgx8l8brk9";
+ sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q";
};
# makes test not reproducible
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ircstates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ircstates/default.nix
index 3e54451eb3..b5404febfa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ircstates/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ircstates/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ircstates";
- version = "0.11.6";
+ version = "0.11.7";
disabled = pythonOlder "3.6"; # f-strings
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
- sha256 = "0yhrd1nmf9fjwknbga8wspy3bab40lgp4qqnr7w75x9wq5ivmqhg";
+ sha256 = "00dyd6mry10na98x1gs92xnfpjf1wd9zpblx1wcx8ggv5rqvgqrm";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
index cde440380b..82ddb3bf23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, six
-, flake8, pep8-naming, pytest, pytestcov, pytestpep8 }:
+, flake8, pep8-naming, pytest, pytestcov }:
buildPythonPackage rec {
pname = "jsonlines";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ flake8 pep8-naming pytest pytestcov pytestpep8 ];
+ checkInputs = [ flake8 pep8-naming pytest pytestcov ];
checkPhase = ''
pytest
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
index f43c7618b1..82391d3775 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "keepkey";
- version = "6.0.3";
+ version = "6.6.0";
src = fetchFromGitHub {
owner = "keepkey";
repo = "python-keepkey";
rev = "v${version}";
- sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm";
+ sha256 = "1v0ns26ykskn0dpbvz9g6lz4q740qmahvddj3pc3rfbjvg43p3vh";
};
propagatedBuildInputs = [ protobuf hidapi trezor ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
index 8b6301ab59..f2243a1531 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, pytestpep8, pytest_xdist
+, pytest, pytestcov, pytest_xdist
, six, numpy, scipy, pyyaml, h5py
, keras-applications, keras-preprocessing
}:
@@ -16,7 +16,6 @@ buildPythonPackage rec {
checkInputs = [
pytest
pytestcov
- pytestpep8
pytest_xdist
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
index c12888b3a8..f756790e28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
homepage = "https://github.com/vpelletier/python-libusb1";
description = "Python ctype-based wrapper around libusb1";
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ rnhmjoj ];
+ maintainers = with maintainers; [ prusnak rnhmjoj ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index e9bcd0ed89..eae2e4208d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "lightgbm";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82";
+ sha256 = "babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
index a94391890b..b46d156653 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "limnoria";
- version = "2020.10.10";
+ version = "2020.12.05";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
- sha256 = "546fdfad14c645ebb56e20a83ce34259b91a6db5c50cf14df741771b28ac2e19";
+ sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix
index e329f36a71..958236606c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "livereload";
- version = "2.6.1";
+ version = "2.6.3";
src = fetchFromGitHub {
owner = "lepture";
repo = "python-livereload";
- rev = "v${version}";
- sha256 = "15v2a0af897ijnsfjh2r8f7l5zi5i2jdm6z0xzlyyvp9pxd6mpfm";
+ rev = version;
+ sha256 = "1alp83h3l3771l915jqa1ylyllad7wxnmblayan0z0zj37jkp9n7";
};
buildInputs = [ django ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix
index cdf1d46af7..f426d3dd7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, nose
+, pytestCheckHook
, mock
}:
@@ -15,11 +15,12 @@ buildPythonPackage rec {
};
checkInputs = [
- nose
+ pytestCheckHook
mock
];
- checkPhase = "nosetests";
+ # Tests broken.
+ doCheck = false;
meta = {
description = "Load me later. A lazy plugin management system for Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
index cb9a103379..ac750b13e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
@@ -2,12 +2,12 @@
}:
buildPythonPackage rec {
- version = "2.1.1";
+ version = "2.2.0";
pname = "mac_alias";
src = fetchPypi {
inherit pname version;
- sha256 = "55468c84a87c8b3929a3dc98f753194f7fe93fd8621abbfea1a4019448058a14";
+ sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0";
};
# pypi package does not include tests;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
index 125270ef12..cb7119860f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
@@ -3,20 +3,22 @@
, fetchFromGitHub
, pythonOlder
, python
-, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, watchdog
+, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
+, importlib-metadata
+, importlib-resources
, dbus-next
}:
buildPythonPackage rec {
pname = "maestral";
- version = "1.2.1";
+ version = "1.3.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
- sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM=";
+ sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM=";
};
propagatedBuildInputs = [
@@ -34,7 +36,12 @@ buildPythonPackage rec {
setuptools
sdnotify
sqlalchemy
+ survey
watchdog
+ ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ] ++ stdenv.lib.optionals (pythonOlder "3.9") [
+ importlib-resources
] ++ stdenv.lib.optionals stdenv.isLinux [
dbus-next
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index 66cb8ea774..7cfd8e83db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.8.3";
+ version = "0.8.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x";
+ sha256 = "564ffe240fd9a29978959c7d7827610cf4d8ff02ed612c3fd8067e2fba2cba59";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
index 2744ff9a27..644f01fdb1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, requests, requests_oauthlib, six
-, pytest, pytestpep8, pytestcache, pytestcov, responses, mock
+, pytest, pytestcache, pytestcov, responses, mock
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj";
};
- checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ];
+ checkInputs = [ pytest pytestcache pytestcov responses mock ];
propagatedBuildInputs = [ requests requests_oauthlib six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
index 0d4aa54232..bc924000ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mysqlclient";
- version = "2.0.1";
+ version = "2.0.2";
nativeBuildInputs = [
libmysqlclient
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "fb2f75aea14722390d2d8ddf384ad99da708c707a96656210a7be8af20a2c5e5";
+ sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
index 432603d620..33c7d307b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
- version = "1.5.5";
+ version = "1.5.5.1";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "910b0c9d1ca7bef9c5796c45e2f5f30b91df70997ac655c51a58073eff2634f9";
+ sha256 = "d957e55a667d1fc651ddef22fea10ded0f142b7d9dbbf4d08c0012d32f445abd";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
index 3b35b67bf0..122f34edb6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pipx";
- version = "0.15.5.1";
+ version = "0.15.6.0";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "pipxproject";
repo = pname;
rev = version;
- sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6";
+ sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a";
};
propagatedBuildInputs = [ userpath argcomplete packaging ];
@@ -40,6 +40,8 @@ buildPythonPackage rec {
"internet"
"runpip"
"upgrade"
+ "suffix"
+ "legacy_venv"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
index 1b762fed05..758cd0a784 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "prance";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ffpfny3z8v3g0drirm27qafafbbvbc4h5k8v7yiwirnh0vn9v46";
+ sha256 = "f7e98b0f7e8ef0dd581c40d8a3e869e15e74b08026b862c3212447f8aa2426a7";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix
new file mode 100644
index 0000000000..f5fe7ff96b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -0,0 +1,43 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, fetchPypi
+, git
+, isPy27
+, lib
+, pytestCheckHook
+, ruamel_yaml
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "pre-commit-hooks";
+ version = "3.3.0";
+ disabled = isPy27;
+
+ # fetchPypi does not provide tests
+ src = fetchFromGitHub {
+ owner = "pre-commit";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1sppwcqsbr9gv2cpjslngcbggsxvdr84zgrin94yjr40jgkjzdpq";
+ };
+
+ propagatedBuildInputs = [ toml ruamel_yaml ];
+ checkInputs = [ git pytestCheckHook ];
+
+ # the tests require a functional git installation which requires a valid HOME
+ # directory.
+ preCheck = ''
+ export HOME="$(mktemp -d)"
+
+ git config --global user.name "Nix Builder"
+ git config --global user.email "nix-builder@nixos.org"
+ '';
+
+ meta = with lib; {
+ description = "Some out-of-the-box hooks for pre-commit";
+ homepage = "https://github.com/pre-commit/pre-commit-hooks";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
new file mode 100644
index 0000000000..ccaa02e2f4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/1.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, setuptools_scm
+, wcwidth
+}:
+
+buildPythonPackage rec {
+ pname = "prettytable";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+ buildInputs = [ glibcLocales ];
+
+ propagatedBuildInputs = [ wcwidth ];
+
+ preCheck = ''
+ export LANG="en_US.UTF-8"
+ '';
+
+ # no test no longer available in pypi package
+ doCheck = false;
+ pythonImportsCheck = [ "prettytable" ];
+
+ meta = with stdenv.lib; {
+ description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
+ homepage = "http://code.google.com/p/prettytable/";
+ license = licenses.bsd3;
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
index 23ebc93545..55590f8bd0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix
@@ -2,16 +2,7 @@
, python
, buildPythonPackage
, fetchPypi
-, pytest
, python-utils
-, sphinx
-, flake8
-, pytestpep8
-, pytest-flakes
-, pytestcov
-, pytestcache
-, pytestrunner
-, freezegun
}:
buildPythonPackage rec {
@@ -24,17 +15,12 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ python-utils ];
- nativeBuildInputs = [ pytestrunner ];
- checkInputs = [
- pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov
- pytestcache freezegun
- ];
- # ignore tests on the nix wrapped setup.py
- checkPhase = ''
- runHook preCheck
- ${python.interpreter} setup.py test
- runHook postCheck
- '';
+
+ # depends on unmaintained pytest-pep8
+ # https://github.com/WoLpH/python-progressbar/issues/241
+ doCheck = false;
+
+ pythonImportsCheck = [ "progressbar" ];
meta = with stdenv.lib; {
homepage = "https://progressbar-2.readthedocs.io/en/latest/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
index fb9237c893..68d1513367 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
@@ -1,20 +1,21 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, fonttools, lxml, fs
+, fonttools
+, lxml, fs # for fonttools extras
, setuptools_scm
-, pytest, pytestcov, pytest_xdist, pytest-randomly
+, pytestCheckHook, pytest_5, pytestcov, pytest_xdist
}:
buildPythonPackage rec {
pname = "psautohint";
- version = "2.1.2";
+ version = "2.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
- owner = "adobe-type-tools";
- repo = pname;
- sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n";
- rev = "v${version}";
+ owner = "adobe-type-tools";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0gsgfr190xy2rnjf1gf7688xrh13ihgq10s19s4rv5hp6pmg9iaa";
fetchSubmodules = true; # data dir for tests
};
@@ -28,8 +29,24 @@ buildPythonPackage rec {
propagatedBuildInputs = [ fonttools lxml fs ];
- checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ];
- checkPhase = "pytest tests";
+ checkInputs = [
+ # Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6
+ # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965
+ # Override might be able to be removed in future, check package dependency pins (coverage.yml)
+ (pytestCheckHook.override{ pytest = pytest_5; })
+ pytestcov
+ pytest_xdist
+ ];
+ disabledTests = [
+ # Slow tests, reduces test time from ~5 mins to ~30s
+ "test_mmufo"
+ "test_flex_ufo"
+ "test_ufo"
+ "test_flex_otf"
+ "test_multi_outpath"
+ "test_mmhint"
+ "test_otf"
+ ];
meta = with lib; {
description = "Script to normalize the XML and other data inside of a UFO";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix
index 73d367f5eb..590fc022d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "PuLP";
- version = "2.3.1";
+ version = "2.4";
src = fetchPypi {
inherit pname version;
- sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50";
+ sha256 = "b2aff10989b3692e3a59301a0cb0acddeb25dcea378f8804c86007075eae55b5";
};
propagatedBuildInputs = [ pyparsing amply ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
index 665aca5f8e..150198a65a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "py-air-control-exporter";
- version = "0.1.5";
+ version = "0.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "46eff1c801a299cf2ad37e6bd0c579449779cb6a47f1007264bfcabf12739f8b";
+ sha256 = "2c1bce2423b7452388e35756bef098c123b3cd4a38e8b1302f7297a08e0a9eaa";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
index adec3bd07b..647866b143 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "pyatv";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi";
+ sha256 = "06qj6r9kcal2nimg8rpjfid8rnlz43l7hn0v9v1mpayjmv2fl8sp";
};
nativeBuildInputs = [ pytestrunner];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
index aaf703f539..554a6ab0b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pybullet";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "47e55d2b0c565a968406f314faad7c002be6d8b0afc8ad2c437d07b7b7d2f590";
+ sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
index 21e39b68d1..9ce4ffc0f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder
, snowballstemmer, six, configparser
-, pytest, pytestpep8, mock, pathlib }:
+, pytest, mock, pathlib }:
buildPythonPackage rec {
pname = "pydocstyle";
@@ -17,11 +17,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser;
- checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
+ checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
checkPhase = ''
# test_integration.py installs packages via pip
- py.test --pep8 --cache-clear -vv src/tests -k "not test_integration"
+ py.test --cache-clear -vv src/tests -k "not test_integration"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
index cef9e96442..36c61ace85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
@@ -1,7 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, mock
, pytest
-, pytestpep8
, snowballstemmer
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
index 399d889db2..9e21854a7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pyfaidx";
- version = "0.5.9.1";
+ version = "0.5.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "eda8af04ba4da4fd63fdc35a62e0e41dfc06aa1a511728dfbdd7707e3b382855";
+ sha256 = "73e740eaa45c097a09e543450f88d5ed06c0ece4b6936dad7e71077f67797b74";
};
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjade/default.nix
deleted file mode 100644
index ad6742f5de..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyjade/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2
-, tornado, pyramid, Mako, six }:
-
-buildPythonPackage rec {
- pname = "pyjade";
- version = "4.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
- };
-
- buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
- propagatedBuildInputs = [ six ];
- postPatch = ''
- sed -i 's/1.4.99/1.99/' setup.py
- '';
- checkPhase = ''
- nosetests pyjade
- '';
- # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
- doCheck = false;
- meta = with stdenv.lib; {
- description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
- homepage = "https://github.com/syrusakbary/pyjade";
- license = licenses.mit;
- maintainers = with maintainers; [ nand0p ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
index 752755700b..a6778a4aa7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
@@ -14,7 +14,6 @@
, pytestcov
, covCore
, pytest-flakes
-, pytestpep8
, sphinx
, mock
, chalice
@@ -35,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
checkInputs = [
flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
- pytest-flakes pytestpep8 sphinx mock chalice
+ pytest-flakes sphinx mock chalice
];
src = fetchPypi {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index 33fd3c6e10..202607186b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
@@ -54,6 +54,9 @@ let
optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
) ++ (
optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
+ ) ++ (
+ # https://github.com/pyca/pyopenssl/issues/974
+ optionals stdenv.isi686 [ "test_verify_with_time" ]
);
# Compose the final string expression, including the "-k" and the single quotes.
@@ -65,11 +68,11 @@ in
buildPythonPackage rec {
pname = "pyOpenSSL";
- version = "19.1.0";
+ version = "20.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507";
+ sha256 = "1i8ab5zn9i9iq2ksizp3rd42v157kacddzz88kviqw3kpp68xw4j";
};
outputs = [ "out" "dev" ];
@@ -81,27 +84,6 @@ buildPythonPackage rec {
runHook postCheck
'';
- patches = [
- # 4 patches for 2020 bug
- # https://github.com/pyca/pyopenssl/pull/828
- (fetchpatch {
- url = "https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch";
- sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3";
- })
- (fetchpatch {
- url = "https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch";
- sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f";
- })
- (fetchpatch {
- url = "https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch";
- sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j";
- })
- (fetchpatch {
- url = "https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch";
- sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2";
- })
- ];
-
# Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
new file mode 100644
index 0000000000..e6bf3b9211
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
+, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
+
+buildPythonPackage rec {
+ pname = "pypugjs";
+ version = "5.9.8";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1iy8k56rbslxcylhamdik2bd6gqqirrix55mrdn29zz9gl6vg1xi";
+ };
+
+ propagatedBuildInputs = [ six chardet ];
+ checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
+
+ checkPhase = ''
+ nosetests pypugjs
+ '';
+
+ meta = with stdenv.lib; {
+ description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";
+ homepage = "https://github.com/kakulukia/pypugjs";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lopsided98 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
index 5b971c48d7..0c32985cfa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
@@ -30,12 +30,12 @@ let
in buildPythonPackage rec {
pname = "PyQt5";
- version = "5.15.1";
+ version = "5.15.2";
format = "other";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr";
+ sha256 = "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
index a343db4f55..7da3239f3e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, isPy27
, six
, pytest_4
, hypothesis_4
@@ -11,6 +12,8 @@ buildPythonPackage rec {
pname = "pyrsistent";
version = "0.17.3";
+ disabled = isPy27;
+
src = fetchPypi {
inherit pname version;
sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
index 8a5c3ae348..1382dc7eff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pysmb";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
- sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287";
+ sha256 = "f16e5e796b9dcc1d17ee76f87d53dd471f205fa19b4045eeda5bc7558a57d579";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
index 20b2483c9d..6f23c00baf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ black pytest toml ];
+ # does not contain tests
+ doCheck = false;
pythonImportsCheck = [ "pytest_black" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
index 44a5973014..48c5020a44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -7,7 +7,6 @@
, factory_boy
, pytestcache
, pytestcov
-, pytestpep8
, mock
}:
@@ -22,6 +21,9 @@ buildPythonPackage rec {
sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn";
};
+ # TODO: remove in next release, it's removed in master.
+ postPatch = "substituteInPlace tox.ini --replace '--pep8' ''";
+
propagatedBuildInputs = [ factory_boy inflection pytest ];
# The project uses tox, which we can't. So we simply run pytest manually.
@@ -30,7 +32,6 @@ buildPythonPackage rec {
pytestCheckHook
pytestcache
pytestcov
- pytestpep8
];
pytestFlagsArray = [ "--ignore=docs" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
index 38156cc0cc..440cc63218 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,5 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, pytestpep8
, pytest
, pyflakes
}:
@@ -16,7 +15,7 @@ buildPythonPackage rec {
sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
};
- checkInputs = [ pytestpep8 pytest ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ pytest pyflakes ];
# no longer passes
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
index 23f50347c4..e6e17adc92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pytest-html";
- version = "3.1.0";
+ version = "3.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8a7979e2411aac445870d8cad9a251ab3823bc14f77d065e9ce9a5dff86f697d";
+ sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
index 2d2a3264e7..9062284d5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -17,8 +17,13 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
+
propagatedBuildInputs = [ pytest mypy filelock ];
+ # does not contain tests
+ doCheck = false;
+ pythonImportsCheck = [ "pytest_mypy" ];
+
meta = with lib; {
description = "Mypy static type checker plugin for Pytest";
homepage = "https://github.com/dbader/pytest-mypy";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pep8/default.nix
deleted file mode 100644
index 82a900a9d2..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pep8/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcache, pep8 }:
-
-buildPythonPackage rec {
- pname = "pytest-pep8";
- version = "1.0.6";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3";
- };
-
- buildInputs = [ pytest ];
- propagatedBuildInputs = [ pytestcache pep8 ];
-
- checkPhase = ''
- py.test
- '';
-
- # Fails
- doCheck = false;
-
- meta = with stdenv.lib; {
- license = licenses.mit;
- homepage = "https://pypi.python.org/pypi/pytest-pep8";
- description = "pytest plugin to check PEP8 requirements";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 8db28159d9..7db982ed85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
buildPythonPackage rec {
pname = "pytest-quickcheck";
version = "0.8.6";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ];
+ propagatedBuildInputs = [ pytest-flakes tox ];
meta = with stdenv.lib; {
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix
index 923fe14cfa..7bf05013f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "pytest-trio";
- version = "0.6.0";
- disabled = pythonOlder "3.5";
+ version = "0.7.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-trio";
repo = pname;
rev = "v${version}";
- sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9";
+ sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
index 936a1eb2e3..60160d270b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytestrunner, pytestcov, pytest-flakes, sphinx, six }:
buildPythonPackage rec {
pname = "python-utils";
@@ -12,13 +12,10 @@ buildPythonPackage rec {
postPatch = ''
rm -r tests/__pycache__
rm tests/*.pyc
+ substituteInPlace pytest.ini --replace "--pep8" ""
'';
- checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ];
-
- checkPhase = ''
- py.test tests
- '';
+ checkInputs = [ pytestCheckHook pytestrunner pytestcov pytest-flakes sphinx ];
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index 64564a4dca..0430ab37a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
- version = "0.9.94";
+ version = "0.9.95";
disabled = isPy27;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "v${version}";
- sha256 = "1i2m651isa6xk3zj8dhzdbmd1bdzl51bh6rxifx6gg22hfa5dj9a";
+ sha256 = "1msvs1j3n47762ahm21bnkk2qqabxw8diiyi7s420x4zg24mr23g";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
index f073c408f7..6a97e6d30a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
@@ -3,6 +3,7 @@
, fetchurl
, isPy37
, isPy38
+, isPy39
, python
, nvidia_x11
, addOpenGLRunpath
@@ -19,7 +20,7 @@ let
platform = if stdenv.isDarwin then "darwin" else "linux";
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
- version = "1.7.0";
+ version = "1.7.1";
in buildPythonPackage {
inherit version;
@@ -28,7 +29,7 @@ in buildPythonPackage {
format = "wheel";
- disabled = !(isPy37 || isPy38);
+ disabled = !(isPy37 || isPy38 || isPy39);
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
@@ -45,16 +46,6 @@ in buildPythonPackage {
typing-extensions
];
- # PyTorch are broken: the dataclasses wheel is required, but ships with
- # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7.
- #
- # https://github.com/pytorch/pytorch/issues/46930
- #
- # Should be removed with the next PyTorch version.
- pipInstallFlags = [
- "--no-deps"
- ];
-
postInstall = ''
# ONNX conversion
rm -rf $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
index afdde5057d..a542233e15 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -1,10 +1,14 @@
version: {
x86_64-linux-37 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
- sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf";
+ hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY=";
};
x86_64-linux-38 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
- sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6";
+ hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4=";
+ };
+ x86_64-linux-39 = {
+ url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";
+ hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc=";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
index ff7a0e5107..f072972937 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
@@ -112,7 +112,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
- version = "1.7.0";
+ version = "1.7.1";
disabled = !isPy3k;
@@ -127,7 +127,7 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";
+ sha256 = "sha256-udpbSL8xnzf20A1pYYNlYjdp8ME8AVaAkMMiw53K6CU=";
};
patches = lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix
index 11fe52d553..3684fee0d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix
@@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
- version = "0.2.3";
+ version = "0.2.4";
pname = "pyvcd";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c0fd7321143e821033f59dd41fc6b0350d1533ddccd4c8fc1d1f76e21cd667de";
+ sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d";
};
buildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
index 5853538610..1a01eda244 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyvips";
- version = "2.1.13";
+ version = "2.1.14";
src = fetchPypi {
inherit pname version;
- sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f";
+ sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2";
};
nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix
deleted file mode 100644
index 962ba62f50..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/qasm2image/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, cairocffi
-, cairosvg
-, cffi
-, qiskit
-, svgwrite
-, colorama
-, python
-, pythonOlder
-}:
-
-buildPythonPackage {
- pname = "qasm2image";
- version = "0.8.0";
-
- src = fetchFromGitHub {
- owner = "nelimee";
- repo = "qasm2image";
- rev = "2c01756946ba9782973359dbd7bbf6651af6bee5";
- sha256 = "1bnkzv7wrdvrq71dmsqanb3v2hcsxh5zaglfcxm2d9zzpmvb4a2n";
- };
-
- disabled = pythonOlder "3.5";
-
- propagatedBuildInputs = [
- cairocffi
- cairosvg
- cffi
- qiskit
- svgwrite
- ];
-
- checkInputs = [
- colorama
- ];
- checkPhase = ''
- ${python.interpreter} tests/launch_tests.py
- '';
-
- LC_ALL="en_US.UTF-8";
-
- meta = {
- description = "A Python module to visualise quantum circuit";
- homepage = "https://github.com/nelimeee/qasm2image";
- license = lib.licenses.cecill-b;
- maintainers = with lib.maintainers; [
- pandaman
- ];
- broken = true; # last update Oct 2018, failed tests don't error the build, and out-of-date with latest python3Packages.qiskit
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
index 57d89b5571..e5eb877b6b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -8,6 +8,7 @@
, catch2
, cmake
, cython
+, fmt
, muparserx
, ninja
, nlohmann_json
@@ -47,6 +48,7 @@ buildPythonPackage rec {
buildInputs = [
blas
catch2
+ fmt
muparserx
nlohmann_json
spdlog
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
index 9641ee9d12..188e66b5c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "requests-hawk";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl";
+ sha256 = "1a5e61cab14627f1b5ba7de0e3fb2b681007ff7b2a49110d504e5cd6d7fd62d6";
};
propagatedBuildInputs = [ mohawk requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
index 5229dd96b7..f98b68c13a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, pbr, requests
-, pytest, pytestpep8, waitress }:
+, pytest, waitress }:
buildPythonPackage rec {
pname = "requests-unixsocket";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pbr ];
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytest pytestpep8 waitress ];
+ checkInputs = [ pytest waitress ];
checkPhase = ''
rm pytest.ini
py.test
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
index 9438320c1a..b3bf8fce0f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "seaborn";
- version = "0.11.0";
+ version = "0.11.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "390f8437b14f5ce845062f2865ad51656464c306d09bb97d7764c6cba1dd607c";
+ sha256 = "44e78eaed937c5a87fc7a892c329a7cc091060b67ebd1d0d306b446a74ba01ad";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
index 84465cd475..5125e166a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "setuptools-rust";
- version = "0.11.5";
+ version = "0.11.6";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "04ea21f1bd029046fb87d098be4d7dc74663a58dd1f9fc6edcf8f3e4123ec4a8";
+ sha256 = "a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca";
};
nativeBuildInputs = [ setuptools_scm ];
@@ -26,6 +26,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Setuptools plugin for Rust support";
homepage = "https://github.com/PyO3/setuptools-rust";
+ changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
index 9c08871339..d2b4640549 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
@@ -14,6 +14,9 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
+ doCheck = false;
+ pythonImportsCheck = [ "setuptools_scm_git_archive" ];
+
meta = with stdenv.lib; {
description = "setuptools_scm plugin for git archives";
homepage = "https://github.com/Changaco/setuptools_scm_git_archive";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
index f30e8dd5cd..987c75ba5a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
@@ -38,7 +38,7 @@ let
# Here we untar the sdist and retar it in order to control the timestamps
# of all the files included
tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
- tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" ${pname}-${version}.post0
+ tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" --sort=name ${pname}-${version}.post0
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index e5fe491939..e203dc1c7a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -1,29 +1,60 @@
-{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
-, toml
-
-# Test dependencies
-, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
+{ buildPythonPackage
+, coveralls
+, fetchFromGitHub
+, flake8
+, graphviz
+, lib
+, mock
+, pytestCheckHook
+, requests
+, sphinx
, sphinx_rtd_theme
+, toml
+, xmltodict
}:
buildPythonPackage rec {
pname = "soco";
version = "0.20";
- src = fetchPypi {
- inherit pname version;
- sha256 = "929d4fae20b32efc08bb9985798c592aa7268162885541513eddbff0a757418f";
+ # 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 = "0p87aw7wxgdjz0m0nqqcfvbn24hlbq1hh1zxdq2c0k2jcbmaj8zc";
};
- propagatedBuildInputs = [ xmltodict requests toml ];
+ # 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 "/pylint/d" ./requirements-dev.txt
+ sed -i "/pytest-cov/d" ./requirements-dev.txt
+ '';
+
+ propagatedBuildInputs = [
+ requests
+ toml
+ xmltodict
+ ];
checkInputs = [
- pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
+ pytestCheckHook
+ coveralls
+ flake8
+ graphviz
+ mock
+ sphinx
sphinx_rtd_theme
];
- meta = {
+ meta = with lib; {
homepage = "http://python-soco.com/";
description = "A CLI and library to control Sonos speakers";
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = with maintainers; [ lovesegfault ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index 9b4f7cc927..e13127abeb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
@@ -22,27 +22,27 @@
buildPythonPackage rec {
pname = "spacy";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb";
+ sha256 = "315278ab60094643baecd866017c7d4cbd966efd2d517ad0e6c888edf7fa5aef";
};
propagatedBuildInputs = [
- blis
- catalogue
- cymem
- jsonschema
- murmurhash
- numpy
- plac
- preshed
- requests
- setuptools
- srsly
- thinc
- wasabi
+ blis
+ catalogue
+ cymem
+ jsonschema
+ murmurhash
+ numpy
+ plac
+ preshed
+ requests
+ setuptools
+ srsly
+ thinc
+ wasabi
] ++ lib.optional (pythonOlder "3.4") pathlib;
checkInputs = [
@@ -56,16 +56,16 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.cfg \
- --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \
+ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \
--replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
--replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
--replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \
- --replace "thinc==7.4.1" "thinc>=7.4.1,<8"
+ --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8"
'';
pythonImportsCheck = [ "spacy" ];
- passthru.tests = callPackage ./annotation-test {};
+ passthru.tests.annotation = callPackage ./annotation-test { };
meta = with lib; {
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix
new file mode 100644
index 0000000000..4342eb6e20
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "sqlite-fts4";
+ version = "1.0.1";
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "simonw";
+ repo = pname;
+ rev = version;
+ sha256 = "15r1mijk306fpm61viry5wjhqyxlbqqdk4nfcd901qarx7vqypgy";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Custom Python functions for working with SQLite FTS4";
+ homepage = "https://github.com/simonw/sqlite-fts4";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ meatcar ];
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
index 6e17fc4f38..79c5cf25e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy3k
+, pythonOlder
, click
, click-default-group
+, sqlite-fts4
, tabulate
, pytestCheckHook
, pytestrunner
, black
+, hypothesis
+, sqlite
}:
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.0";
- disabled = !isPy3k;
+ version = "3.1";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "a158265fde85a6757b7f09b568b1f7d6eaf75eaae208be27336f09dc048e5bcf";
+ sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f";
};
propagatedBuildInputs = [
click
click-default-group
+ sqlite-fts4
tabulate
];
@@ -30,13 +34,19 @@ buildPythonPackage rec {
pytestCheckHook
pytestrunner
black
+ hypothesis
+ ];
+
+ # disabled until upstream updates tests
+ disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [
+ "test_optimize"
];
meta = with lib; {
description = "Python CLI utility and library for manipulating SQLite databases";
homepage = "https://github.com/simonw/sqlite-utils";
license = licenses.asl20;
- maintainers = [ maintainers.meatcar ];
+ maintainers = with maintainers; [ meatcar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
index 635111b95d..3ee59c391f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
@@ -1,7 +1,8 @@
-{ stdenv
+{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, installShellFiles
+, pytestCheckHook
, isPy3k
}:
@@ -9,20 +10,22 @@ buildPythonPackage rec {
pname = "sqlparse";
version = "0.4.1";
+ disabled = !isPy3k;
+
src = fetchPypi {
inherit pname version;
sha256 = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8";
};
- checkInputs = [ pytest ];
- checkPhase = ''
- py.test
+ nativeBuildInputs = [ installShellFiles ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ postInstall = ''
+ installManPage docs/sqlformat.1
'';
- # Package supports 3.x, but tests are clearly 2.x only.
- doCheck = !isPy3k;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Non-validating SQL parser for Python";
longDescription = ''
Provides support for parsing, splitting and formatting SQL statements.
@@ -30,5 +33,4 @@ buildPythonPackage rec {
homepage = "https://github.com/andialbrecht/sqlparse";
license = licenses.bsd3;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
index 25e20a4411..77ddb125a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
@@ -20,7 +20,6 @@
, sympy
, vcrpy
, pytest
-, pytestpep8
, pytest-flakes
, pytestcov
, pytestrunner
@@ -42,7 +41,7 @@ buildPythonPackage rec {
] ++ lib.optional (!isPy3k) futures;
checkInputs = [
- sympy vcrpy pytest pytestpep8 pytest-flakes
+ sympy vcrpy pytest pytest-flakes
pytestcov pytestrunner
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix
new file mode 100644
index 0000000000..1f5438140e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, wrapio
+}:
+
+buildPythonPackage rec {
+ pname = "survey";
+ version = "3.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M=";
+ };
+
+ propagatedBuildInputs = [
+ wrapio
+ ];
+
+ doCheck = false;
+ pythonImportsCheck = [ "survey" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/Exahilosys/survey";
+ description = "A simple library for creating beautiful interactive prompts";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sfrijters ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix
index 4772c13d9c..dbf0f26c3a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, async_generator, rsa, pyaes, pythonOlder }:
+{ lib, buildPythonPackage, fetchPypi, openssl, async_generator, rsa, pyaes, pythonOlder }:
buildPythonPackage rec {
pname = "telethon";
@@ -10,6 +10,11 @@ buildPythonPackage rec {
sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m";
};
+ patchPhase = ''
+ substituteInPlace telethon/crypto/libssl.py --replace \
+ "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'"
+ '';
+
propagatedBuildInputs = [
rsa
pyaes
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
index bcf6936917..68c983c059 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
@@ -110,7 +110,7 @@ let
# Fixes for NixOS jsoncpp
../system-jsoncpp.patch
- ./lift-gast-restriction.patch
+ ./relax-dependencies.patch
# see https://github.com/tensorflow/tensorflow/issues/40688
(fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
similarity index 53%
rename from third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch
rename to third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
index 7b1b3b135b..fc11a04cbd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
@@ -1,11 +1,16 @@
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 992f2eae22..d9386f9b13 100644
+index 594e74f40c0..bfbf010144f 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
-@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [
+@@ -54,9 +54,9 @@ _VERSION = '2.3.1'
+ REQUIRED_PACKAGES = [
+ 'absl-py >= 0.7.0',
'astunparse == 1.6.3',
- 'gast == 0.3.3',
+ 'gast >= 0.3.3',
'google_pasta >= 0.1.8',
- 'h5py >= 2.10.0, < 2.11.0',
+- 'h5py >= 2.10.0, < 2.11.0',
++ 'h5py >= 2.10.0',
'keras_preprocessing >= 1.1.1, < 1.2',
+ # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage
+ # https://github.com/numpy/numpy/pull/15355
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index 6e0fbcce37..cfc9264246 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
@@ -23,29 +23,31 @@
buildPythonPackage rec {
pname = "thinc";
- version = "7.4.3";
+ version = "7.4.5";
src = fetchPypi {
inherit pname version;
- sha256 = "c98491b083165f48bda95f5533f7d9dbd3980d32ad621bfe579ff08ef625a4d3";
+ sha256 = "5743fde41706252ec6ce4737c68d3505f7e1cc3d4431174a17149838d594f8cb";
};
- buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- Accelerate CoreFoundation CoreGraphics CoreVideo
+ buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ Accelerate
+ CoreFoundation
+ CoreGraphics
+ CoreVideo
]);
propagatedBuildInputs = [
- blis
- catalogue
- cymem
- cython
- murmurhash
- numpy
- plac
- preshed
- srsly
- tqdm
- wasabi
+ blis
+ catalogue
+ cymem
+ murmurhash
+ numpy
+ plac
+ preshed
+ srsly
+ tqdm
+ wasabi
] ++ lib.optional (pythonOlder "3.4") pathlib;
@@ -60,7 +62,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \
+ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \
--replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
--replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
--replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0"
@@ -77,5 +79,5 @@ buildPythonPackage rec {
homepage = "https://github.com/explosion/thinc";
license = licenses.mit;
maintainers = with maintainers; [ aborsu danieldk sdll ];
- };
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
index 02359ce67a..b91289e506 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, setuptools_scm
-, requests, requests-file, idna, pytest
+, requests, requests-file, idna, filelock, pytest
, responses
}:
@@ -12,14 +12,17 @@ buildPythonPackage rec {
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
};
- propagatedBuildInputs = [ requests requests-file idna ];
+ propagatedBuildInputs = [ requests requests-file idna filelock ];
checkInputs = [ pytest responses ];
nativeBuildInputs = [ setuptools_scm ];
+ # No tests included
+ doCheck = false;
+ pythonImportsCheck = [ "tldextract" ];
+
meta = {
homepage = "https://github.com/john-kurkowski/tldextract";
- description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List.";
+ description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List";
license = lib.licenses.bsd3;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
index 244444a276..7c8bb17b8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "tlslite-ng";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2";
+ sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00";
};
buildInputs = [ ecdsa ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix
index eddd6ac4fd..f1767862ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "toposort";
- version = "1.5";
+ version = "1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "dba5ae845296e3bf37b042c640870ffebcdeb8cd4df45adaa01d8c5476c557dd";
+ sha256 = "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
index 5df20826dc..ba40723e7d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "tqdm";
- version = "4.54.0";
+ version = "4.54.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5c0d04e06ccc0da1bd3fa5ae4550effcce42fcad947b4a6cafa77bdc9b09ff22";
+ sha256 = "1x9chlh3msikddmq8p8p5s5kgqqs48bclxgzz3vb9ygcwjimidiq";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/4.nix
new file mode 100644
index 0000000000..bffd7c790b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/4.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, pytest
+, mock
+, ipython_genutils
+, decorator
+, enum34
+, pythonOlder
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "traitlets";
+ version = "4.3.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7";
+ };
+
+ checkInputs = [ glibcLocales pytest mock ];
+ propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+ checkPhase = ''
+ LC_ALL="en_US.UTF-8" py.test
+ '';
+
+ meta = {
+ description = "Traitlets Python config system";
+ homepage = "http://ipython.org/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
index 5d304c61f5..3bc05897af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
@@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
-, isPy27
, fetchPypi
, glibcLocales
, pytest
@@ -15,7 +14,7 @@
buildPythonPackage rec {
pname = "traitlets";
version = "5.0.5";
- disabled = isPy27;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -23,7 +22,7 @@ buildPythonPackage rec {
};
checkInputs = [ glibcLocales pytest mock ];
- propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
+ propagatedBuildInputs = [ ipython_genutils decorator six ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index 39fd7a11d0..bd9040668c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
@@ -1,12 +1,13 @@
{ buildPythonPackage
, stdenv
, fetchFromGitHub
-, boto3
+, isPy39
, cookiecutter
, filelock
, regex
, requests
, numpy
+, pandas
, parameterized
, protobuf
, sacremoses
@@ -18,13 +19,14 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.0.0";
+ version = "4.1.1";
+ disabled = isPy39;
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "17djq32pq8d6vqip7i9pda0ldigmzckbbcd278llmpxdriqd4llg";
+ sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k";
};
propagatedBuildInputs = [
@@ -40,6 +42,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ pandas
parameterized
pytestCheckHook
timeout-decorator
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
index c6a7493695..251d6c3d94 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.8.17";
+ version = "3.8.19";
src = fetchPypi {
inherit pname version;
- sha256 = "10834032ff314ea9c8a6a9f4f1f846422fe8825657dfd2d9db3ae2fa5a838fdb";
+ sha256 = "e2ec4fc75bddf46fd494a9c95adc0bf0fe6f667cae242ead99955ad659d6e375";
};
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
index d433b1a6b4..cb46666f21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "ueberzug";
- version = "18.1.7";
+ version = "18.1.8";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "ef0d6ac5815446ede654a38da550d2c44abd0fc05c901b2232935a65bcbca875";
+ sha256 = "3718db8f824ef5f6a69dc25b3f08e0a45388dd46843c61721476bad2b64345ee";
};
buildInputs = [ libX11 libXext ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
index 770407736a..8118c0f949 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "ufonormalizer";
- version = "0.5.0";
+ version = "0.5.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5";
+ sha256 = "03k9dndnv3p3ysfq5wq8bnaijvqip61fh79d5gz2zk284vc47mgj";
extension = "zip";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
deleted file mode 100644
index 3c268ed7ed..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, numpy
-, awkward
-}:
-
-buildPythonPackage rec {
- version = "0.9.1";
- pname = "uproot-methods";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "accb4392c59a1485ce3ee6d78a6fd163731ade8b9b5208e7bde8fa1767aef097";
- };
-
- propagatedBuildInputs = [ numpy awkward ];
-
- # No tests on PyPi
- doCheck = false;
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/scikit-hep/uproot-methods";
- description = "Pythonic mix-ins for ROOT classes";
- license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix
deleted file mode 100644
index eadd6c36de..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy27
-, awkward
-, backports_lzma
-, cachetools
-, lz4
-, pandas
-, pytestrunner
-, pytest
-, pkgconfig
-, mock
-, numpy
-, requests
-, uproot-methods
-, xxhash
-}:
-
-buildPythonPackage rec {
- pname = "uproot";
- version = "3.13.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "099b0b274dc000faf724df835579c76306e60200a5ba7b600a0c4b76dabbf344";
- };
-
- nativeBuildInputs = [ pytestrunner ];
-
- checkInputs = [
- lz4
- mock
- pandas
- pkgconfig
- pytest
- requests
- xxhash
- ] ++ lib.optional isPy27 backports_lzma;
-
- propagatedBuildInputs = [
- numpy
- cachetools
- uproot-methods
- awkward
- ];
-
- # skip tests which do network calls
- # test_compression.py is missing zstandard package
- checkPhase = ''
- pytest tests -k 'not hist_in_tree \
- and not branch_auto_interpretation' \
- --ignore=tests/test_compression.py
- '';
-
- meta = with lib; {
- homepage = "https://github.com/scikit-hep/uproot";
- description = "ROOT I/O in pure Python and Numpy";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ktf ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix
new file mode 100644
index 0000000000..3a9457a574
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, awkward0
+}:
+
+buildPythonPackage rec {
+ version = "0.10.0";
+ pname = "uproot3-methods";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26";
+ };
+
+ nativeBuildInputs = [ awkward0 ];
+
+ propagatedBuildInputs = [ numpy awkward0 ];
+
+ # No tests on PyPi
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/scikit-hep/uproot3-methods";
+ description = "Pythonic mix-ins for ROOT classes";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ costrouc SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix
new file mode 100644
index 0000000000..0d0c2365b6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27
+, awkward0, backports_lzma, cachetools, lz4, pandas
+, pytestCheckHook, pytestrunner, pkgconfig, mock
+, numpy, requests, uproot3-methods, xxhash, zstandard
+}:
+
+buildPythonPackage rec {
+ pname = "uproot3";
+ version = "3.14.1";
+
+ src = fetchFromGitHub {
+ owner = "scikit-hep";
+ repo = "uproot3";
+ rev = version;
+ sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8";
+ };
+
+ nativeBuildInputs = [ pytestrunner ];
+
+ propagatedBuildInputs = [
+ awkward0
+ cachetools
+ lz4
+ numpy
+ uproot3-methods
+ xxhash
+ zstandard
+ ] ++ lib.optional isPy27 backports_lzma;
+
+ checkInputs = [
+ mock
+ pandas
+ pkgconfig
+ pytestCheckHook
+ requests
+ ] ++ lib.optional isPy27 backports_lzma;
+
+ meta = with lib; {
+ homepage = "https://github.com/scikit-hep/uproot3";
+ description = "ROOT I/O in pure Python and Numpy";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ ktf SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/vncdo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
similarity index 63%
rename from third_party/nixpkgs/pkgs/tools/admin/vncdo/default.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
index 5ca633a944..ffc01906f4 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/vncdo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix
@@ -1,18 +1,23 @@
{ stdenv, fetchFromGitHub
-, python2Packages
+, buildPythonPackage, isPy27
+, pillow
+, twisted
+, pexpect
+, nose
+, ptyprocess
}:
-python2Packages.buildPythonPackage {
+buildPythonPackage rec {
pname = "vncdo";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "sibson";
repo = "vncdotool";
- rev = "5c03a82dcb5a3bd9e8f741f8a8d0c1ce082f2834";
- sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
+ rev = "v${version}";
+ sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn";
};
- propagatedBuildInputs = with python2Packages; [
+ propagatedBuildInputs = [
pillow
twisted
pexpect
@@ -20,7 +25,7 @@ python2Packages.buildPythonPackage {
ptyprocess
];
- doCheck = false;
+ doCheck = !isPy27;
meta = with stdenv.lib; {
homepage = "https://github.com/sibson/vncdotool";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
index a4146d4d3b..fd634e5179 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
@@ -21,9 +21,6 @@ buildPythonPackage rec {
"test_get_machine_id"
];
- # Python 2 pytest fails with INTERNALERROR due to a deprecation warning.
- doCheck = isPy3k;
-
meta = with stdenv.lib; {
homepage = "https://palletsprojects.com/p/werkzeug/";
description = "A WSGI utility library for Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix
new file mode 100644
index 0000000000..4289c20207
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wrapio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "wrapio";
+ version = "0.3.8";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo";
+ };
+
+ doCheck = false;
+ pythonImportsCheck = [ "wrapio" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/Exahilosys/wrapio";
+ description = "Handling event-based streams";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sfrijters ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsnsimpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsnsimpy/default.nix
new file mode 100644
index 0000000000..febb66605c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wsnsimpy/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, simpy, tkinter
+# GUI-based visualization of the simulation is optional
+, enableVisualization ? true }:
+
+buildPythonPackage rec {
+ pname = "wsnsimpy";
+ version = "0.2.5";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b7fdqwc2v9alfwf2fr0aqr8rf2pb5lpm4anpilmvrh2lhjar4i2";
+ };
+
+ propagatedBuildInputs = [ setuptools simpy ]
+ ++ lib.optional enableVisualization tkinter;
+
+ # No test cases are included, thus unittest tries to run the examples, which
+ # fail because no DISPLAYs are available.
+ doCheck = false;
+
+ pythonImportsCheck = [ "wsnsimpy" ]
+ ++ lib.optional enableVisualization "wsnsimpy.wsnsimpy_tk";
+
+ meta = with lib; {
+ description = "SimPy-based WSN Simulator";
+ homepage = "https://pypi.org/project/wsnsimpy/";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ dmrauh ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
index d21142f5dc..8cb5b5f077 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "xkcdpass";
- version = "1.17.3";
+ version = "1.17.6";
src = fetchPypi {
inherit pname version;
- sha256 = "95cf3fd41130606ba64ec7edb9efac7c5d61efe21abab51a2c21ccbbebc48bb6";
+ sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy";
};
# No tests included
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
index b3e651fd2b..9f54dba8b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
@@ -1,4 +1,5 @@
{ lib
+, nixosTests
, buildPythonPackage
, fetchPypi
, pkgs
@@ -46,6 +47,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "yq" ];
+ passthru.tests = { inherit (nixosTests) yq; };
+
meta = with lib; {
description = "Command-line YAML processor - jq wrapper for YAML documents";
homepage = "https://github.com/kislyuk/yq";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
index 7a942a2137..9b8e65e23d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "zigpy-znp";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "zha-ng";
repo = "zigpy-znp";
rev = "v${version}";
- sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4=";
+ sha256 = "18dav2n5fqdigf8dl7gcqa9z8l6p2ig6l5q78gqg2wj7wjpncwyj";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix
index d57416ac18..95626c802b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "zstd";
- version = "1.4.5.1";
+ version = "1.4.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6";
+ sha256 = "b62b21eb850abd6b8c0046bfc1c5c773c873eeb94f1904ef1ff304e98b62b80e";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch b/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
index bcb3ac1d14..1647074087 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
@@ -1,22 +1,24 @@
-From 6ab08bc1c889e4fb9a39432b1a654eaa19ee65eb Mon Sep 17 00:00:00 2001
-From: Austin Seipp
-Date: Fri, 2 May 2014 12:28:23 -0500
-Subject: [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+From 40239d92957f1969652cdd41d6d2749c41ac4338 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
+Date: Fri, 31 Jul 2020 09:22:03 +0100
+Subject: [PATCH] [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Signed-off-by: Austin Seipp
+Signed-off-by: Jörg Thalheim
---
- tools/scan-build/ccc-analyzer | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ tools/scan-build/libexec/ccc-analyzer | 8 ++++++++
+ 1 file changed, 8 insertions(+)
-diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer
-index b463ec0..9d39dd0 100755
---- a/tools/scan-build/ccc-analyzer
-+++ b/tools/scan-build/ccc-analyzer
-@@ -207,6 +207,15 @@ sub Analyze {
- push @Args, "-Xclang", "-analyzer-viz-egraph-ubigraph";
+diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer
+index 800f38b5..0fb50fb3 100755
+--- a/tools/scan-build/libexec/ccc-analyzer
++++ b/tools/scan-build/libexec/ccc-analyzer
+@@ -246,6 +246,14 @@ sub Analyze {
+ push @Args, "-target", $AnalyzerTarget;
}
-+
+ # Add Nix flags to analysis
+ if (defined $ENV{'NIX_CFLAGS_COMPILE'}) {
+ my @nixArgs = split(/\s+/, $ENV{'NIX_CFLAGS_COMPILE'});
@@ -25,9 +27,9 @@ index b463ec0..9d39dd0 100755
+ }
+ }
+
- my $AnalysisArgs = GetCCArgs("--analyze", \@Args);
+ my $AnalysisArgs = GetCCArgs($HtmlDir, "--analyze", \@Args);
@CmdArgs = @$AnalysisArgs;
}
--
-1.8.3.2
+2.27.0
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 6b0c1b401f..43b32052bf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
+{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
stdenv.mkDerivation rec {
pname = "clang-analyzer";
- version = "3.4";
-
- src = fetchurl {
- url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
- sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92";
- };
+ inherit (llvmPackages.clang-unwrapped) src version;
patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
- buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
+ buildInputs = [ clang llvmPackages.clang perl python3 ];
+ nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
installPhase = ''
- mkdir -p $out/bin $out/libexec
- cp -R tools/scan-view $out/libexec
- cp -R tools/scan-build $out/libexec
+ mkdir -p $out/share/scan-view $out/bin
+ cp -R tools/scan-view/share/* $out/share/scan-view
+ cp -R tools/scan-view/bin/* $out/bin/scan-view
+ cp -R tools/scan-build/* $out
- makeWrapper $out/libexec/scan-view/scan-view $out/bin/scan-view
- makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build \
+ rm $out/bin/*.bat $out/libexec/*.bat $out/CMakeLists.txt
+
+ wrapProgram $out/bin/scan-build \
--add-flags "--use-cc=${clang}/bin/clang" \
--add-flags "--use-c++=${clang}/bin/clang++" \
--add-flags "--use-analyzer='${llvmPackages.clang}/bin/clang'"
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index 23f35c2c78..2d4f58aef4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.138.0";
+ version = "0.139.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "08f7rihk663bwfxccl6fh6p5qn31025lhr5fmcxi3hl3jirwzb6n";
+ sha256 = "0ix98dq7g13jdfxgq0d8v2cvfnl2l2gz04j8h05sqzahbpxqv97w";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index 32c1fca634..1011bcb5cc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "0gdv2l10v19mjskv0f0aphxbzvdx6py0w6n9yg4wn6g7j7c61szd";
+ sha256 = "0wbxlh2lwgdhhw902lqy6p2vh8adfq4yaa507js8an3byy26ls3d";
};
- vendorSha256 = "0s5ingyl0m939k1qxc1qiyhiabi3ml0qz33s3rbd4hmcg907yjga";
+ vendorSha256 = "0yk9xsb0s4kymfb3p14irks6b30b53r0mz7irgcmx9jxz8vyffqg";
doCheck = false;
@@ -20,7 +20,7 @@ buildGoModule rec {
meta = with lib; {
description = "Terraform linter focused on possible errors, best practices, and so on";
homepage = "https://github.com/terraform-linters/tflint";
- changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}";
+ changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = [ maintainers.marsam ];
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 43a70c6a76..66560e768d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "bazel-buildtools";
- version = "3.3.0";
+ version = "3.5.0";
goPackagePath = "github.com/bazelbuild/buildtools";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "bazelbuild";
repo = "buildtools";
rev = version;
- sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k";
+ sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85";
};
goDeps = ./deps.nix;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
index 4c6d47ecb1..c1b3a7aa15 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "bloop";
- version = "1.4.5";
+ version = "1.4.6";
bloop-coursier-channel = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
- sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy";
+ sha256 = "1fx80yrf03llhxcd8az5vzralz01wdfk7000q8l04rj1ax3daqia";
};
bloop-bash = fetchurl {
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9"
- else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417"
+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hg02a3ildgqv8864zg08hvk4y0kmsxsg7ncbsl933rclhk2lybd"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "1i9kh4h5w3gr4w6rf5m7xpfqwps91mfddl1zk25v7f6vsraayam0"
else throw "unsupported platform";
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index ef8a532448..385cb990c4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch
+ # Fix namelink failures, can be removed in 3.19.2+
+ (fetchpatch {
+ url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch";
+ sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc";
+ })
+
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index 713f499ce2..f1445970f6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,17 +3,17 @@
stdenv.mkDerivation rec {
pname = "leiningen";
- version = "2.9.1";
+ version = "2.9.5";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
- sha256 = "1h0gpzpr7xk6hvmrrq41bcp2k9aai348baf8ad9bxvci01n4zb12";
+ sha256 = "12kv3286a2vkm3qpm2msiks87mkspxddgl7bwiacdias9dfda09n";
};
jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip";
- sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a";
+ sha256 = "1shyvg1471sc3bv4h3ax51626xw8a8w05f43bny6gmp8pyc0qjfz";
};
JARNAME = "${pname}-${version}-standalone.jar";
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
description = "Project automation for Clojure";
license = stdenv.lib.licenses.epl10;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ maintainers = with stdenv.lib.maintainers; [ thiagokokada ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 8f01b9aca3..1dd931981d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "rocm-cmake";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 3b433ea5e7..cf85d894a3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
- rev = "be2f5d98f13884a18eaf5205458f985575dbe13a";
- version = "2020-11-23";
+ rev = "32cf43b58f91bd3b7063baa9f2d75d4af45d9c4b";
+ version = "2020-12-17";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7";
+ sha256 = "046xr3x73p63xnfakq981gvl299l5fahxgnn0bacvp7pa8g99dv2";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index ebcae9e63e..39832109d9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sbt";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchurl {
url =
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
- sha256 = "0ibdq8g2bcanc7gcjslia89khlccn11inqmkx3y7pbqrc63y1yif";
+ sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 223b814708..82ac155657 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.26.0";
- goPackagePath = "github.com/buildkite/agent";
-
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
index 307dda4f99..7a7f0d023d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,9 +2,9 @@
buildGoModule rec {
name = "drone.io-${version}";
- version = "1.9.0";
+ version = "1.10.0";
- vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
+ vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0=";
doCheck = false;
@@ -12,7 +12,7 @@ buildGoModule rec {
owner = "drone";
repo = "drone";
rev = "v${version}";
- sha256 = "1lsyd245fr1f74rpccvvw41h5g75b79afrb8g589bj13ggjav0xy";
+ sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index db2d228ce4..3d127591bd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "13.6.0";
+ version = "13.7.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw";
+ sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc";
+ sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh";
+ sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
index 0d42bcff7c..a0f6903392 100644
--- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
- version = "2.0.7";
+ version = "2.0.8";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
- sha256 = "1m6b12cqbwsk4xf2r79y51154j6ws6f0kiw1yj57gylw7pjkgfnk";
+ sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
index bdb2f8cbd7..6eb24a812a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b";
+ sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0";
};
buildInputs = [ jre makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
index 3d24ac34b3..163926f0e5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchpatch }:
python3Packages.buildPythonApplication rec {
pname = "litecli";
@@ -13,6 +13,14 @@ python3Packages.buildPythonApplication rec {
sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
};
+ patches = [
+ # Fix compatibility with sqlparse >= 0.4.0. Remove with the next release
+ (fetchpatch {
+ url = "https://github.com/dbcli/litecli/commit/37957e401d22f88800bbdec2c690e731f2cc13bd.patch";
+ sha256 = "1x82s2h1rzflyiahyd8pfya30rzs6yx6ij4a4s16f8iix5x35zv9";
+ })
+ ];
+
propagatedBuildInputs = with python3Packages; [
cli-helpers
click
diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
index 892ee6dd32..e81a1273af 100644
--- a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
- version = "1.5.0";
+ version = "1.5.1";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
- sha256 = "0m7fryclrj0qzqzcjn0xc9vl43srijyfahfkqdbm59xgpws67anp";
+ sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix
index 53950d08f7..7ddff92402 100644
--- a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix
@@ -30,24 +30,30 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [
beautifulsoup4
nginx
- pytest
+ pytestCheckHook
pytest-flake8
- pytestpep8
webtest
] ++ stdenv.lib.optionals isPy27 [ mock ];
# root_passwd_hash tries to write to store
# TestMirrorIndexThings tries to write to /var through ngnix
# nginx tests try to write to /var
- checkPhase = ''
- PATH=$PATH:$out/bin HOME=$TMPDIR pytest \
- ./test_devpi_server --slow -rfsxX \
- --ignore=test_devpi_server/test_nginx_replica.py \
- --ignore=test_devpi_server/test_streaming_nginx.py \
- --ignore=test_devpi_server/test_streaming_replica_nginx.py \
- -k 'not root_passwd_hash_option \
- and not TestMirrorIndexThings'
+ preCheck = ''
+ export PATH=$PATH:$out/bin
+ export HOME=$TMPDIR
'';
+ pytestFlagsArray = [
+ "./test_devpi_server"
+ "--slow"
+ "-rfsxX"
+ "--ignore=test_devpi_server/test_nginx_replica.py"
+ "--ignore=test_devpi_server/test_streaming_nginx.py"
+ "--ignore=test_devpi_server/test_streaming_replica_nginx.py"
+ ];
+ disabledTests = [
+ "root_passwd_hash_option"
+ "TestMirrorIndexThings"
+ ];
meta = with stdenv.lib;{
homepage = "http://doc.devpi.net";
diff --git a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
index 0392c4c95f..3d420bf190 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "dtschema";
- version = "2020.11";
+ version = "2020.12";
src = fetchPypi {
inherit pname version;
- sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734";
+ sha256 = "01de2598075909f2afb2d45277d0358645066f5bbb1770fca5f1d6f399846924";
};
nativeBuildInputs = [ setuptools_scm git ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
index 48250d7ceb..07953ea439 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
@@ -75,30 +75,30 @@ rec {
headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5";
};
- electron_9 = mkElectron "9.3.5" {
- x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa";
- x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78";
- i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61";
- armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f";
- aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30";
- headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b";
+ electron_9 = mkElectron "9.4.0" {
+ x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6";
+ x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd";
+ i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a";
+ armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21";
+ aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd";
+ headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72";
};
- electron_10 = mkElectron "10.1.6" {
- x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf";
- x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d";
- i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e";
- armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
- aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
- headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z";
+ electron_10 = mkElectron "10.2.0" {
+ x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a";
+ x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c";
+ i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d";
+ armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4";
+ aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0";
+ headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr";
};
- electron_11 = mkElectron "11.0.3" {
- x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff";
- x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027";
- i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729";
- armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e";
- aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0";
- headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0";
+ electron_11 = mkElectron "11.1.0" {
+ x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538";
+ x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0";
+ i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6";
+ armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd";
+ aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777";
+ headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix b/third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix
index 969d7950cb..05784c47ef 100644
--- a/third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/github-commenter/default.nix
@@ -1,25 +1,23 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoModule }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "github-commenter";
- version = "0.5.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = version;
- sha256 = "0y7yw7x8gqfbkqdfrwd9lffx3rrp62nz1aa86liy2dja97dacpij";
+ sha256 = "HgiCgyig+49g275G6zZ0kGTxt1TSfFK8kt+SOf4ei74=";
};
- goPackagePath = "github.com/cloudposse/${pname}";
-
- goDeps = ./deps.nix;
+ vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0=";
meta = with lib; {
description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
license = licenses.asl20;
homepage = "https://github.com/cloudposse/github-commenter";
maintainers = [ maintainers.mmahut ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/github-commenter/deps.nix b/third_party/nixpkgs/pkgs/development/tools/github-commenter/deps.nix
deleted file mode 100644
index 4b6be6c6d6..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/github-commenter/deps.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
- {
- goPackagePath = "github.com/Masterminds/goutils";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/goutils";
- rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0";
- sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/semver";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/semver";
- rev = "0fd41f6ff0825cf7efae00e706120bdd48914d93";
- sha256 = "0jf1c03c9cibfci7qaxbk8h758gmc9i0115jdw57v5c45hklw9ah";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/sprig";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/sprig";
- rev = "7525b3376b8792ab24d07381324e4e2463e3356b";
- sha256 = "05ia4r8b86s7pk8r3jmjq5x7pgsmp6wvcm42z8vl6vdhdr28bfrg";
- };
- }
- {
- goPackagePath = "github.com/google/go-github";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-github";
- rev = "24f172eae1a0c53c780f259d8492979900e9af2e";
- sha256 = "1bxklfrl1wx2691qindiikkbyixd9p8pfqjn0xqi4riy5hcgz96s";
- };
- }
- {
- goPackagePath = "github.com/google/go-querystring";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-querystring";
- rev = "c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80";
- sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l";
- };
- }
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
- sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h";
- };
- }
- {
- goPackagePath = "github.com/huandu/xstrings";
- fetch = {
- type = "git";
- url = "https://github.com/huandu/xstrings";
- rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d";
- sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx";
- };
- }
- {
- goPackagePath = "github.com/imdario/mergo";
- fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d";
- sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
- sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
- sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "ca1201d0de80cfde86cb01aea620983605dfe99b";
- sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
index c566ea528b..3d3c9db9a1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "go-tools";
- version = "2020.1.6";
+ version = "2020.2";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
- sha256 = "1r83gx7k4fiz3wlshhniz1i39xv492nni1nvfxjfqgnmkavb6r4x";
+ sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj";
};
- vendorSha256 = "1g04rzirjv90s1i542cqi2abhgh8b74qwhp1hp1cszgb7k8nndmr";
+ vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
index a19e057591..e33d731dae 100644
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -2,39 +2,39 @@
, bytestring, containers, data-default, deepseq, directory, extra
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
-, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger
-, hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative
-, optparse-simple, ormolu, process, regex-tdfa, retrie
-, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty
-, tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
-, tasty-rerun, temporary, text, time, transformers
-, unordered-containers, yaml
+, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api
+, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec
+, hspec-core, lens, lsp-test, mtl, optparse-applicative
+, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
+, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
+, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
+, temporary, text, time, transformers, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-language-server";
- version = "0.6.0.0";
+ version = "0.7.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
- rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
+ sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
+ rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers data-default directory extra filepath ghc ghcide
- gitrev haskell-lsp hie-bios hls-plugin-api hslogger
- optparse-applicative optparse-simple process text
- unordered-containers
+ gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
+ optparse-simple process shake text unordered-containers
];
executableHaskellDepends = [
aeson base binary brittany bytestring containers deepseq directory
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
- gitrev hashable haskell-lsp hie-bios hls-hlint-plugin
- hls-plugin-api hls-tactics-plugin hslogger lens mtl
- optparse-applicative optparse-simple ormolu process regex-tdfa
- retrie safe-exceptions shake stylish-haskell temporary text time
- transformers unordered-containers
+ gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin
+ hls-hlint-plugin hls-plugin-api hls-retrie-plugin
+ hls-tactics-plugin hslogger lens mtl optparse-applicative
+ optparse-simple ormolu process regex-tdfa safe-exceptions shake
+ stylish-haskell temporary text time transformers
+ unordered-containers
];
testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix
deleted file mode 100644
index 0519cf42dd..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, aeson, base, butcher, bytestring, cmdargs
-, containers, czipwith, data-tree-print, deepseq, directory, extra
-, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths
-, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe
-, semigroups, stdenv, strict, syb, text, transformers, uniplate
-, unsafe, yaml
-}:
-mkDerivation {
- pname = "brittany";
- version = "0.12.1.1";
- src = fetchgit {
- url = "https://github.com/bubba/brittany";
- sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl";
- rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c";
- fetchSubmodules = true;
- };
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base butcher bytestring cmdargs containers czipwith
- data-tree-print deepseq directory extra filepath ghc ghc-boot-th
- ghc-exactprint ghc-paths monad-memo mtl multistate pretty random
- safe semigroups strict syb text transformers uniplate unsafe yaml
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- aeson base butcher bytestring cmdargs containers czipwith
- data-tree-print deepseq directory extra filepath ghc ghc-boot-th
- ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec
- pretty safe semigroups strict syb text transformers uniplate unsafe
- yaml
- ];
- homepage = "https://github.com/lspitzner/brittany/";
- description = "Haskell source code formatter";
- license = stdenv.lib.licenses.agpl3;
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
new file mode 100644
index 0000000000..7c3b22cf1d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
+, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text
+, unordered-containers
+}:
+mkDerivation {
+ pname = "hls-explicit-imports-plugin";
+ version = "0.1.0.0";
+ src = fetchgit {
+ url = "https://github.com/haskell/haskell-language-server.git";
+ sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
+ rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";
+ libraryHaskellDepends = [
+ aeson base containers deepseq ghc ghcide haskell-lsp-types
+ hls-plugin-api shake text unordered-containers
+ ];
+ description = "Explicit imports plugin for Haskell Language Server";
+ license = stdenv.lib.licenses.asl20;
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
index 3a730dc716..8bfcf034bd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -10,8 +10,8 @@ mkDerivation {
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
- rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
+ sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
+ rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
new file mode 100644
index 0000000000..7a44903f98
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, aeson, base, containers, deepseq, directory, extra
+, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
+, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text
+, transformers, unordered-containers
+}:
+mkDerivation {
+ pname = "hls-retrie-plugin";
+ version = "0.1.0.0";
+ src = fetchgit {
+ url = "https://github.com/haskell/haskell-language-server.git";
+ sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
+ rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";
+ libraryHaskellDepends = [
+ aeson base containers deepseq directory extra ghc ghcide hashable
+ haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
+ shake text transformers unordered-containers
+ ];
+ description = "Retrie integration plugin for Haskell Language Server";
+ license = stdenv.lib.licenses.asl20;
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
index 3d168622fb..326e8ce0cd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -1,8 +1,8 @@
{ mkDerivation, aeson, base, checkers, containers, deepseq
, directory, extra, fetchgit, filepath, fingertree, generic-lens
, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
-, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl
-, QuickCheck, refinery, retrie, shake, stdenv, syb, text
+, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
+, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text
, transformers
}:
mkDerivation {
@@ -10,8 +10,8 @@ mkDerivation {
version = "0.5.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
- rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
+ sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
+ rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
@@ -25,8 +25,8 @@ mkDerivation {
base checkers containers ghc hie-bios hls-plugin-api hspec mtl
QuickCheck
];
- homepage = "https://github.com/isovector/hls-tactics-plugin#readme";
- description = "LSP server for GHC";
+ testToolDepends = [ hspec-discover ];
+ description = "Tactics plugin for Haskell Language Server";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
index fbd97b5488..f14a97221f 100755
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh
@@ -15,23 +15,6 @@ set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-# ===========================
-# HLS maintainer's Brittany fork
-# ===========================
-
-# brittany derivation created with cabal2nix.
-brittany_derivation_file="${script_dir}/hls-brittany.nix"
-
-# This is the current revision of the brittany fork in Nixpkgs.
-brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")"
-
-brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output)
-
-echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version."
-echo "Running cabal2nix and outputting to ${brittany_derivation_file}..."
-
-cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file"
-
# ===========================
# HLS
# ===========================
@@ -43,7 +26,18 @@ hls_derivation_file="${script_dir}/default.nix"
hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")"
# This is the latest release version of hls on GitHub.
-hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
+# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'),
+# sort for the latest one and select just that
+hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags |
+ jq --raw-output 'map(.name) | .[]' |
+ grep '^[0-9]' |
+ sort --version-sort |
+ tail -n1)
+
+# Use this value instead for the very latest revision
+# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
+
+hls_new_version=$hls_latest_release
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
@@ -51,5 +45,7 @@ echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
+cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix"
+cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix"
echo "Finished."
diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix
new file mode 100644
index 0000000000..7b50f473d8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix
@@ -0,0 +1,100 @@
+{ lib
+, buildGoModule
+, buildFHSUserEnv
+, dejavu_fonts
+, pkgconfig
+, fetchFromGitHub
+, stdenv
+, roboto
+, writeScript
+, xorg
+, libglvnd
+, addOpenGLRunpath
+, makeWrapper
+, gcc
+, go
+, flutter
+}:
+
+let
+ pname = "hover";
+ version = "0.43.0";
+
+ libs = with xorg; [
+ libX11.dev
+ libXcursor.dev
+ libXext.dev
+ libXi.dev
+ libXinerama.dev
+ libXrandr.dev
+ libXrender.dev
+ libXfixes.dev
+ libXxf86vm
+ libglvnd.dev
+ xorgproto
+ ];
+ hover = buildGoModule rec {
+ inherit pname version;
+
+ meta = with stdenv.lib; {
+ description = "A build tool to run Flutter applications on desktop";
+ homepage = "https://github.com/go-flutter-desktop/hover";
+ license = licenses.bsd3;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = [ maintainers.ericdallo maintainers.thiagokokada];
+ };
+
+ subPackages = [ "." ];
+
+ vendorSha256 = "1wr08phjm87dxim47i8449rmq5wfscvjyz65g3lxmv468x209pam";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "go-flutter-desktop";
+ repo = pname;
+ sha256 = "0iw6sxg86wfdbihl2hxzn43ppdzl1p7g5b9wl8ac3xa9ix8759ax";
+ };
+
+ nativeBuildInputs = [ addOpenGLRunpath makeWrapper ];
+
+ buildInputs = libs;
+
+ checkRun = false;
+
+ patches = [
+ ./fix-assets-path.patch
+ ];
+
+ postPatch = ''
+ sed -i 's|@assetsFolder@|'"''${out}/share/assets"'|g' internal/fileutils/assets.go
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share
+ cp -r assets $out/share/assets
+ chmod -R a+rx $out/share/assets
+
+ wrapProgram "$out/bin/hover" \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath libs}
+ '';
+
+ postFixup = ''
+ addOpenGLRunpath $out/bin/hover
+ '';
+ };
+
+in
+buildFHSUserEnv rec {
+ name = pname;
+ targetPkgs = pkgs: [
+ dejavu_fonts
+ flutter
+ gcc
+ go
+ hover
+ pkgconfig
+ roboto
+ ] ++ libs;
+
+ runScript = "hover";
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch b/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch
new file mode 100644
index 0000000000..27d49197e5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch
@@ -0,0 +1,78 @@
+diff --git a/internal/fileutils/assets.go b/internal/fileutils/assets.go
+index 83eacd9..0b80e51 100644
+--- a/internal/fileutils/assets.go
++++ b/internal/fileutils/assets.go
+@@ -1,28 +1,7 @@
+ //go:generate rice embed
+ package fileutils
+
+-import (
+- "os"
+- "sync"
+-
+- rice "github.com/GeertJohan/go.rice"
+- "github.com/go-flutter-desktop/hover/internal/log"
+-)
+-
+-var (
+- assetsBox *rice.Box
+- assetsBoxOnce sync.Once
+-)
+-
+ // AssetsBox hover's assets box
+-func AssetsBox() *rice.Box {
+- assetsBoxOnce.Do(func() {
+- var err error
+- assetsBox, err = rice.FindBox("../../assets")
+- if err != nil {
+- log.Errorf("Failed to find hover assets: %v", err)
+- os.Exit(1)
+- }
+- })
+- return assetsBox
++func AssetsBox() string {
++ return "@assetsFolder@"
+ }
+diff --git a/internal/fileutils/file.go b/internal/fileutils/file.go
+index cb75563..3822e80 100644
+--- a/internal/fileutils/file.go
++++ b/internal/fileutils/file.go
+@@ -11,8 +11,6 @@ import (
+ "strings"
+ "text/template"
+
+- rice "github.com/GeertJohan/go.rice"
+-
+ "github.com/go-flutter-desktop/hover/internal/log"
+ )
+
+@@ -215,24 +213,24 @@ func ExecuteTemplateFromFile(boxed, to string, templateData interface{}) {
+ }
+
+ // ExecuteTemplateFromAssetsBox create file from a template asset
+-func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox *rice.Box, templateData interface{}) {
+- templateString, err := assetsBox.String(boxed)
++func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox string, templateData interface{}) {
++ templateString, err := ioutil.ReadFile(boxed + "/" + boxed)
+ if err != nil {
+ log.Errorf("Failed to find template file: %v\n", err)
+ os.Exit(1)
+ }
+- executeTemplateFromString(templateString, to, templateData)
++ executeTemplateFromString(string(templateString), to, templateData)
+ }
+
+ // CopyAsset copies a file from asset
+-func CopyAsset(boxed, to string, assetsBox *rice.Box) {
++func CopyAsset(boxed string, to string, assetsBox string) {
+ file, err := os.Create(to)
+ if err != nil {
+ log.Errorf("Failed to create %s: %v", to, err)
+ os.Exit(1)
+ }
+ defer file.Close()
+- boxedFile, err := assetsBox.Open(boxed)
++ boxedFile, err := os.OpenFile(assetsBox + "/" + boxed, os.O_RDONLY, 0666)
+ if err != nil {
+ log.Errorf("Failed to find boxed file %s: %v", boxed, err)
+ os.Exit(1)
diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix
index ebf44d9d69..05b2b50f26 100644
--- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.7.1";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
- sha256 = "07fjixz8y5rxfwpyr1kiimnn27jhc20gacd17i0yvfcpy5qf8z5p";
+ sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY=";
};
- cargoSha256 = "1zn0kiqi8p25lscjd661gczay631nwzadl36cfzqnbww6blayy1j";
+ cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w=";
nativeBuildInputs = [ installShellFiles ];
@@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec {
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
'';
- # Skip "edit" when running "cargo test",
- # since this test case needs "cat".
- checkFlagsArray = [ "--skip=edit" ];
+ # Skip "edit" when running "cargo test", since this test case needs "cat".
+ # Skip "choose" when running "cargo test", since this test case needs "fzf".
+ checkFlags = [ "--skip=choose" "--skip=edit" ];
meta = with stdenv.lib; {
description = "A handy way to save and run project-specific commands";
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
index 2ec7d7f202..364d46de56 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "kcc";
- version = "4.0.0";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "kcc";
rev = version;
- sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4";
+ sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
};
nativeBuildInputs = [ cmake bison flex ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
index bd4320637d..3f3f698693 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }:
+{ stdenv, fetchFromGitHub, cmake, asciidoc }:
stdenv.mkDerivation rec {
pname = "kimg";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "kimg";
rev = version;
- sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk";
+ sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
};
- nativeBuildInputs = [ cmake asciidoc pkg-config ];
-
- buildInputs = [ imagemagick ];
+ nativeBuildInputs = [ cmake asciidoc ];
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
homepage = "https://knightos.org/";
- description = "Converts image formats supported by ImageMagick to the KnightOS image format";
+ description = "Converts image formats supported by stb_image to the KnightOS image format";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
- platforms = platforms.unix;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
index 2269c3781a..b87650d5bf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix
@@ -1,26 +1,26 @@
{ fetchFromGitHub, stdenv, cmake }:
-
stdenv.mkDerivation rec {
pname = "scas";
- version = "0.4.6";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "scas";
rev = version;
- sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h";
+ sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j";
};
- nativeBuildInputs = [ cmake ];
+ cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
- hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://knightos.org/";
description = "Assembler and linker for the Z80";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
index 6aad8f687e..d8f6a12740 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z80e";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "z80e";
rev = version;
- sha256 = "18nnip6nv1pq19bxgd07fv7ci3c5yj8d9cip97a4zsfab7bmbq6k";
+ sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc";
};
nativeBuildInputs = [ cmake knightos-scas ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
index 25ec42eac8..5694693615 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Command line parser for C++11";
homepage = "https://github.com/CLIUtils/CLI11";
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.unix;
maintainers = with maintainers; [ nand0p ];
- license = licenses.unfreeRedistributable;
+ license = licenses.bsd3;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
index 5b992df12b..75eb3e9d05 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
- version = "20201205T230541";
+ version = "20201207T142850";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
- sha256 = "06sismbv7wrcwfgr0brw9gsdvl2plrryhxs1v08a2sd5rdf2qi3b";
+ sha256 = "0fxplldpxslm7f5xxazkl09gsj0ysppaal72hmlqbdj6rbgxlrnk";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/docopts/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/docopts/default.nix
new file mode 100644
index 0000000000..98a24ca5eb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/docopts/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "docopts";
+ version = "0.6.3-rc2";
+
+ src = fetchFromGitHub {
+ owner = "docopt";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg=";
+ };
+
+ goPackagePath = "github.com/docopt/${pname}";
+
+ goDeps = ./deps.nix;
+
+ subPackages = [ "./" ];
+
+ postInstall = ''
+ install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/docopt/${pname}";
+ description = "docopt CLI tool for shell scripting";
+ license = licenses.mit;
+ maintainers = [ maintainers.confus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/docopts/deps.nix b/third_party/nixpkgs/pkgs/development/tools/misc/docopts/deps.nix
new file mode 100644
index 0000000000..8cc1686de7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/docopts/deps.nix
@@ -0,0 +1,11 @@
+[
+ {
+ goPackagePath = "github.com/docopt/docopt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docopt/docopt.go";
+ rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; # "0.6.2";
+ sha256 = "sha256-0mCKIC5x7aauBL8ahXB9ExMfoTJl55HaafWWWPNRmUI=";
+ };
+ }
+]
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
index 4a1d1288a4..e32da3e67b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [ gettext libtool makeWrapper texinfo ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A cross-platform file change monitor with multiple backends";
homepage = "https://github.com/emcrisostomo/fswatch";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
index 58178cde17..e9259b7156 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "nxpmicro-mfgtools";
- version = "1.3.191";
+ version = "1.4.43";
src = fetchFromGitHub {
owner = "NXPmicro";
repo = "mfgtools";
rev = "uuu_${version}";
- sha256 = "196blmd7nf5kamvay22rvnkds2v6h7ab8lyl10dknxgy8i8siqq9";
+ sha256 = "1i1mvr6j0mc33axf6cmmsi83apr5rgq0z0sn23qav9r0izpnnh0w";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
index 412830369b..d259721353 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libarchive, python3, file }:
+{ stdenv, fetchurl, libarchive, python, file, which }:
stdenv.mkDerivation rec {
pname = "remarkable-toolchain";
@@ -6,31 +6,30 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh";
- sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0";
+ sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb";
+ executable = true;
};
nativeBuildInputs = [
libarchive
- python3
+ python
file
+ which
];
- unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh";
-
+ dontUnpack = true;
dontBuild = true;
installPhase = ''
- patchShebangs install-toolchain.sh
- sed -i -e '3,9d' install-toolchain.sh # breaks PATH
- sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh
- ./install-toolchain.sh -D -y -d $out
+ mkdir -p $out
+ ENVCLEANED=1 $src -y -d $out
'';
meta = with stdenv.lib; {
description = "A toolchain for cross-compiling to reMarkable tablets";
homepage = "https://remarkable.engineering/";
license = licenses.gpl2;
- maintainers = [ maintainers.nickhu ];
- platforms = platforms.x86_64;
+ maintainers = with maintainers; [ nickhu siraben ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix
index 66d40ae312..5e3c3bc37c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/sqitch/default.nix
@@ -1,32 +1,46 @@
-{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule, shortenPerlShebang }:
+{ stdenv
+, lib
+, perlPackages
+, makeWrapper
+, shortenPerlShebang
+, mysqlSupport ? false
+, postgresqlSupport ? false
+}:
+
+let
+ sqitch = perlPackages.AppSqitch;
+ modules = with perlPackages; [ ]
+ ++ lib.optional mysqlSupport DBDmysql
+ ++ lib.optional postgresqlSupport DBDPg;
+in
stdenv.mkDerivation {
- name = "${name}-${sqitchModule.version}";
+ pname = "sqitch";
+ version = sqitch.version;
- buildInputs = [ perl makeWrapper sqitchModule databaseModule ];
+ nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
- src = sqitchModule;
+ src = sqitch;
dontBuild = true;
- nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
-
installPhase = ''
mkdir -p $out/bin
for d in bin/sqitch etc lib share ; do
# make sure dest alreay exists before symlink
# this prevents installing a broken link into the path
- if [ -e ${sqitchModule}/$d ]; then
- ln -s ${sqitchModule}/$d $out/$d
+ if [ -e ${sqitch}/$d ]; then
+ ln -s ${sqitch}/$d $out/$d
fi
done
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/sqitch
'';
dontStrip = true;
- postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB";
+ postFixup = ''
+ wrapProgram $out/bin/sqitch --prefix PERL5LIB : ${perlPackages.makeFullPerlPath modules}
+ '';
meta = {
- platforms = stdenv.lib.platforms.unix;
- inherit (sqitchModule.meta) license;
+ inherit (sqitch.meta) description homepage license platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
index 14f4d5ef12..6b79748179 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
- version = "5.9";
+ version = "5.10";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
- sha256 = "1nb6bm6ll6cxd6a2fc67c0qn39gbh6rkqrpv83lw6ijm8sw3wirr";
+ sha256 = "sha256-/jmC6kzZrrO0ujX2J58LV3o3F10ygr4kuaVTe1a48Bw=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "A system call tracer for Linux";
license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
platforms = platforms.linux;
- maintainers = with maintainers; [ globin ];
+ maintainers = with maintainers; [ globin ma27 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
index 4d999f3244..220042079f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -1,17 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "terraform-ls";
- version = "0.7.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "1afdd1zs242nh1cync5ip1fbah34wc3gbsx3hwwiisc8yziwiq18";
+ sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk=";
};
+ vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI=";
- goPackagePath = "github.com/hashicorp/terraform-ls";
+ # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
+ doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
new file mode 100644
index 0000000000..3e5f9c319e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, rustPlatform, cmake }:
+rustPlatform.buildRustPackage rec {
+ pname = "unused";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "unused-code";
+ repo = pname;
+ rev = version;
+ sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a";
+
+ meta = with stdenv.lib; {
+ description = "A tool to identify potentially unused code";
+ homepage = "https://unused.codes";
+ license = licenses.mit;
+ maintainers = [ maintainers.lrworth ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/usbsdmux/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/usbsdmux/default.nix
new file mode 100644
index 0000000000..59b5dc9823
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/usbsdmux/default.nix
@@ -0,0 +1,19 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "usbsdmux";
+ version = "0.1.8";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0m3d0rs9s5v5hnsjkfybmd8v54gn7rc1dbg5vc48rryhc969pr9f";
+ };
+
+ meta = with lib; {
+ description = "Control software for the LXA USB-SD-Mux";
+ homepage = "https://github.com/linux-automation/usbsdmux";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ emantor ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index e9e7f9d279..a08aaac832 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler
+{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
-stdenv.mkDerivation rec {
- version = "3.2.1";
- pname = "js_of_ocaml-camlp4";
+buildDunePackage rec {
+ version = "3.2.1";
+ pname = "js_of_ocaml-camlp4";
- src = fetchFromGitHub {
- owner = "ocsigen";
- repo = "js_of_ocaml";
- rev = version;
- sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
- };
+ src = fetchFromGitHub {
+ owner = "ocsigen";
+ repo = "js_of_ocaml";
+ rev = version;
+ sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
+ };
- inherit (js_of_ocaml-compiler) installPhase meta;
+ inherit (js_of_ocaml-compiler) meta;
- buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
-
- buildPhase = "dune build -p js_of_ocaml-camlp4";
+ buildInputs = [ camlp4 ocsigen_deriving ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index c0812c39a3..f1398c2f7c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,28 +1,28 @@
{ lib, fetchurl, buildDunePackage
-, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
+, cmdliner, cppo, yojson, ppxlib
, menhir
}:
buildDunePackage rec {
- pname = "js_of_ocaml-compiler";
- version = "3.7.0";
- useDune2 = true;
+ pname = "js_of_ocaml-compiler";
+ version = "3.8.0";
+ useDune2 = true;
- src = fetchurl {
- url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
- sha256 = "0rw6cfkl3zlyav8q2w7grxxqjmg35mz5rgvmkiqb58nl4gmgzx6w";
- };
+ src = fetchurl {
+ url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
+ sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
+ };
- nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ];
+ nativeBuildInputs = [ cppo menhir ];
buildInputs = [ cmdliner ];
configurePlatforms = [];
- propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ];
+ propagatedBuildInputs = [ yojson ppxlib ];
- meta = {
- description = "Compiler from OCaml bytecode to Javascript";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.vbgl ];
- homepage = "https://ocsigen.org/js_of_ocaml/";
- };
+ meta = {
+ description = "Compiler from OCaml bytecode to Javascript";
+ license = lib.licenses.gpl2;
+ maintainers = [ lib.maintainers.vbgl ];
+ homepage = "https://ocsigen.org/js_of_ocaml/";
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 9a57b590d6..25826e94eb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,16 +1,13 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
-, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
+{ buildDunePackage, js_of_ocaml-compiler
+, ppxlib, uchar
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml";
+buildDunePackage {
+ pname = "js_of_ocaml";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
- nativeBuildInputs = [ ocaml findlib dune_2 ];
+ buildInputs = [ ppxlib ];
- propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
-
- buildPhase = "dune build -p js_of_ocaml";
+ propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 2ad8578894..81b1a41614 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -1,16 +1,13 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx
-, ocaml-migrate-parsetree, ppx_tools_versioned
+{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx
, js_of_ocaml, ocaml_lwt, lwt_log
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml-lwt";
+buildDunePackage {
+ pname = "js_of_ocaml-lwt";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
+ buildInputs = [ js_of_ocaml-ppx ];
- propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
-
- buildPhase = "dune build -p js_of_ocaml-lwt";
+ propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index 50bcd69eb6..6abb1ac1b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -1,15 +1,11 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
+{ buildDunePackage, js_of_ocaml-compiler
, ocamlbuild
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml-ocamlbuild";
+buildDunePackage {
+ pname = "js_of_ocaml-ocamlbuild";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ ocaml findlib dune_2 ];
-
- propagatedBuildInputs = [ ocamlbuild ];
-
- buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
+ propagatedBuildInputs = [ ocamlbuild ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 69783c7ead..b29ef435e4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -1,14 +1,12 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
-, ocaml-migrate-parsetree, ppx_tools_versioned
+{ buildDunePackage, js_of_ocaml-compiler
+, ppxlib
, js_of_ocaml
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml-ppx";
+buildDunePackage {
+ pname = "js_of_ocaml-ppx";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
-
- buildPhase = "dune build -p js_of_ocaml-ppx";
+ buildInputs = [ ppxlib js_of_ocaml ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index d3cc4e0878..d862d4bc67 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -1,15 +1,11 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
+{ buildDunePackage, js_of_ocaml-compiler
, js_of_ocaml, ppxlib
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml-ppx_deriving_json";
+buildDunePackage {
+ pname = "js_of_ocaml-ppx_deriving_json";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ ocaml findlib dune_2 ];
-
- propagatedBuildInputs = [ js_of_ocaml ppxlib ];
-
- buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
+ propagatedBuildInputs = [ js_of_ocaml ppxlib ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index fcfeeaf8d9..7082e4b86c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -1,16 +1,14 @@
-{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
-, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
+{ buildDunePackage, js_of_ocaml-compiler
+, js_of_ocaml-ppx
, js_of_ocaml, reactivedata, tyxml
}:
-stdenv.mkDerivation {
- pname = "js_of_ocaml-tyxml";
+buildDunePackage {
+ pname = "js_of_ocaml-tyxml";
- inherit (js_of_ocaml-compiler) version src installPhase meta;
+ inherit (js_of_ocaml-compiler) version src meta useDune2;
- buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
+ buildInputs = [ js_of_ocaml-ppx ];
- propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
-
- buildPhase = "dune build -p js_of_ocaml-tyxml";
+ propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index 59c77f6e14..8fac26c2b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchzip, ocamlPackages
+{ lib, fetchurl, fetchzip, ocaml-ng
, version
, tarballName ? "ocamlformat-${version}.tbz",
}:
@@ -22,6 +22,12 @@ let src =
}
; in
+let ocamlPackages =
+ if lib.versionAtLeast version "0.14.3"
+ then ocaml-ng.ocamlPackages
+ else ocaml-ng.ocamlPackages_4_07
+; in
+
with ocamlPackages;
buildDunePackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
index 6b76516232..98e966cbf5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "open-policy-agent";
- version = "0.25.1";
+ version = "0.25.2";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
- sha256 = "1vwyp46lxjar7wl4qjj1mlii4c1vm65kwgmnf1kkwh8i4c202zkx";
+ sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
index b44f50a37a..8570e10a07 100644
--- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "packer";
- version = "1.6.5";
+ version = "1.6.6";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "sha256-M4PZnqdU5+w/B821cs1bJYzeilqdZ93fh5PErVgqBOQ=";
+ sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg=";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix b/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix
index 33d61eca71..0008fab744 100644
--- a/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/packet-sd/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
description = "Prometheus service discovery for Equinix Metal";
homepage = "https://github.com/packethost/prometheus-packet-sd";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.andir ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix
index dbee7631fe..4f65d5fa5d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix
@@ -8,30 +8,6 @@ in
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
- patches = (drv.patches or []) ++ [
- # Add xmlns to top-level tags in Docbook, required for nixpkgs manual.
- # https://github.com/jgm/pandoc/pull/6923
- (fetchpatch {
- url = "https://github.com/jgm/pandoc/commit/6f35600204132c5a0907bb7cccb2e10ffb27506a.patch";
- sha256 = "gRUqc4YG4lZdCZn21fPmlcrFyZ3/VlDx71lU8GMuGSs=";
- })
- # Generate admonitions in DocBook, required for nixpkgs manual.
- # https://github.com/jgm/pandoc/pull/6922
- (fetchpatch {
- url = "https://github.com/jgm/pandoc/commit/dc6856530c2cb6ca58ed82721ab895b86cfe0c1c.patch";
- sha256 = "EdsUDlHzsfRscXBR4EP2Z5ZEz+NfrmFHnV7c1hJczio=";
- })
- # Use correct id attributes in DocBook, required for nixpkgs manual.
- (fetchpatch {
- url = "https://github.com/jgm/pandoc/commit/16ef87745702f69d5aa948fbe6d2101577dee8f4.patch";
- sha256 = "WyWTqrO6hGsMgJ7o7QL1BNvhkm0yIO1XJOcfPBDy6ag=";
- })
- # Allow using admonition titles from Markdown in DocBook.
- (fetchpatch {
- url = "https://github.com/jgm/pandoc/commit/70c7c5703afcbd1cbf2a80c2be515e038abcd419.patch";
- sha256 = "2kHQ1qy/UdDi/chwCBvMjAPA/XFH42vWFCjR46Jgt6M=";
- })
- ];
})).overrideAttrs (drv: {
# These libraries are still referenced, because they generate
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index e343506156..57c12cce93 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -2,10 +2,12 @@
, fetchgit, fetchFromGitHub, fetchurl
, writeShellScript, runCommand, which
, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
+, Security
, callPackage
+
, enableShared ? true
, enableStatic ? false
-, Security
+, webUISupport ? false
}:
# TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -41,8 +43,10 @@ let
builtGrammars = let
change = name: grammar:
- callPackage ./library.nix {
- language = name; inherit version; source = fetchGrammar grammar;
+ callPackage ./library.nix {} {
+ language = name;
+ inherit version;
+ source = fetchGrammar grammar;
};
in
# typescript doesn't have parser.c in the same place as others
@@ -52,24 +56,25 @@ in rustPlatform.buildRustPackage {
pname = "tree-sitter";
inherit src version cargoSha256;
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs =
+ lib.optionals stdenv.isDarwin [ Security ];
+ nativeBuildInputs =
+ [ which ]
+ ++ lib.optionals webUISupport [ emscripten ];
- nativeBuildInputs = [ emscripten which ];
-
- postPatch = ''
- # needed for the tests
- rm -rf test/fixtures/grammars
- ln -s ${grammars} test/fixtures/grammars
-
- # These functions do not appear in the source code
- sed -i /_ts_query_context/d lib/binding_web/exports.json
- sed -i /___assert_fail/d lib/binding_web/exports.json
+ postPatch = lib.optionalString (!webUISupport) ''
+ # remove web interface
+ sed -e '/pub mod web_ui/d' \
+ -i cli/src/lib.rs
+ sed -e 's/web_ui,//' \
+ -e 's/web_ui::serve(¤t_dir.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \
+ -i cli/src/main.rs
'';
# Compile web assembly with emscripten. The --debug flag prevents us from
# minifying the JavaScript; passing it allows us to side-step more Node
# JS dependencies for installation.
- preBuild = ''
+ preBuild = lib.optionalString webUISupport ''
bash ./script/build-wasm --debug
'';
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix
index 36245ff7d4..f78939b22f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/library.nix
@@ -1,7 +1,15 @@
{ stdenv
-, language
, tree-sitter
+}:
+
+# Build a parser grammar and put the resulting shared object in `$out/parser`
+
+{
+ # language name
+ language
+ # version of tree-sitter
, version
+ # source for the language grammar
, source
}:
diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix
new file mode 100644
index 0000000000..5e1dcbfa6f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "py-spy";
+ version = "0.3.3";
+
+ src = fetchFromGitHub {
+ owner = "benfred";
+ repo = "py-spy";
+ rev = "v${version}";
+ sha256 = "1w9nwsmazafr78ghif6njdcqjisr0f1jb6cm1w4ngvigx5qlrbkv";
+ };
+
+ NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
+
+ # error: linker `arm-linux-gnueabihf-gcc` not found
+ preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ export RUSTFLAGS="-Clinker=$CC"
+ '';
+
+ checkInputs = [ python3 ];
+
+ cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah";
+
+ meta = with stdenv.lib; {
+ description = "Sampling profiler for Python programs";
+ license = licenses.mit;
+ maintainers = [ maintainers.lnl7 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
index e955a844dc..1b4509a405 100644
--- a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
- version = "3.28.1-01";
+ version = "3.29.0-02";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
- sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8";
+ sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z";
};
preferLocalBuild = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
index e5ef80b87e..f846ed5f02 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
@@ -10,16 +10,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "rustup";
- version = "1.22.1";
+ version = "1.23.1";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup";
rev = version;
- sha256 = "0nf42pkyn87y0n93vd63bihx74h4bpisv74aqldg3vcav2iv35s1";
+ sha256 = "1i3ipkq6j47bf9dh9j3axzj6z443jm4j651g38cxyrrx8b2s15x0";
};
- cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi";
+ cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig";
nativeBuildInputs = [ makeWrapper pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
index 0f29fc741c..fc1f5c3f31 100644
--- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "skaffold";
- version = "1.17.1";
+ version = "1.17.2";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "1q1rzqsga728cjv89lpgnwjb22azlmkffki9m0q21r1njzc3w74h";
+ sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
index 6e49bd2aaf..6c54e8f3c4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
@@ -23,8 +23,7 @@ in stdenv.mkDerivation rec {
dontUnpack = true;
installPhase = ''
- mkdir -p $out/bin
- ln -s $src $out/bin/TabNine
+ install -Dm755 $src $out/bin/TabNine
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
index b3b3bd1b9f..58ee064ad5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
- sha256 = "05qxbqq9mlq2jmyj5m9vmgw6s6a3wj06hmxj74g9lgqg8xyfglnh";
+ sha256 = "14cl0rgkk2kw0qyanlm57nbcrnsnnx02ikd6b1mrsviamb6r1lz6";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix
index ffa6664685..4c843d04b8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix
@@ -4,7 +4,6 @@ buildGoModule rec {
pname = "wally-cli";
version = "2.0.0";
- goPackagePath = "github.com/zsa/wally-cli";
subPackages = [ "." ];
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
index eed61d4ec1..289bb631c1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
@@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [
"memchr",
]
@@ -33,9 +33,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.32"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
+checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
[[package]]
name = "arrayref"
@@ -45,9 +45,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "ascii"
@@ -57,9 +57,9 @@ checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
[[package]]
name = "askama"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12"
+checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134"
dependencies = [
"askama_derive",
"askama_escape",
@@ -68,13 +68,12 @@ dependencies = [
[[package]]
name = "askama_derive"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881"
+checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
dependencies = [
"askama_shared",
"proc-macro2",
- "quote",
"syn",
]
@@ -86,14 +85,14 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb"
[[package]]
name = "askama_shared"
-version = "0.10.4"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5"
+checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
dependencies = [
"askama_escape",
"humansize",
- "nom",
- "num-traits 0.2.12",
+ "nom 6.0.1",
+ "num-traits 0.2.14",
"percent-encoding 2.1.0",
"proc-macro2",
"quote",
@@ -104,9 +103,9 @@ dependencies = [
[[package]]
name = "assert_cmd"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da"
+checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
dependencies = [
"doc-comment",
"predicates",
@@ -134,9 +133,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
[[package]]
name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "base64"
@@ -150,9 +149,9 @@ dependencies = [
[[package]]
name = "base64"
-version = "0.11.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bitflags"
@@ -167,10 +166,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
-name = "blake2b_simd"
-version = "0.5.10"
+name = "bitvec"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake2b_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
dependencies = [
"arrayref",
"arrayvec",
@@ -210,9 +221,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.58"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
[[package]]
name = "cfg-if"
@@ -220,6 +231,12 @@ 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 = "char"
version = "0.1.0"
@@ -229,13 +246,15 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.13"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
+ "libc",
"num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
"time",
+ "winapi",
]
[[package]]
@@ -246,9 +265,9 @@ checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
[[package]]
name = "clap"
-version = "2.33.1"
+version = "2.33.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
dependencies = [
"ansi_term",
"atty",
@@ -279,9 +298,9 @@ dependencies = [
[[package]]
name = "color_quant"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "console_error_panic_hook"
@@ -289,7 +308,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"wasm-bindgen",
]
@@ -301,6 +320,12 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "const_fn"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
+
[[package]]
name = "constant_time_eq"
version = "0.1.5"
@@ -308,58 +333,56 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
+name = "crossbeam-channel"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+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",
- "maybe-uninit",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.8.2"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
dependencies = [
- "autocfg 1.0.0",
- "cfg-if",
+ "cfg-if 1.0.0",
+ "const_fn",
"crossbeam-utils",
"lazy_static",
- "maybe-uninit",
"memoffset",
"scopeguard",
]
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "maybe-uninit",
-]
-
[[package]]
name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
dependencies = [
- "autocfg 1.0.0",
- "cfg-if",
+ "autocfg 1.0.1",
+ "cfg-if 1.0.0",
"lazy_static",
]
[[package]]
name = "curl"
-version = "0.4.31"
+version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78"
+checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e"
dependencies = [
"curl-sys",
"libc",
@@ -372,9 +395,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.33+curl-7.71.1"
+version = "0.4.39+curl-7.74.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337"
+checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874"
dependencies = [
"cc",
"libc",
@@ -453,9 +476,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.5.3"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "enum_primitive"
@@ -468,12 +491,12 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.7.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
dependencies = [
"atty",
- "humantime 1.3.0",
+ "humantime",
"log 0.4.11",
"regex",
"termcolor",
@@ -493,11 +516,11 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.11"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"libc",
"redox_syscall",
"winapi",
@@ -509,7 +532,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
]
[[package]]
@@ -534,10 +557,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
-name = "futures"
-version = "0.3.5"
+name = "funty"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
+checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
+
+[[package]]
+name = "futures"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
dependencies = [
"futures-channel",
"futures-core",
@@ -550,9 +579,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
dependencies = [
"futures-core",
"futures-sink",
@@ -569,9 +598,9 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
[[package]]
name = "futures-core-preview"
@@ -581,9 +610,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
[[package]]
name = "futures-executor"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
+checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
dependencies = [
"futures-core",
"futures-task",
@@ -592,15 +621,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
[[package]]
name = "futures-macro"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
+checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -610,24 +639,24 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
[[package]]
name = "futures-task"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
dependencies = [
"once_cell",
]
[[package]]
name = "futures-util"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
dependencies = [
"futures-channel",
"futures-core",
@@ -645,13 +674,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.14"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
- "wasi",
+ "wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
@@ -695,9 +724,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [
"libc",
]
@@ -714,15 +743,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e"
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
[[package]]
name = "humantime"
version = "2.0.1"
@@ -797,7 +817,7 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.44"
+version = "0.3.46"
dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -825,16 +845,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
[[package]]
-name = "libc"
-version = "0.2.74"
+name = "lexical-core"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
+checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.2.1",
+ "cfg-if 0.1.10",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
[[package]]
name = "libz-sys"
-version = "1.0.25"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
dependencies = [
"cc",
"libc",
@@ -857,7 +890,7 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
]
[[package]]
@@ -872,25 +905,19 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
[[package]]
name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memoffset"
-version = "0.5.5"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
]
[[package]]
@@ -949,6 +976,18 @@ dependencies = [
"version_check 0.9.2",
]
+[[package]]
+name = "nom"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
+dependencies = [
+ "bitvec",
+ "lexical-core",
+ "memchr",
+ "version_check 0.9.2",
+]
+
[[package]]
name = "normalize-line-endings"
version = "0.3.0"
@@ -957,23 +996,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
- "autocfg 1.0.0",
- "num-traits 0.2.12",
+ "autocfg 1.0.1",
+ "num-traits 0.2.14",
]
[[package]]
name = "num-iter"
-version = "0.1.41"
+version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
+checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
]
[[package]]
@@ -983,7 +1022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
dependencies = [
"num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
]
[[package]]
@@ -992,16 +1031,16 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
]
[[package]]
name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
]
[[package]]
@@ -1016,18 +1055,18 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.4.0"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "openssl"
-version = "0.10.30"
+version = "0.10.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
dependencies = [
"bitflags 1.2.1",
- "cfg-if",
+ "cfg-if 1.0.0",
"foreign-types",
"lazy_static",
"libc",
@@ -1042,20 +1081,20 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-src"
-version = "111.10.2+1.1.1g"
+version = "111.13.0+1.1.1i"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70"
+checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"cc",
"libc",
"openssl-src",
@@ -1079,7 +1118,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
name = "performance"
version = "0.1.0"
dependencies = [
- "humantime 2.0.1",
+ "humantime",
"wasm-bindgen",
"web-sys",
]
@@ -1125,18 +1164,18 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "0.4.23"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.23"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
dependencies = [
"proc-macro2",
"quote",
@@ -1151,9 +1190,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
[[package]]
name = "png"
@@ -1169,9 +1208,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "predicates"
@@ -1204,9 +1243,9 @@ dependencies = [
[[package]]
name = "proc-macro-error"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
@@ -1217,22 +1256,20 @@ dependencies = [
[[package]]
name = "proc-macro-error-attr"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
- "syn",
- "syn-mid",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-hack"
-version = "0.5.18"
+version = "0.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro-nested"
@@ -1242,9 +1279,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
[[package]]
name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
@@ -1264,6 +1301,12 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
[[package]]
name = "rand"
version = "0.4.6"
@@ -1439,11 +1482,11 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.3.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.0.1",
"crossbeam-deque",
"either",
"rayon-core",
@@ -1451,12 +1494,12 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.7.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
dependencies = [
+ "crossbeam-channel",
"crossbeam-deque",
- "crossbeam-queue",
"crossbeam-utils",
"lazy_static",
"num_cpus",
@@ -1504,9 +1547,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_users"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
"getrandom",
"redox_syscall",
@@ -1515,9 +1558,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.3.9"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
dependencies = [
"aho-corasick",
"memchr",
@@ -1527,9 +1570,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]]
name = "remove_dir_all"
@@ -1573,11 +1616,11 @@ dependencies = [
[[package]]
name = "rust-argon2"
-version = "0.7.0"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
dependencies = [
- "base64 0.11.0",
+ "base64 0.13.0",
"blake2b_simd",
"constant_time_eq",
"crossbeam-utils",
@@ -1592,9 +1635,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
[[package]]
name = "ryu"
@@ -1648,18 +1691,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
-version = "1.0.114"
+version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.114"
+version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
dependencies = [
"proc-macro2",
"quote",
@@ -1668,9 +1711,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.57"
+version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
dependencies = [
"itoa",
"ryu",
@@ -1697,11 +1740,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
[[package]]
name = "socket2"
-version = "0.3.12"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"libc",
"redox_syscall",
"winapi",
@@ -1713,6 +1756,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
[[package]]
name = "strsim"
version = "0.8.0"
@@ -1727,9 +1776,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "structopt"
-version = "0.3.15"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
dependencies = [
"clap",
"lazy_static",
@@ -1738,9 +1787,9 @@ dependencies = [
[[package]]
name = "structopt-derive"
-version = "0.4.8"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
"proc-macro-error",
@@ -1751,9 +1800,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.36"
+version = "1.0.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
+checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
dependencies = [
"proc-macro2",
"quote",
@@ -1761,15 +1810,10 @@ dependencies = [
]
[[package]]
-name = "syn-mid"
-version = "0.5.0"
+name = "tap"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
[[package]]
name = "tempdir"
@@ -1787,7 +1831,7 @@ version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
"libc",
"rand 0.7.3",
"redox_syscall",
@@ -1808,9 +1852,9 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
@@ -1844,11 +1888,12 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
@@ -1867,9 +1912,18 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "0.3.3"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "todomvc"
@@ -1884,9 +1938,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
dependencies = [
"serde",
]
@@ -1899,9 +1953,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
[[package]]
name = "trybuild"
-version = "1.0.31"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8"
+checksum = "18ccca2bc5e97a2688cba15c573d5179cdff976fc597b95472c2e0f443492b98"
dependencies = [
"glob",
"lazy_static",
@@ -1949,18 +2003,18 @@ dependencies = [
[[package]]
name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
[[package]]
name = "unicode-width"
@@ -1987,9 +2041,9 @@ dependencies = [
[[package]]
name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
[[package]]
name = "vec_map"
@@ -2051,11 +2105,17 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasm-bindgen"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"js-sys",
"serde",
"serde_derive",
@@ -2069,7 +2129,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"bumpalo",
"lazy_static",
@@ -2090,7 +2150,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-cli"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"assert_cmd",
@@ -2118,7 +2178,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-cli-support"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"base64 0.9.3",
@@ -2140,21 +2200,21 @@ dependencies = [
[[package]]
name = "wasm-bindgen-externref-xform"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"rayon",
"walrus",
"wasmprinter",
- "wast",
+ "wast 21.0.0",
"wat",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.17"
+version = "0.4.19"
dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
"futures-channel-preview",
"js-sys",
"wasm-bindgen",
@@ -2164,7 +2224,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"quote",
"trybuild",
@@ -2175,7 +2235,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"proc-macro2",
"quote",
@@ -2186,13 +2246,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-multi-value-xform"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"rayon",
"walrus",
"wasmprinter",
- "wast",
+ "wast 21.0.0",
"wat",
]
@@ -2207,11 +2267,11 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.67"
+version = "0.2.69"
[[package]]
name = "wasm-bindgen-test"
-version = "0.3.17"
+version = "0.3.19"
dependencies = [
"console_error_panic_hook",
"js-sys",
@@ -2237,7 +2297,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-test-macro"
-version = "0.3.17"
+version = "0.3.19"
dependencies = [
"proc-macro2",
"quote",
@@ -2245,7 +2305,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-threads-xform"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"walrus",
@@ -2254,7 +2314,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-wasm-conventions"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"walrus",
@@ -2262,7 +2322,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-wasm-interpreter"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"log 0.4.11",
@@ -2274,7 +2334,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-webidl"
-version = "0.2.67"
+version = "0.2.69"
dependencies = [
"anyhow",
"env_logger",
@@ -2323,18 +2383,18 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"
[[package]]
name = "wasmparser"
-version = "0.60.2"
+version = "0.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f"
+checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1"
[[package]]
name = "wasmprinter"
-version = "0.2.7"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876"
+checksum = "0515db67c610037f3c53ec36976edfd1eb01bac6b1226914b17ce609480e729f"
dependencies = [
"anyhow",
- "wasmparser 0.60.2",
+ "wasmparser 0.71.0",
]
[[package]]
@@ -2347,17 +2407,26 @@ dependencies = [
]
[[package]]
-name = "wat"
-version = "1.0.22"
+name = "wast"
+version = "30.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c"
+checksum = "9b79907b22f740634810e882d8d1d9d0f9563095a8ab94e786e370242bff5cd2"
dependencies = [
- "wast",
+ "leb128",
+]
+
+[[package]]
+name = "wat"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8279a02835bf12e61ed2b3c3cbc6ecf9918762fd97e036917c11a09ec20ca44"
+dependencies = [
+ "wast 30.0.0",
]
[[package]]
name = "web-sys"
-version = "0.3.44"
+version = "0.3.46"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2388,6 +2457,7 @@ version = "0.1.0"
dependencies = [
"js-sys",
"wasm-bindgen",
+ "wasm-bindgen-futures",
"wasm-bindgen-test",
"wasm-bindgen-webidl",
]
@@ -2430,7 +2500,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
dependencies = [
- "nom",
+ "nom 5.1.2",
]
[[package]]
@@ -2500,7 +2570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f"
dependencies = [
"anyhow",
- "wast",
+ "wast 21.0.0",
"wit-writer",
]
@@ -2555,3 +2625,9 @@ dependencies = [
"wasm-bindgen",
"web-sys",
]
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 0863905e93..5794f5cc33 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -4,7 +4,7 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
- version = "0.2.67";
+ version = "0.2.69";
src =
let
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
- sha256 = "0qx178aicbn59b150j5r78zya5n0yljvw4c4lhvg8x4cpfshjb5j";
+ sha256 = "1psylk3hlx0ahwib3ph8qdk0jwlp8qzc6dv61002rj7ns28vs4mx";
};
in runCommand "source" { } ''
cp -R ${tarball} $out
@@ -23,14 +23,14 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkgconfig ];
- cargoSha256 = "0chpw6syqxn824cbkdjx1s26vmajx511gc4mp9y64vy7b7asba6x";
+ cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
license = licenses.asl20;
description = "Facilitating high-level interactions between wasm modules and JavaScript";
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ma27 rizary ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
index b7020eacdc..6b85e20612 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
- version = "1.12.2";
+ version = "1.12.3";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
- sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a";
+ sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm";
};
- cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx";
+ cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx";
nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 89bc169d50..ad7e2738bf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -238,7 +238,7 @@ in rec {
package = lib.importJSON packageJSON;
pname = package.name;
safeName = reformatPackageName pname;
- version = package.version or attrs.version;
+ version = attrs.version or package.version;
baseName = unlessNull name "${safeName}-${version}";
workspaceDependenciesTransitive = lib.unique (
diff --git a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix
index 94237abf89..43771e4b67 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix
@@ -1,27 +1,24 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "yj";
- version = "4.0.0";
- rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
+ version = "5.0.0";
- goPackagePath = "github.com/sclevine/yj";
-
- src = fetchgit {
- inherit rev;
- url = "https://github.com/sclevine/yj";
- sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x";
+ src = fetchFromGitHub {
+ owner = "sclevine";
+ repo = "yj";
+ rev = "c4c13b7641389c76ea028b48091f851f3efb6376";
+ sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr";
};
- goDeps = ./deps.nix;
+ vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
meta = with stdenv.lib; {
description = ''Convert YAML <=> TOML <=> JSON <=> HCL'';
license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch ];
- downloadPage = "https://github.com/sclevine/yj";
- updateWalker = true;
- inherit version;
+ homepage = "https://github.com/sclevine/yj";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/yj/deps.nix b/third_party/nixpkgs/pkgs/development/tools/yj/deps.nix
deleted file mode 100644
index 0bfe7f5f5d..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/yj/deps.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "cf7d376da96d9cecec7c7483cec2735efe54a410";
- sha256 = "0i1zhgpyvvgwkz74k8wd3sygsap1saqv37rw0j5vdpaazmpr1qkb";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
- sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
index 05410bbaec..67c8509fd7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
@@ -10,8 +10,6 @@ buildGoModule rec {
sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l";
};
- goPackagePath = "github.com/vmware-tanzu/carvel-ytt";
-
vendorSha256 = null;
subPackages = [ "cmd/ytt" ];
diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
index 72525a9808..63d60547be 100644
--- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.153";
+ version = "0.0.154";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "1an6j4bv9ib5rn78dbn8h1pdkw3fcd3fdrymhvr6909pvcz7bbgy";
+ sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm";
};
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix
index 870e6b0474..15dc040dc5 100644
--- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix
@@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
- version = "2020.5.1";
+ version = "2020.5.2";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
- sha256 = "18wbyf5qq2x0dzaf6bprs4nhv0ckrgq679l3w61p1yf4y3j7xwn4";
+ sha256 = "03j76a0dj3ak5h6malwxqf7cdc2ycwgyr6993bhiq75yhxhblhc4";
};
nativeBuildInputs =
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
index c3e4d75078..14833bb042 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix
@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.15.1";
- sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81";
+ version = "14.15.3";
+ sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
index f5cd88c3d3..3569ad3a10 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.3.0";
- sha256 = "0h625hhswwv5rpijacxiak28fy5br8kpxrihfcjdqwm3dvyvkc1v";
+ version = "15.5.0";
+ sha256 = "1wzcypb1kawc6m5q36cd31qjg7ljby8py9qg555m4bqm5gpvvfjg";
}
diff --git a/third_party/nixpkgs/pkgs/games/alephone/default.nix b/third_party/nixpkgs/pkgs/games/alephone/default.nix
index 879571df7a..8dfef420a8 100644
--- a/third_party/nixpkgs/pkgs/games/alephone/default.nix
+++ b/third_party/nixpkgs/pkgs/games/alephone/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libmad, libogg, libpng
-, libsndfile, libvorbis, lua, pkgconfig, SDL, SDL_image, SDL_net, SDL_ttf, smpeg
-, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip, alephone }:
+{ stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg
+, libpng, libsndfile, libvorbis, lua, pkgconfig, SDL2, SDL2_image, SDL2_net
+, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip
+, alephone }:
let
self = stdenv.mkDerivation rec {
outputs = [ "out" "icons" ];
pname = "alephone";
- version = "20150620";
+ version = "1.3.1";
src = fetchurl {
- url =
- "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/AlephOne-${version}.tar.bz2";
- sha256 = "0cz18fa3gx8mz5j09ywz8gq0r4q082kh6l9pbpwn8qjanzgn1wy0";
+ url = let date = "20200904";
+ in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
+ sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh";
};
nativeBuildInputs = [ pkgconfig icoutils ];
@@ -20,16 +21,17 @@ let
boost
curl
ffmpeg
+ libGLU
libmad
libsndfile
libogg
libpng
libvorbis
lua
- SDL
- SDL_image
- SDL_net
- SDL_ttf
+ SDL2
+ SDL2_image
+ SDL2_net
+ SDL2_ttf
smpeg
speex
zziplib
diff --git a/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix b/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix
index fc3500d0eb..5db83c579e 100644
--- a/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix
+++ b/third_party/nixpkgs/pkgs/games/alephone/infinity/default.nix
@@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon-infinity";
desktopName = "Marathon-Infinity";
- version = "20190331";
+ version = "20200904";
icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
- sha256 = "03vn91arnsm71dakbfzrdfwpwh5vkwildl7i16xqi1apinmvvh86";
+ sha256 = "1n2zfiqjbakkk9dpnzfndqyvq3aml2kjrr2b1wm8g1n44nbc8clq";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix
new file mode 100644
index 0000000000..1a642c90d2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix
@@ -0,0 +1,64 @@
+{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }:
+
+let
+ pname = "anki-bin";
+ # Update hashes for both Linux and Darwin!
+ version = "2.1.36";
+
+ unpacked = stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
+ sha256 = "01xcjnfs5pfh7v0nkffw2wpl19l6pj9k3kxrcawv3cm42asy0mfz";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ xdg-mime () {
+ echo Stubbed!
+ }
+ export -f xdg-mime
+
+ PREFIX=$out bash install.sh
+
+ runHook postInstall
+ '';
+ };
+
+ meta = with lib; {
+ inherit (anki.meta) license homepage description longDescription;
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ maintainers = with maintainers; [ atemu ];
+ };
+in
+
+if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
+ name = "anki";
+
+ runScript = writeShellScript "anki-wrapper.sh" ''
+ # Wayland support is broken, disable via ENV variable
+ export QT_QPA_PLATFORM=xcb
+ exec ${unpacked}/bin/anki
+ '';
+
+ inherit meta;
+}) else stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
+ sha256 = "1i6iidm5h8r9g801mvqxi2av03qdw3lr28056fv5ixnb5dq2wqim";
+ };
+
+ nativeBuildInputs = [ undmg ];
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications/
+ cp -a Anki.app $out/Applications/
+ '';
+
+ inherit meta;
+}
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index b4c9054503..00fe4b877d 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.5.tar.xz",
+ "name": "factorio_alpha_x64-1.1.6.tar.xz",
"needsAuth": true,
- "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp",
+ "sha256": "1dg8dh5pivqyjfnhbn01pwwph3xsj1xzvzbv3kzxg5pvjcfx0k6z",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.5/alpha/linux64",
- "version": "1.1.5"
+ "url": "https://factorio.com/get-download/1.1.6/alpha/linux64",
+ "version": "1.1.6"
},
"stable": {
"name": "factorio_alpha_x64-1.0.0.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.5.tar.xz",
+ "name": "factorio_headless_x64-1.1.6.tar.xz",
"needsAuth": false,
- "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1",
+ "sha256": "0bgjq2i2jn07k4awiqxsbf15p2xwn0k0aj11xpdyxvjjky8npwaa",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.5/headless/linux64",
- "version": "1.1.5"
+ "url": "https://factorio.com/get-download/1.1.6/headless/linux64",
+ "version": "1.1.6"
},
"stable": {
"name": "factorio_headless_x64-1.0.0.tar.xz",
diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix
index e32f2e96d4..a8aef81523 100644
--- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix
+++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix
@@ -6,7 +6,7 @@
}:
let
- version = "2020.1.2";
+ version = "2020.3.4";
shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec {
pname = "flightgear-data";
@@ -14,7 +14,7 @@ let
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
- sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk";
+ sha256 = "1cqikbqvidfaynml9bhqfr9yw5ga35gpqrbz62z94a1skdijkpkg";
};
phases = [ "installPhase" ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
- sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb";
+ sha256 = "02d9h10p8hyn0a25csragj6pbwmrir1z8zb92023s9vi21j7bwy8";
};
# Of all the files in the source and data archives, there doesn't seem to be
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/data.nix b/third_party/nixpkgs/pkgs/games/frogatto/data.nix
index ab5bbe2dd9..3313f156ed 100644
--- a/third_party/nixpkgs/pkgs/games/frogatto/data.nix
+++ b/third_party/nixpkgs/pkgs/games/frogatto/data.nix
@@ -7,9 +7,9 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "frogatto";
repo = "frogatto";
- # master branch as of 2018-12-18
- rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5";
- sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx";
+ # master branch as of 2020-12-17
+ rev = "c1d0813b3b755a4e232369b6791397ad058efc16";
+ sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/default.nix b/third_party/nixpkgs/pkgs/games/frogatto/default.nix
index f6d4789c30..ee3803617d 100644
--- a/third_party/nixpkgs/pkgs/games/frogatto/default.nix
+++ b/third_party/nixpkgs/pkgs/games/frogatto/default.nix
@@ -14,7 +14,7 @@ let
genericName = "frogatto";
categories = "Game;ArcadeGame;";
};
- version = "unstable-2018-12-18";
+ version = "unstable-2020-12-04";
in buildEnv {
name = "frogatto-${version}";
diff --git a/third_party/nixpkgs/pkgs/games/frogatto/engine.nix b/third_party/nixpkgs/pkgs/games/frogatto/engine.nix
index d51cfcb8f2..94c2a038d9 100644
--- a/third_party/nixpkgs/pkgs/games/frogatto/engine.nix
+++ b/third_party/nixpkgs/pkgs/games/frogatto/engine.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
owner = "anura-engine";
repo = "anura";
# trunk branch as of 2018-11-28
- rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9";
- sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr";
+ rev = "a05f413f255d2854019134be817c253a03da3d9f";
+ sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/games/manaplus/default.nix b/third_party/nixpkgs/pkgs/games/manaplus/default.nix
new file mode 100644
index 0000000000..ff7bfae971
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/manaplus/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
+, SDL2_net , SDL2_gfx, zlib, physfs, curl, libxml2, libpng, pkg-config
+, libGL, autoreconfHook }:
+stdenv.mkDerivation rec {
+ pname = "manaplus";
+ version = "1.9.3.23";
+
+ src = fetchurl {
+ url = "https://download.evolonline.org/manaplus/download/${version}/manaplus-${version}.tar.xz";
+ sha256 = "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook pkg-config
+ ];
+
+ buildInputs = [
+ SDL2 SDL2_image SDL2_ttf SDL2_mixer SDL2_net SDL2_gfx zlib
+ physfs curl libxml2 libpng libGL
+ ];
+
+ configureFlags = [ "--with-sdl2" "--without-dyecmd" ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ maintainers = [ lib.maintainers.lheckemann ];
+ description = "A free OpenSource 2D MMORPG client";
+ homepage = "https://manaplus.org/";
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix
index 89ff37458a..c547fb052a 100644
--- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix
+++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix
@@ -22,14 +22,14 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
- version = "120.2";
+ version = "121.4";
buildVersion = makeBuildVersion version;
src = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
- sha256 = "01a7qpwfr1n540fk0k65kl03biix0gmg66z7qn22mb2703laq1xc";
+ sha256 = "14w0fkn8q5bj84py7vx33wdk9d37ncrq6rdj5ryz4mvlxbix2n4n";
};
desktopItem = makeDesktopItem {
@@ -74,7 +74,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7";
+ outputHash = "18n671aa013cnsnp9aaw61llqz4s4vn7zgja8cazd0cg632x8jca";
};
# Separate commands for building and installing the server and the client
diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
index 03abcb151b..292b43bec0 100644
--- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix
+++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
@@ -88,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
- version = "2.2.741";
+ version = "2.2.909";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
- sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw";
+ sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2";
};
icon = fetchurl {
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
--prefix LD_LIBRARY_PATH : ${envLibPath} \
--prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
- --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \
+ --set JAVA_HOME ${stdenv.lib.getBin jre} \
--run "cd /tmp" \
"''${gappsWrapperArgs[@]}"
'';
diff --git a/third_party/nixpkgs/pkgs/games/minecraft/update.sh b/third_party/nixpkgs/pkgs/games/minecraft/update.sh
index 02b362e839..485fb5a560 100755
--- a/third_party/nixpkgs/pkgs/games/minecraft/update.sh
+++ b/third_party/nixpkgs/pkgs/games/minecraft/update.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts
+#!nix-shell -i bash -p curl jq common-updater-scripts
set -eu -o pipefail
-version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)')
-update-source-version minecraft "$version"
+version=$(curl -s 'https://launchermeta.mojang.com/v1/products/launcher/6f083b80d5e6fabbc4236f81d0d8f8a350c665a9/linux.json' | jq -r '."launcher-core"[0].version.name')
+update-source-version minecraft "${version}"
diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix
index 304a810c3d..33a0ae1059 100644
--- a/third_party/nixpkgs/pkgs/games/openxray/default.nix
+++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat";
+ description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World";
homepage = src.meta.homepage;
license = licenses.unfree // {
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
diff --git a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
new file mode 100644
index 0000000000..d49dda36e5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
@@ -0,0 +1,34 @@
+{ fetchFromGitHub
+, jq
+, makeWrapper
+, p7zip
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "r2mod_cli";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "Foldex";
+ repo = "r2mod_cli";
+ rev = "v${version}";
+ sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ postInstall = ''
+ wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}";
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Risk of Rain 2 Mod Manager in Bash";
+ homepage = "https://github.com/foldex/r2mod_cli";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.reedrw ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/spring/springlobby.nix b/third_party/nixpkgs/pkgs/games/spring/springlobby.nix
index 33dc364c5b..231090419e 100644
--- a/third_party/nixpkgs/pkgs/games/spring/springlobby.nix
+++ b/third_party/nixpkgs/pkgs/games/spring/springlobby.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
+{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ];
buildInputs = [
- wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp
+ wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp
boost libpng libX11 libnotify gtk2 glib minizip alure
];
diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
index ecd318e64c..4c57ce9aeb 100644
--- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
@@ -6,6 +6,7 @@
, nativeOnly ? false
, runtimeOnly ? false
, runtimeShell
+, stdenv
# DEPRECATED
, withJava ? config.steam.java or false
@@ -35,28 +36,42 @@ let
# Steam VR
procps
usbutils
+
+ # electron based launchers need newer versions of these libraries than what runtime provides
+ mesa
+ sqlite
] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
++ lib.optional withPrimus primus
++ extraPkgs pkgs;
- ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
- ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
+ ldPath = lib.optionals stdenv.is64bit [ "/lib64" ]
+ ++ [ "/lib32" ]
+ ++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
+ ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
# Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present
exportLDPath = ''
- export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+ export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';
+ # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail
+ # and steam will not be able to start
+ fixBootstrap = ''
+ if [ -r $HOME/.local/share/Steam/bootstrap.tar.xz ]; then
+ chmod +w $HOME/.local/share/Steam/bootstrap.tar.xz
+ fi
+ '';
+
setupSh = writeScript "setup.sh" ''
#!${runtimeShell}
'';
runSh = writeScript "run.sh" ''
#!${runtimeShell}
- runtime_paths="/lib32:/lib64:${lib.concatStringsSep ":" ldPath}"
+ runtime_paths="${lib.concatStringsSep ":" ldPath}"
if [ "$1" == "--print-steam-runtime-library-paths" ]; then
- echo "$runtime_paths"
+ echo "$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
exit 0
fi
export LD_LIBRARY_PATH="$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
@@ -175,7 +190,6 @@ in buildFHSUserEnv rec {
libidn
tbb
wayland
- mesa
libxkbcommon
# Other things from runtime
@@ -223,7 +237,7 @@ in buildFHSUserEnv rec {
mkdir -p $out/share/applications
ln -s ${steam}/share/icons $out/share
ln -s ${steam}/share/pixmaps $out/share
- sed "s,/usr/bin/steam,steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
+ ln -s ${steam}/share/applications/steam.desktop $out/share/applications/steam.desktop
'';
profile = ''
@@ -258,6 +272,7 @@ in buildFHSUserEnv rec {
fi
fi
${lib.optionalString (!nativeOnly) exportLDPath}
+ ${fixBootstrap}
exec steam "$@"
'';
@@ -265,6 +280,10 @@ in buildFHSUserEnv rec {
broken = nativeOnly;
};
+ # allows for some gui applications to share IPC
+ # this fixes certain issues where they don't render correctly
+ unshareIpc = false;
+
passthru.run = buildFHSUserEnv {
name = "steam-run";
@@ -280,6 +299,7 @@ in buildFHSUserEnv rec {
fi
shift
${lib.optionalString (!nativeOnly) exportLDPath}
+ ${fixBootstrap}
exec -- "$run" "$@"
'';
};
diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix
index 20ccba641e..ed837c9f0b 100644
--- a/third_party/nixpkgs/pkgs/games/steam/steam.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, runtimeShell, traceDeps ? false}:
+{ stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }:
let
traceLog = "/tmp/steam-trace-dependencies.log";
- version = "1.0.0.61";
+ version = "1.0.0.68";
in stdenv.mkDerivation {
pname = "steam-original";
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
- sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n";
+ sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM=";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
@@ -26,14 +26,22 @@ in stdenv.mkDerivation {
EOF
chmod +x $out/bin/steamdeps
''}
- install -d $out/lib/udev/rules.d
- install -m644 lib/udev/rules.d/*.rules $out/lib/udev/rules.d
+
+ # install udev rules
+ mkdir -p $out/etc/udev/rules.d/
+ cp ./subprojects/steam-devices/*.rules $out/etc/udev/rules.d/
+ substituteInPlace $out/etc/udev/rules.d/60-steam-input.rules \
+ --replace "/bin/sh" "${bash}/bin/bash"
+
+ # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
+ rm $out/share/applications/steam.desktop
+ sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop
'';
meta = with stdenv.lib; {
description = "A digital distribution platform";
homepage = "http://store.steampowered.com/";
license = licenses.unfreeRedistributable;
- maintainers = with maintainers; [ jagajaga ];
+ maintainers = with maintainers; [ jagajaga jonringer ];
};
}
diff --git a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix
index b3a7966071..2c686f5724 100644
--- a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix
+++ b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper
-, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype, glew
-, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, harfbuzz
+{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper
+, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz
, mcpp, wiiuse, angelscript
}:
+
let
dir = "stk-code";
assets = fetchsvn {
url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
- rev = "18212";
- sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf";
+ rev = "18218";
+ sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw";
name = "stk-assets";
};
@@ -33,17 +33,19 @@ let
"libraqm"
# Not packaged to this date
"libsquish"
+ # Not packaged to this date
+ "sheenbidi"
];
in stdenv.mkDerivation rec {
pname = "supertuxkart";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "supertuxkart";
repo = "stk-code";
rev = version;
- sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp";
+ sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6";
name = dir;
};
@@ -53,12 +55,10 @@ in stdenv.mkDerivation rec {
find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
'';
- nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ];
+ nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
- libX11 libXrandr
- openal freealut libGLU libGL libvorbis libogg zlib freetype glew
- curl fribidi bluez libjpeg libpng harfbuzz
+ SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz
mcpp wiiuse angelscript
];
@@ -68,6 +68,7 @@ in stdenv.mkDerivation rec {
"-DCHECK_ASSETS=OFF"
"-DUSE_SYSTEM_WIIUSE=ON"
"-DUSE_SYSTEM_ANGELSCRIPT=ON"
+ "-DOpenGL_GL_PREFERENCE=GLVND"
];
# Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds
diff --git a/third_party/nixpkgs/pkgs/games/tdm/default.nix b/third_party/nixpkgs/pkgs/games/tdm/default.nix
deleted file mode 100644
index 98b7ecdc47..0000000000
--- a/third_party/nixpkgs/pkgs/games/tdm/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ stdenv, fetchurl, binutils-unwrapped, sconsPackages, gnum4, p7zip, glibc_multi, mesa
-, xorg, libGLU, libGL, openal
-, lib, makeWrapper, makeDesktopItem }:
-
-let
- pname = "tdm";
- version = "2.08";
-
- desktop = makeDesktopItem {
- desktopName = pname;
- name = pname;
- exec = "@out@/bin/${pname}";
- icon = pname;
- terminal = "false";
- comment = "The Dark Mod - stealth FPS inspired by the Thief series";
- type = "Application";
- categories = "Game;";
- genericName = pname;
- fileValidation = false;
- };
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
- src = fetchurl {
- url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
- sha256 = "0bmv07j6s6q3m7hnpx7cwrycjkbvlf0y9sg9migakni0jg9yz5ps";
- };
- nativeBuildInputs = [
- p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper
- ];
- buildInputs = [
- glibc_multi mesa.dev xorg.libX11.dev openal
- xorg.libXext.dev xorg.libXxf86vm.dev
- libGL libGLU
- ];
- unpackPhase = ''
- 7z x $src
- '';
-
- # I'm pretty sure there's a better way to build 2 targets than a random hook
- preBuild = ''
- pushd tdm_update
- scons BUILD=release TARGET_ARCH=x64
- install -Dm755 bin/tdm_update.linux64 $out/share/libexec/tdm_update.linux
- popd
- '';
-
- # why oh why can it find ld but not strip?
- postPatch = ''
- sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct
- # This adds math.h needed for math::floor
- sed -i 's|#include "Util.h"|#include "Util.h"\n#include |' tdm_update/ConsoleUpdater.cpp
- '';
-
- installPhase = ''
- runHook preInstall
-
- install -Dm644 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
- substituteInPlace $out/share/applications/${pname}.desktop --subst-var out
- install -Dm755 thedarkmod.x64 $out/share/libexec/tdm
-
- # The package doesn't install assets, these get installed by running tdm_update.linux
- # Provide a script that runs tdm_update.linux on first launch
- install -Dm755 <(cat <<'EOF'
-#!/bin/sh
-set -e
-DIR="$HOME/.local/share/tdm"
-mkdir -p "$DIR"
-cd "$DIR"
-exec "PKGDIR/share/libexec/tdm_update.linux" --noselfupdate
-EOF
- ) $out/bin/tdm_update
-
- install -Dm755 <(cat <<'EOF'
-#!/bin/sh
-set -e
-DIR="$HOME/.local/share/tdm"
-if [ ! -d "$DIR" ]; then
- echo "Please run tdm_update to (re)download game data"
-else
- cd "$DIR"
- exec "PKGDIR/share/libexec/tdm"
-fi
-EOF
- ) $out/bin/tdm
- sed -i "s!PKGDIR!$out!g" $out/bin/tdm_update
- sed -i "s!PKGDIR!$out!g" $out/bin/tdm
-
- runHook postInstall
- '';
-
- postInstall = ''
- wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU ]}
- '';
-
- enableParallelBuilding = true;
- sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ];
- NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
- meta = with stdenv.lib; {
- description = "The Dark Mod - stealth FPS inspired by the Thief series";
- homepage = "http://www.thedarkmod.com";
- license = licenses.gpl3;
- maintainers = with maintainers; [ cizra ];
- platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test.
- };
-}
diff --git a/third_party/nixpkgs/pkgs/games/xonotic/default.nix b/third_party/nixpkgs/pkgs/games/xonotic/default.nix
index 60ebdcf8ee..6f7ee6962b 100644
--- a/third_party/nixpkgs/pkgs/games/xonotic/default.nix
+++ b/third_party/nixpkgs/pkgs/games/xonotic/default.nix
@@ -45,7 +45,7 @@ let
desktopItem = makeDesktopItem {
name = "xonotic";
- exec = "$out/bin/xonotic";
+ exec = "xonotic";
comment = meta.description;
desktopName = "Xonotic";
categories = "Game;Shooter;";
diff --git a/third_party/nixpkgs/pkgs/misc/barebox/default.nix b/third_party/nixpkgs/pkgs/misc/barebox/default.nix
new file mode 100644
index 0000000000..78d4228abb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/barebox/default.nix
@@ -0,0 +1,96 @@
+{ stdenv
+, lib
+, fetchurl
+, bison
+, dtc
+, flex
+, libusb1
+, lzop
+, openssl
+, pkgconfig
+, buildPackages
+}:
+
+let
+ buildBarebox = {
+ filesToInstall
+ , installDir ? "$out"
+ , defconfig
+ , extraMeta ? {}
+ , ... } @ args: stdenv.mkDerivation rec {
+ pname = "barebox-${defconfig}";
+
+ version = "2020.12.0";
+
+ src = fetchurl {
+ url = "https://www.barebox.org/download/barebox-${version}.tar.bz2";
+ sha256 = "06vsd95ihaa2nywpqy6k0c7xwk2pzws4yvbp328yd2pfiigachrv";
+ };
+
+ postPatch = ''
+ patchShebangs scripts
+ '';
+
+ nativeBuildInputs = [
+ bison
+ dtc
+ flex
+ openssl
+ libusb1
+ lzop
+ pkgconfig
+ ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ hardeningDisable = [ "all" ];
+
+ makeFlags = [
+ "DTC=dtc"
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ];
+
+ configurePhase = ''
+ runHook preConfigure
+
+ make ${defconfig}
+
+ runHook postConfigure
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p ${installDir}
+ cp ${lib.concatStringsSep " " filesToInstall} ${installDir}
+
+ runHook postInstall
+ '';
+
+ enableParallelBuilding = true;
+
+ dontStrip = true;
+
+ meta = with lib; {
+ homepage = "https://www.barebox.org";
+ description = "The Swiss Army Knive for bare metal";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ emantor ];
+ } // extraMeta;
+ } // removeAttrs args [ "extraMeta" ];
+
+in {
+ inherit buildBarebox;
+
+ bareboxTools = buildBarebox {
+ defconfig = "hosttools_defconfig";
+ installDir = "$out/bin";
+ extraMeta.platforms = lib.platforms.linux;
+ filesToInstall = [
+ "scripts/bareboximd"
+ "scripts/imx/imx-usb-loader"
+ "scripts/omap4_usbboot"
+ "scripts/omap3-usb-loader"
+ "scripts/kwboot"
+ ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix
index 9946f49932..c7fc859576 100644
--- a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "gutenprint-5.2.14";
+ name = "gutenprint-5.3.4";
src = fetchurl {
url = "mirror://sourceforge/gimp-print/${name}.tar.bz2";
- sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5";
+ sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/craftos-pc/default.nix
new file mode 100644
index 0000000000..42fb33051e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/craftos-pc/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }:
+
+let
+ craftos2-lua = fetchFromGitHub {
+ owner = "MCJack123";
+ repo = "craftos2-lua";
+ rev = "v2.4.4";
+ sha256 = "1q63ki4sxx8bxaa6ag3xj153p7a8a12ivm0k33k935p41k6y2k64";
+ };
+in
+
+stdenv.mkDerivation rec {
+ pname = "craftos-pc";
+ version = "2.4.5";
+
+ src = fetchFromGitHub {
+ owner = "MCJack123";
+ repo = "craftos2";
+ rev = "v${version}";
+ sha256 = "00a4p365krbdprlv4979d13mm3alhxgzzj3vqz2g67795plf64j4";
+ };
+
+ buildInputs = [ poco openssl SDL2 SDL2_mixer ];
+
+ preBuild = ''
+ cp -R ${craftos2-lua}/* ./craftos2-lua/
+ chmod -R u+w ./craftos2-lua
+ make -C craftos2-lua linux
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ DESTDIR=$out/bin make install
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An implementation of the CraftOS-PC API written in C++ using SDL";
+ homepage = "https://www.craftos-pc.cc";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.siraben ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dgen-sdl/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dgen-sdl/default.nix
new file mode 100644
index 0000000000..1eabf5b53b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/dgen-sdl/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, fetchurl
+, libarchive
+, doxygen
+, SDL
+}:
+
+let
+ pname = "dgen-sdl";
+ version = "1.33";
+in stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz";
+ hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4=";
+ };
+
+ buildInputs = [ SDL libarchive ];
+
+ configureFlags = [
+ "--enable-joystick"
+ "--enable-debugger"
+ "--enable-debug-vdp"
+ "--enable-pico" # experimental
+ "--enable-vgmdump"
+ "--with-star=no" # Needs ASM support
+ "--with-musa"
+ "--with-cyclone=no" # Needs ASM support
+ "--with-mz80"
+ "--with-cz80"
+ "--with-drz80=no" # Needs ASM support
+ "--with-dz80"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://dgen.sourceforge.net/";
+ description = "Sega Genesis/Mega Drive emulator";
+ longDescription = ''
+ DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive
+ systems. DGen was originally written by Dave, then ported to SDL by Joe
+ Groff and Phil K. Hornung in 1998.
+
+ It features:
+
+ - Game Genie/Hex codes support
+ - PAL/NTSC, fullscreen modes
+ - Joypad/joystick support
+ - Mouse support
+ - Highly configurable controls
+ - OpenGL textured video output
+ - Portable (64‐bit, endian safe), runs in Windows using MinGW
+ - Screenshots, demos recording and playback
+ - Musashi (generic) and StarScream (x86‐only) CPU cores
+ - Cyclone 68000 and DrZ80 (both ARM‐only) CPU cores
+ - CZ80 (generic) and MZ80 (generic and x86‐only versions)
+ - 16‐bit, 8000 to 48000Hz sound output
+ - Support for 8, 15, 16, 24 and 32 bpp modes
+ - Archived/compressed ROMs support
+ - M68K debugger (contributed by Edd Barrett)
+ - Z80 debugger
+ - hqx and scale2x upscaling filters
+ - VGM dumping
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; unix;
+ };
+}
+# TODO: implement configure options
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix
index 94fbeba0e0..e5c972e079 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/melonDS/default.nix
@@ -1,41 +1,42 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, mkDerivation
+, cmake
+, pkgconfig
+, SDL2
+, qtbase
+, libpcap
+, libslirp
+, wrapGAppsHook
+}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "melonDS";
- version = "0.8.3";
- ## When updating to the release after 0.8.3,
- ## - Uncomment:
- ## cmakeFlags = [ "-UUNIX_PORTABLE" ];
- ## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin
- ## (see https://github.com/Arisotura/melonDS/pull/546)
+ version = "0.9";
src = fetchFromGitHub {
owner = "Arisotura";
repo = pname;
rev = version;
- sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn";
+ sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
- buildInputs = [ SDL2 gtk3 libpcap ];
+ buildInputs = [
+ SDL2
+ qtbase
+ libpcap
+ libslirp
+ ];
- postInstall = ''
- install -Dm644 -t $out/share/melonDS/ ../romlist.bin
- install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop
-
- for i in ../icon/melon_*.png; do
- d="''${i##*_}"
- d="$out/share/icons/hicolor/''${d%.png}/apps"
- install -D $i "$d/net.kuribo64.melonds.png"
- done
- '';
+ cmakeFlags = [ "-UUNIX_PORTABLE" ];
meta = with stdenv.lib; {
homepage = "http://melonds.kuribo64.net/";
description = "Work in progress Nintendo DS emulator";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ artemist benley ];
+ maintainers = with maintainers; [ artemist benley shamilton ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/reicast/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/reicast/default.nix
new file mode 100644
index 0000000000..c9dff7217d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/reicast/default.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, curl
+, alsaLib
+, libGLU
+, libX11
+, libevdev
+, udev
+, libpulseaudio
+}:
+
+stdenv.mkDerivation rec {
+ pname = "reicast";
+ version = "20.04";
+
+ src = fetchFromGitHub {
+ owner = "reicast";
+ repo = "reicast-emulator";
+ rev = "r${version}";
+ sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [
+ curl
+ alsaLib
+ libGLU
+ libX11
+ libevdev
+ udev
+ libpulseaudio
+ ];
+
+ # No rule to make target 'install'
+ installPhase = ''
+ runHook preInstall
+
+ install -D ./reicast $out/bin/reicast
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://reicast.com/";
+ description = "A multi-platform Sega Dreamcast emulator";
+ license = with licenses; [ bsd3 gpl2Only lgpl2Only ];
+ platforms = ["x86_64-linux" ];
+ maintainers = [ maintainers.ivar ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
index f71420674e..c672a9bf6b 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix
@@ -7,8 +7,8 @@
}:
let
- majorVersion = "0.0.8";
- gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
+ majorVersion = "0.0.12";
+ gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
mkDerivation {
pname = "rpcs3";
@@ -17,12 +17,13 @@ mkDerivation {
src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "v${majorVersion}";
- sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
+ sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x";
};
preConfigure = ''
cat > ./rpcs3/git-version.h < 0) {
- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+@@ -201,3 +197,3 @@
+ retval = PAM_SUCCESS;
+- pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++ pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+
+@@ -211,11 +208,12 @@
/*
* this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
*/
- if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */
-- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+- pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+ const char *key_file;
+ if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */
-+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
++ pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, key_file);
retval = PAM_SUCCESS;
} else {
- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
index 466e66a871..4942710f75 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ncurses, pkgconfig
+{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkgconfig
# `ps` with systemd support is able to properly report different
# attributes like unit name, so we want to have it on linux.
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj";
};
+ patches = [
+ (fetchpatch {
+ url = "https://gitlab.com/procps-ng/procps/-/commit/bb96fc42956c9ed926a1b958ab715f8b4a663dec.diff";
+ sha256 = "0fzsb6ns3fvrszyzsz28qvbmcn135ilr4nwh2z1a0vlpl2fw961z";
+ name = "sysconf-argmax-sanity.patch";
+ })
+ ];
+
buildInputs = [ ncurses ]
++ lib.optional withSystemd systemd;
nativeBuildInputs = [ pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
index a71e7ef0dc..5a19fbec24 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "psftools";
- version = "1.0.13";
+ version = "1.0.14";
src = fetchurl {
url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz";
- sha256 = "0rgg1lhryqi6sgm4afhw0z6pjivdw4hyhpxanj8rabyabn4fcqcw";
+ sha256 = "17nia5n5rabbh42gz51c8y53rjwddria4j3wvzk8dd0llj7k1y6w";
};
outputs = ["out" "man" "dev" "lib"];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
and PSF2 (any width) formats are supported; the default output
format is PSF2.
'';
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ kaction ];
};
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
index 7399ac9058..59cc59d771 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
-, docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison
+{ stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
+, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison
, pam ? null, glibcCross ? null
}:
@@ -86,5 +86,6 @@ stdenv.mkDerivation rec {
passthru = {
shellPath = "/bin/nologin";
+ tests = { inherit (nixosTests) shadow; };
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index 1f75fc63ff..b3b241b570 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,4 +1,4 @@
-From 46c8ccfeb61253cd3dff5f34013670c7e3366ef5 Mon Sep 17 00:00:00 2001
+From dd2ec741aaa7c587eb7719bbf4b305fe28168b77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Tue, 8 Jan 2013 15:46:30 +0100
Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices
@@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...)
1 file changed, 4 deletions(-)
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index 1c60eec587..b2486da130 100644
+index d2f595d18e..941a7c1ba3 100644
--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd"
@@ -28,5 +28,5 @@ index 1c60eec587..b2486da130 100644
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 7c025cbb7d..1f3a1b6468 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -1,4 +1,4 @@
-From 139c420de62e078182eaf48b541c4b912d445fd9 Mon Sep 17 00:00:00 2001
+From ab3dab997695db5346f8efbf8566ac96612f0c6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Fri, 12 Apr 2013 13:16:57 +0200
Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store
@@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126
2 files changed, 4 insertions(+)
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index 806dda8475..0220741c91 100644
+index 292b97cd69..791b8e6b7e 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -25,10 +25,10 @@ index 806dda8475..0220741c91 100644
"/etc"))
return true;
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 8a5e80eeaa..fab35ed6f3 100644
+index 3a72a13e1a..541320dc9d 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
-@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) {
+@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) {
static bool nonunmountable_path(const char *path) {
return path_equal(path, "/")
@@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644
|| path_equal(path, "/usr")
#endif
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 1f0b8aaf38..56f52b9971 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -1,4 +1,4 @@
-From a889dbe796cd72425f38dec3d2aaab44a914ac60 Mon Sep 17 00:00:00 2001
+From 3581f8f30270e6340c671a640fe551e954715f8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Wed, 16 Apr 2014 10:59:28 +0200
Subject: [PATCH 03/18] Fix NixOS containers
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 43712565c2..07f294c78a 100644
+index 0842731c18..f790853104 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
+@@ -5319,6 +5319,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -21,7 +21,7 @@ index 43712565c2..07f294c78a 100644
const char *p, *q;
if (arg_pivot_root_new)
-@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
+@@ -5333,6 +5334,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}
@@ -30,5 +30,5 @@ index 43712565c2..07f294c78a 100644
} else {
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
index f9e7bc9d87..4d3729556d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -1,4 +1,4 @@
-From 5098b1aad07356e04fcd12f2c77ea4fd17460411 Mon Sep 17 00:00:00 2001
+From 12b63d8c1d2ca85d9bb7ea07e8eb5e623e1b58e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Thu, 1 May 2014 14:10:10 +0200
Subject: [PATCH 04/18] Look for fsck in the right place
@@ -8,10 +8,10 @@ Subject: [PATCH 04/18] Look for fsck in the right place
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 80f7107b9d..74e48a385f 100644
+index 04752fe9dc..ad0ccf91c0 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
-@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) {
+@@ -369,7 +369,7 @@ static int run(int argc, char *argv[]) {
} else
dash_c[0] = 0;
@@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644
cmdline[i++] = "-T";
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
index 91d6fbf41d..476ebe06e7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
@@ -1,4 +1,4 @@
-From b46f1b20e990f01af4bdf3dd6fef45f5b4a5993e Mon Sep 17 00:00:00 2001
+From 6ede8baac88aba769030f5bc5f5b2070098c7428 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Fri, 19 Dec 2014 14:46:17 +0100
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
@@ -15,7 +15,7 @@ Also, remove /usr and /lib as these don't exist on NixOS.
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
-index 52968dee34..bba2eb09b8 100644
+index 96b82170d0..b9fbed5c61 100644
--- a/src/basic/path-lookup.c
+++ b/src/basic/path-lookup.c
@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
@@ -102,7 +102,7 @@ index 52968dee34..bba2eb09b8 100644
if (!add)
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index 8424837824..b1c541bc52 100644
+index f2c045511d..ccb382e421 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
@@ -120,5 +120,5 @@ index 8424837824..b1c541bc52 100644
systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
index 8021472ea3..99e68c37c2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -1,4 +1,4 @@
-From 4c9f9d192182f1051dba1c547e182e7c8f549b0f Mon Sep 17 00:00:00 2001
+From 3aeb3a10c4a7ad387b004bf41efbd171913bcca9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra
Date: Mon, 11 May 2015 15:39:38 +0200
Subject: [PATCH 06/18] Get rid of a useless message in user sessions
@@ -13,10 +13,10 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 1bda568560..5b44970763 100644
+index 45a417a090..8af3cb08d6 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
-@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) {
+@@ -2163,7 +2163,8 @@ static void unit_check_binds_to(Unit *u) {
}
assert(other);
@@ -27,5 +27,5 @@ index 1bda568560..5b44970763 100644
/* A unit we need to run is gone. Sniff. Let's stop this. */
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 6c24821c2a..aeb734f94d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -1,4 +1,4 @@
-From 539f3af04963a6826d2b2d0ba2095af99a7a6294 Mon Sep 17 00:00:00 2001
+From a1454e8edb7a1a87093808dc7db540232147df3d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner
Date: Sun, 6 Dec 2015 14:26:36 +0100
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
@@ -11,10 +11,10 @@ Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
3 files changed, 25 insertions(+)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 7f6607a527..b5a9388916 100644
+index a1794bdab1..77134731e1 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
-@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -643,6 +643,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
if (r < 0)
return r;
@@ -24,7 +24,7 @@ index 7f6607a527..b5a9388916 100644
name = empty_to_null(name);
context_read_etc_hostname(c);
-@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -702,6 +705,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
if (r < 0)
return r;
@@ -35,7 +35,7 @@ index 7f6607a527..b5a9388916 100644
context_read_machine_info(c);
diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 715ce5cac7..014f7dcf6c 100644
+index 736dacdee9..53e0ee935e 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
@@ -69,7 +69,7 @@ index 715ce5cac7..014f7dcf6c 100644
model = empty_to_null(model);
variant = empty_to_null(variant);
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index c467b85477..3e78b2f575 100644
+index 8bfcfd5cdc..a0ee03f134 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
@@ -93,7 +93,7 @@ index c467b85477..3e78b2f575 100644
if (lrtc == c->local_rtc)
return sd_bus_reply_method_return(m, NULL);
-@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -905,6 +912,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
if (r < 0)
return r;
@@ -104,5 +104,5 @@ index c467b85477..3e78b2f575 100644
if (r < 0)
return r;
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
index 7b17c3bcb2..0da52477bb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
@@ -1,4 +1,4 @@
-From 5c2a1a6d33f7cdbcb8ddcc70b91ba4c7f3c383b3 Mon Sep 17 00:00:00 2001
+From 27680c555713e36d16198fc5f60b0f85e0777d30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 7 Jul 2016 02:47:13 +0300
Subject: [PATCH 08/18] Fix hwdb paths
@@ -9,7 +9,7 @@ Patch by vcunat.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
-index b3febdbb31..eba00a5bc7 100644
+index cb3c77ce96..7b8c80071f 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
@@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644
_public_ int sd_hwdb_new(sd_hwdb **ret) {
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index e0fab399fe..2b05cea435 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -1,4 +1,4 @@
-From a8ccba372d865429b578e72fd104a693b96101b3 Mon Sep 17 00:00:00 2001
+From b423ce2560bd380abd80796a890454d95cd8926c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Tue, 11 Oct 2016 13:12:08 +0300
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
@@ -13,7 +13,7 @@ NixOS uses this path.
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/man/localtime.xml b/man/localtime.xml
-index 0f1652ee2e..71c4f95c2e 100644
+index 73c1b8e5a3..4ab4276283 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -20,7 +20,7 @@
@@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644
Etc/UTC . The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 15cc1b8851..d0abde5933 100644
+index 5318d6378d..04069dc27b 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
-@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
+@@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) {
n_allocated = 2;
n_zones = 1;
@@ -47,7 +47,7 @@ index 15cc1b8851..d0abde5933 100644
if (f) {
for (;;) {
_cleanup_free_ char *line = NULL;
-@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
+@@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return false;
@@ -56,7 +56,7 @@ index 15cc1b8851..d0abde5933 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0) {
-@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
+@@ -1470,7 +1470,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@@ -66,10 +66,10 @@ index 15cc1b8851..d0abde5933 100644
return -EINVAL;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index c9fc8dd5cd..44fc04dc88 100644
+index 742b43f9fc..f2cb121816 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
-@@ -460,7 +460,7 @@ static int process_timezone(void) {
+@@ -459,7 +459,7 @@ static int process_timezone(void) {
if (isempty(arg_timezone))
return 0;
@@ -79,10 +79,10 @@ index c9fc8dd5cd..44fc04dc88 100644
(void) mkdir_parents(etc_localtime, 0755);
if (symlink(e, etc_localtime) < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 07f294c78a..cf86d1f494 100644
+index f790853104..74b51f4d28 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
+@@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
static const char *timezone_from_path(const char *path) {
return PATH_STARTSWITH_SET(
path,
@@ -94,7 +94,7 @@ index 07f294c78a..cf86d1f494 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 3e78b2f575..de5477a08f 100644
+index a0ee03f134..9ecacad25e 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
@@ -128,5 +128,5 @@ index 3e78b2f575..de5477a08f 100644
return -ENOMEM;
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
index 44ed04d9e7..1d17bc4cf7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -1,4 +1,4 @@
-From 84a2d35d4e75295edf7e190a94dfaf65db4973b6 Mon Sep 17 00:00:00 2001
+From aff592e0bf9a911e7f44ce07b66517c38456b627 Mon Sep 17 00:00:00 2001
From: Imuli
Date: Wed, 19 Oct 2016 08:46:47 -0400
Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*
@@ -10,7 +10,7 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index e0664de826..c521f33a2a 100644
+index 7d2e887660..91c5139eed 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
@@ -23,5 +23,5 @@ index e0664de826..c521f33a2a 100644
return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
index e5d4f1701b..8c185c52a2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
@@ -1,4 +1,4 @@
-From 81ee9b5cd46f78de139c39e2a18f39e658c60169 Mon Sep 17 00:00:00 2001
+From d410a7a6d1bb0fe730c3ef690676232bfaa49f85 Mon Sep 17 00:00:00 2001
From: Franz Pletz
Date: Sun, 11 Feb 2018 04:37:44 +0100
Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
@@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
-index ba9e7afe53..2ef9d4d770 100644
+index f406d595e6..f05f579816 100644
--- a/meson.build
+++ b/meson.build
-@@ -3371,9 +3371,6 @@ install_data('LICENSE.GPL2',
+@@ -3517,9 +3517,6 @@ install_data('LICENSE.GPL2',
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
install_dir : docdir)
@@ -22,5 +22,5 @@ index ba9e7afe53..2ef9d4d770 100644
check_help = find_program('tools/check-help.sh')
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
deleted file mode 100644
index a2d08753d4..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From 7dbe84b7c43669dccd90db8ac33c38a70e6b6914 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
-Date: Mon, 26 Feb 2018 14:25:57 +0000
-Subject: [PATCH 12/18] Install default configuration into $out/share/factory
-
-By default systemd should read all its configuration from /etc. Therefor
-we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately
-this would also lead to installation of systemd's own configuration
-files to `/etc` whereas we are limited to /nix/store. To counter that
-this commit introduces two new configuration variables `factoryconfdir`
-and `factorypkgconfdir` to install systemd's own configuration into nix
-store again, while having executables looking up files in /etc.
----
- hwdb.d/meson.build | 2 +-
- meson.build | 11 +++++++----
- network/meson.build | 2 +-
- src/core/meson.build | 10 +++++-----
- src/coredump/meson.build | 2 +-
- src/home/meson.build | 2 +-
- src/journal-remote/meson.build | 4 ++--
- src/journal/meson.build | 2 +-
- src/kernel-install/meson.build | 2 +-
- src/login/meson.build | 2 +-
- src/network/meson.build | 2 +-
- src/pstore/meson.build | 2 +-
- src/resolve/meson.build | 2 +-
- src/timesync/meson.build | 2 +-
- src/udev/meson.build | 4 ++--
- sysctl.d/meson.build | 2 +-
- tmpfiles.d/meson.build | 2 +-
- units/meson.build | 2 +-
- 18 files changed, 30 insertions(+), 27 deletions(-)
-
-diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
-index 5c77387a26..6404bc01ba 100644
---- a/hwdb.d/meson.build
-+++ b/hwdb.d/meson.build
-@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1
- install_dir : udevhwdbdir)
-
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d')))
-
- meson.add_install_script('sh', '-c',
- 'test -n "$DESTDIR" || @0@/systemd-hwdb update'
-diff --git a/meson.build b/meson.build
-index 2ef9d4d770..ae7acbd769 100644
---- a/meson.build
-+++ b/meson.build
-@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
- catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
- kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
- factorydir = join_paths(datadir, 'factory')
-+factoryconfdir = join_paths(datadir, 'factory/etc')
-+factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd')
-+factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d')
- bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
- testsdir = join_paths(prefixdir, 'lib/systemd/tests')
- systemdstatedir = join_paths(localstatedir, 'lib/systemd')
-@@ -2653,7 +2656,7 @@ if conf.get('ENABLE_BINFMT') == 1
- meson.add_install_script('sh', '-c',
- mkdir_p.format(binfmtdir))
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d')))
- endif
-
- if conf.get('ENABLE_REPART') == 1
-@@ -2769,7 +2772,7 @@ executable(
- install_dir : rootlibexecdir)
-
- install_data('src/sleep/sleep.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- public_programs += executable(
- 'systemd-sysctl',
-@@ -3103,7 +3106,7 @@ if conf.get('HAVE_KMOD') == 1
- meson.add_install_script('sh', '-c',
- mkdir_p.format(modulesloaddir))
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d')))
- endif
-
- public_programs += executable(
-@@ -3354,7 +3357,7 @@ install_subdir('factory/etc',
- install_dir : factorydir)
-
- install_data('xorg/50-systemd-user.sh',
-- install_dir : xinitrcdir)
-+ install_dir : factoryxinitrcdir)
- install_data('modprobe.d/systemd.conf',
- install_dir : modprobedir)
- install_data('LICENSE.GPL2',
-diff --git a/network/meson.build b/network/meson.build
-index 99a650eac3..8105a4e48d 100644
---- a/network/meson.build
-+++ b/network/meson.build
-@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1
- install_dir : networkdir)
-
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'systemd/network')))
- endif
-
- install_data('99-default.link',
-diff --git a/src/core/meson.build b/src/core/meson.build
-index fa95108523..60ee0e31c1 100644
---- a/src/core/meson.build
-+++ b/src/core/meson.build
-@@ -183,8 +183,8 @@ libcore = static_library(
- systemd_sources = files('main.c')
-
- in_files = [['macros.systemd', rpmmacrosdir],
-- ['system.conf', pkgsysconfdir],
-- ['user.conf', pkgsysconfdir],
-+ ['system.conf', factorypkgconfdir],
-+ ['user.conf', factorypkgconfdir],
- ['systemd.pc', pkgconfigdatadir],
- ['triggers.systemd', '']]
-
-@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
- meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
- meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
-
--meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system')))
--meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
--meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
-+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'system')))
-+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'user')))
-+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'xdg/systemd')))
-diff --git a/src/coredump/meson.build b/src/coredump/meson.build
-index 7fa5942697..34c865dfa0 100644
---- a/src/coredump/meson.build
-+++ b/src/coredump/meson.build
-@@ -15,7 +15,7 @@ coredumpctl_sources = files('coredumpctl.c')
-
- if conf.get('ENABLE_COREDUMP') == 1
- install_data('coredump.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
- endif
-
- tests += [
-diff --git a/src/home/meson.build b/src/home/meson.build
-index 797f3a3c6d..232904ab42 100644
---- a/src/home/meson.build
-+++ b/src/home/meson.build
-@@ -98,5 +98,5 @@ if conf.get('ENABLE_HOMED') == 1
- install_dir : polkitpolicydir)
-
- install_data('homed.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factoryconfdir)
- endif
-diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
-index 87b8ba6495..daff8ec967 100644
---- a/src/journal-remote/meson.build
-+++ b/src/journal-remote/meson.build
-@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1
- output : 'journal-upload.conf',
- configuration : substs)
- install_data(journal_upload_conf,
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
- endif
-
- if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
-@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
- output : 'journal-remote.conf',
- configuration : substs)
- install_data(journal_remote_conf,
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- install_data('browse.html',
- install_dir : join_paths(pkgdatadir, 'gatewayd'))
-diff --git a/src/journal/meson.build b/src/journal/meson.build
-index 5796f77cac..75d975c260 100644
---- a/src/journal/meson.build
-+++ b/src/journal/meson.build
-@@ -109,7 +109,7 @@ if conf.get('HAVE_QRENCODE') == 1
- endif
-
- install_data('journald.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- if get_option('create-log-dirs')
- meson.add_install_script(
-diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
-index 9ae342dfba..65df666337 100644
---- a/src/kernel-install/meson.build
-+++ b/src/kernel-install/meson.build
-@@ -14,5 +14,5 @@ if want_kernel_install
- install_dir : kernelinstalldir)
-
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
- endif
-diff --git a/src/login/meson.build b/src/login/meson.build
-index 0a7d3d5440..ff90149c1c 100644
---- a/src/login/meson.build
-+++ b/src/login/meson.build
-@@ -75,7 +75,7 @@ if conf.get('ENABLE_LOGIND') == 1
- output : 'logind.conf',
- configuration : substs)
- install_data(logind_conf,
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- install_data('org.freedesktop.login1.conf',
- install_dir : dbuspolicydir)
-diff --git a/src/network/meson.build b/src/network/meson.build
-index b3a88d9910..be56d1e9d7 100644
---- a/src/network/meson.build
-+++ b/src/network/meson.build
-@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1
- endif
-
- install_data('networkd.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- fuzzers += [
- [['src/network/fuzz-netdev-parser.c',
-diff --git a/src/pstore/meson.build b/src/pstore/meson.build
-index adbac24b54..e9dc88dfa2 100644
---- a/src/pstore/meson.build
-+++ b/src/pstore/meson.build
-@@ -6,5 +6,5 @@ systemd_pstore_sources = files('''
-
- if conf.get('ENABLE_PSTORE') == 1
- install_data('pstore.conf',
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
- endif
-diff --git a/src/resolve/meson.build b/src/resolve/meson.build
-index 92b67b6333..ac5b9a0b0a 100644
---- a/src/resolve/meson.build
-+++ b/src/resolve/meson.build
-@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1
- output : 'resolved.conf',
- configuration : substs)
- install_data(resolved_conf,
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
-
- install_data('resolv.conf',
- install_dir : rootlibexecdir)
-diff --git a/src/timesync/meson.build b/src/timesync/meson.build
-index e5c118c8db..19235df9ca 100644
---- a/src/timesync/meson.build
-+++ b/src/timesync/meson.build
-@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1
- output : 'timesyncd.conf',
- configuration : substs)
- install_data(timesyncd_conf,
-- install_dir : pkgsysconfdir)
-+ install_dir : factorypkgconfdir)
- install_data('org.freedesktop.timesync1.conf',
- install_dir : dbuspolicydir)
- install_data('org.freedesktop.timesync1.service',
-diff --git a/src/udev/meson.build b/src/udev/meson.build
-index aa23b07090..ad004d803a 100644
---- a/src/udev/meson.build
-+++ b/src/udev/meson.build
-@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'],
- endforeach
-
- install_data('udev.conf',
-- install_dir : join_paths(sysconfdir, 'udev'))
-+ install_dir : join_paths(factoryconfdir, 'udev'))
-
- configure_file(
- input : 'udev.pc.in',
-@@ -195,7 +195,7 @@ configure_file(
- install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
-
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d')))
-
- fuzzers += [
- [['src/udev/net/fuzz-link-parser.c',
-diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
-index 3f072e3db7..bd9f843eba 100644
---- a/sysctl.d/meson.build
-+++ b/sysctl.d/meson.build
-@@ -27,4 +27,4 @@ foreach file : in_files
- endforeach
-
- meson.add_install_script('sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d')))
-diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
-index 0a9582d8b9..3c56ca7d83 100644
---- a/tmpfiles.d/meson.build
-+++ b/tmpfiles.d/meson.build
-@@ -58,5 +58,5 @@ endforeach
- if enable_tmpfiles
- meson.add_install_script(
- 'sh', '-c',
-- mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
-+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))
- endif
-diff --git a/units/meson.build b/units/meson.build
-index 275daad3f4..491abd8eef 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -324,7 +324,7 @@ install_data('user-.slice.d/10-defaults.conf',
-
- meson.add_install_script(meson_make_symlink,
- join_paths(pkgsysconfdir, 'user'),
-- join_paths(sysconfdir, 'xdg/systemd/user'))
-+ join_paths(factorypkgconfdir, 'xdg/systemd/user'))
- meson.add_install_script(meson_make_symlink,
- join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
- join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
---
-2.28.0
-
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
similarity index 88%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
index 8df92b3e14..00d085d8a7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
@@ -1,7 +1,7 @@
-From 4cbc82570aa8671d260c37df58688cc07106e4b6 Mon Sep 17 00:00:00 2001
+From a569dc0bdb43edb79e338c897f06de2dfa81cfc7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold
Date: Fri, 2 Nov 2018 21:15:42 +0100
-Subject: [PATCH 13/18] inherit systemd environment when calling generators.
+Subject: [PATCH 12/18] inherit systemd environment when calling generators.
Systemd generators need access to the environment configured in
stage-2-init.sh since it schedules fsck and mkfs executions based on
@@ -16,10 +16,10 @@ executables that are being called from managers.
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 6b7908fc6c..dff265c76f 100644
+index 1f1450b97c..26b9e41d78 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
-@@ -4098,9 +4098,14 @@ static int manager_run_generators(Manager *m) {
+@@ -4111,9 +4111,14 @@ static int manager_run_generators(Manager *m) {
argv[4] = NULL;
RUN_WITH_UMASK(0022)
@@ -38,5 +38,5 @@ index 6b7908fc6c..dff265c76f 100644
finish:
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
similarity index 88%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
index bb7a9f9474..51fc4cc30d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
@@ -1,7 +1,7 @@
-From 1f39dba787e07d0a6944416ec172ee5d7cc86acd Mon Sep 17 00:00:00 2001
+From d36d688e32b8f2368499af091c67a7825fadf5ad Mon Sep 17 00:00:00 2001
From: Andreas Rammhold
Date: Thu, 9 May 2019 11:15:22 +0200
-Subject: [PATCH 14/18] add rootprefix to lookup dir paths
+Subject: [PATCH 13/18] add rootprefix to lookup dir paths
systemd does not longer use the UDEVLIBEXEC directory as root for
discovery default udev rules. By adding `$out/lib` to the lookup paths
@@ -12,7 +12,7 @@ files that I might have missed.
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/basic/def.h b/src/basic/def.h
-index 970654a1ad..bb261040f8 100644
+index 2e60abb4f1..732ec51d36 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -39,13 +39,15 @@
@@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644
#define CONF_PATHS(n) \
CONF_PATHS_USR(n) \
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
similarity index 85%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 86ab43c190..57499d1fee 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -1,7 +1,7 @@
-From f7c462d37063b0077345395f54377c39d1ef0590 Mon Sep 17 00:00:00 2001
+From c02b7eb62e46145ec5b544ebd9338c29b9b8f32c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 25 Jul 2019 20:45:55 +0300
-Subject: [PATCH 15/18] systemd-shutdown: execute scripts in
+Subject: [PATCH 14/18] systemd-shutdown: execute scripts in
/etc/systemd/system-shutdown
This is needed for NixOS to use such scripts as systemd directory is immutable.
@@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index 06c9710c6e..dadcc3117d 100644
+index 0d07865542..26d974ef73 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) {
@@ -23,5 +23,5 @@ index 06c9710c6e..dadcc3117d 100644
/* The log target defaults to console, but the original systemd process will pass its log target in through a
* command line argument, which will override this default. Also, ensure we'll never log to the journal or
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
similarity index 70%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 8d20b3723a..fa72b66911 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -1,7 +1,7 @@
-From ff7cfe2d112eb166cd1937c3cc8c25491e508313 Mon Sep 17 00:00:00 2001
+From f01b73709d68d4581ad561fbb20c59f895132a99 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Thu, 25 Jul 2019 20:46:58 +0300
-Subject: [PATCH 16/18] systemd-sleep: execute scripts in
+Subject: [PATCH 15/18] systemd-sleep: execute scripts in
/etc/systemd/system-sleep
This is needed for NixOS to use such scripts as systemd directory is immutable.
@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 600e9c23c0..66ef1a99e1 100644
+index 39ab554290..880ac7ccb0 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
-@@ -182,6 +182,7 @@ static int execute(char **modes, char **states) {
+@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) {
};
static const char* const dirs[] = {
SYSTEM_SLEEP_PATH,
@@ -22,5 +22,5 @@ index 600e9c23c0..66ef1a99e1 100644
};
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
similarity index 83%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
index 6dc33fd034..887864baec 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
@@ -1,7 +1,7 @@
-From 600ac2dd3fc15c5717fcdf8f37899fdabf97268c Mon Sep 17 00:00:00 2001
+From 3db343c08a09a0009da049f37e3f981519eac62f Mon Sep 17 00:00:00 2001
From: Florian Klink
Date: Sat, 7 Mar 2020 22:40:27 +0100
-Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty
+Subject: [PATCH 16/18] kmod-static-nodes.service: Update ConditionFileNotEmpty
On NixOS, kernel modules of the currently booted systems are located at
/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.
@@ -10,7 +10,7 @@ On NixOS, kernel modules of the currently booted systems are located at
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index 0971edf9ec..87105a87b9 100644
+index f4170d6a99..9a6a591bea 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel
@@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644
[Service]
Type=oneshot
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
similarity index 87%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index bf011f701e..ad92291c25 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -1,7 +1,7 @@
-From 42419ff4dc7a36607189f8d3765aa836d5c5eaf9 Mon Sep 17 00:00:00 2001
+From 6f0e9a60dcd2160bcab01366bd521630f6f5dc76 Mon Sep 17 00:00:00 2001
From: Florian Klink
Date: Sun, 8 Mar 2020 01:05:54 +0100
-Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
+Subject: [PATCH 17/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
This will be the $PATH used to lookup ExecStart= etc. options, which
systemd itself uses extensively.
@@ -10,7 +10,7 @@ systemd itself uses extensively.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index 30031fca8e..d97145539a 100644
+index d613709f0b..5cced4c115 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -24,11 +24,11 @@
@@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644
#if HAVE_SPLIT_USR
# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
similarity index 82%
rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch
rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
index 4f8cc0822d..52a749a16b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
@@ -1,7 +1,7 @@
-From 3999d8949ddaf9296928f603661abcea13576d83 Mon Sep 17 00:00:00 2001
+From 120b53a3279ba098ee8e5a346b39cb2b7ef4a106 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Mon, 26 Oct 2020 21:21:38 +0100
-Subject: [PATCH 19/19] logind-seat-debus: show CanMultiSession again
+Subject: [PATCH 18/18] logind-seat-debus: show CanMultiSession again
Fixes the "switch user" function in Plasma < 5.20.
---
@@ -9,10 +9,10 @@ Fixes the "switch user" function in Plasma < 5.20.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
-index a91765205c..742aeb1064 100644
+index a60ed2d3c2..69b6271075 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
-@@ -451,7 +451,7 @@ static const sd_bus_vtable seat_vtable[] = {
+@@ -450,7 +450,7 @@ static const sd_bus_vtable seat_vtable[] = {
SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
@@ -22,5 +22,5 @@ index a91765205c..742aeb1064 100644
SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
--
-2.28.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch
new file mode 100644
index 0000000000..11e6195932
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch
@@ -0,0 +1,72 @@
+From cd5b1075499b8498d9c700a317ad11a3199c447a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
+Date: Sun, 6 Dec 2020 08:34:19 +0100
+Subject: [PATCH 19/19] Revert "pkg-config: prefix is not really configurable,
+ don't pretend it was"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 6e65df89c348242dbd10036abc7dd5e8181cf733.
+
+Signed-off-by: Jörg Thalheim
+---
+ src/core/systemd.pc.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
+index ccb382e421..8a35e53a4a 100644
+--- a/src/core/systemd.pc.in
++++ b/src/core/systemd.pc.in
+@@ -11,7 +11,7 @@
+ # considered deprecated (though there is no plan to remove them). New names
+ # shall have underscores.
+
+-prefix=/usr
++prefix=@prefix@
+ root_prefix=@rootprefix_noslash@
+ rootprefix=${root_prefix}
+ sysconf_dir=@sysconfdir@
+@@ -26,10 +26,10 @@ systemdsystemunitdir=${systemd_system_unit_dir}
+ systemd_system_preset_dir=${rootprefix}/lib/systemd/system-preset
+ systemdsystempresetdir=${systemd_system_preset_dir}
+
+-systemd_user_unit_dir=/usr/lib/systemd/user
++systemd_user_unit_dir=${prefix}/lib/systemd/user
+ systemduserunitdir=${systemd_user_unit_dir}
+
+-systemd_user_preset_dir=/usr/lib/systemd/user-preset
++systemd_user_preset_dir=${prefix}/lib/systemd/user-preset
+ systemduserpresetdir=${systemd_user_preset_dir}
+
+ systemd_system_conf_dir=${sysconfdir}/systemd/system
+@@ -48,7 +48,7 @@ systemduserunitpath=${systemd_user_unit_path}
+ systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
+ systemdsystemgeneratordir=${systemd_system_generator_dir}
+
+-systemd_user_generator_dir=/usr/lib/systemd/user-generators
++systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
+ systemdusergeneratordir=${systemd_user_generator_dir}
+
+ systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
+@@ -63,7 +63,7 @@ systemdsleepdir=${systemd_sleep_dir}
+ systemd_shutdown_dir=${root_prefix}/lib/systemd/system-shutdown
+ systemdshutdowndir=${systemd_shutdown_dir}
+
+-tmpfiles_dir=/usr/lib/tmpfiles.d
++tmpfiles_dir=${prefix}/lib/tmpfiles.d
+ tmpfilesdir=${tmpfiles_dir}
+
+ sysusers_dir=${rootprefix}/lib/sysusers.d
+@@ -78,7 +78,7 @@ binfmtdir=${binfmt_dir}
+ modules_load_dir=${rootprefix}/lib/modules-load.d
+ modulesloaddir=${modules_load_dir}
+
+-catalog_dir=/usr/lib/systemd/catalog
++catalog_dir=${prefix}/lib/systemd/catalog
+ catalogdir=${catalog_dir}
+
+ system_uid_max=@SYSTEM_UID_MAX@
+--
+2.29.2
+
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index f7a51ff9a0..e6cb589c9b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
+, fetchpatch
, buildPackages
, ninja
, meson
@@ -71,6 +72,7 @@
, withMachined ? true
, withNetworkd ? true
, withNss ? true
+, withOomd ? false
, withPCRE2 ? true
, withPolkit ? true
, withPortabled ? false
@@ -80,8 +82,8 @@
, withTimedated ? true
, withTimesyncd ? true
, withUserDb ? true
-, p11-kit
, libfido2
+, p11-kit
# name argument
, pname ? "systemd"
@@ -109,7 +111,7 @@ assert withCryptsetup ->
let
wantCurl = withRemote || withImportd;
- version = "246.6";
+ version = "247.2";
in
stdenv.mkDerivation {
inherit version pname;
@@ -120,12 +122,13 @@ stdenv.mkDerivation {
owner = "systemd";
repo = "systemd-stable";
rev = "v${version}";
- sha256 = "1yhj2jlighqqpw1xk9q52f3pncjn47ipi224k35d6syb94q2b988";
+ sha256 = "091pwrvxz3gcf80shlp28d6l4gvjzc6pb61v4mwxmk9d71qaq7ry";
};
# If these need to be regenerated, `git am path/to/00*.patch` them into a
# systemd worktree, rebase to the more recent systemd version, and export the
# patches again via `git format-patch v${version}`.
+ # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches
patches = [
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -138,14 +141,14 @@ stdenv.mkDerivation {
./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
./0010-localectl-use-etc-X11-xkb-for-list-x11.patch
./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
- ./0012-Install-default-configuration-into-out-share-factory.patch
- ./0013-inherit-systemd-environment-when-calling-generators.patch
- ./0014-add-rootprefix-to-lookup-dir-paths.patch
- ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
- ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
- ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
- ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
- ./0019-logind-seat-debus-show-CanMultiSession-again.patch
+ ./0012-inherit-systemd-environment-when-calling-generators.patch
+ ./0013-add-rootprefix-to-lookup-dir-paths.patch
+ ./0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+ ./0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+ ./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+ ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+ ./0018-logind-seat-debus-show-CanMultiSession-again.patch
+ ./0019-Revert-pkg-config-prefix-is-not-really-configurable-.patch
];
postPatch = ''
@@ -239,6 +242,7 @@ stdenv.mkDerivation {
"-Dhostnamed=${lib.boolToString withHostnamed}"
"-Dmachined=${lib.boolToString withMachined}"
"-Dnetworkd=${lib.boolToString withNetworkd}"
+ "-Doomd=${lib.boolToString withOomd}"
"-Dpolkit=${lib.boolToString withPolkit}"
"-Dcryptsetup=${lib.boolToString withCryptsetup}"
"-Dportabled=${lib.boolToString withPortabled}"
@@ -259,6 +263,7 @@ stdenv.mkDerivation {
"-Dldconfig=false"
"-Dsmack=true"
"-Db_pie=true"
+ "-Dinstall-sysconfdir=false"
/*
As of now, systemd doesn't allow runtime configuration of these values. So
the settings in /etc/login.defs have no effect on it. Many people think this
@@ -338,7 +343,7 @@ stdenv.mkDerivation {
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
done
- for dir in tools src/resolve test src/test; do
+ for dir in tools src/resolve test src/test src/shared; do
patchShebangs $dir
done
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix
index 9a21aab9f2..0c5a02061b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tomb";
- version = "2.8";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "dyne";
repo = "Tomb";
rev = "v${version}";
- sha256 = "sha256-bmkUwj0FFq51MUPbNK7xsyyq4swjZcwFeMwOO3fXCzA=";
+ sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s";
};
buildInputs = [ sudo zsh pinentry ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
index ac6ad8a4bb..4f8f7cae7f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "util-linux";
- version = "2.36";
+ version = "2.36.1";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1cg0m4psswg71v6wrqc2bngcw20fsp01vbijxdzvdf8kxdkiqjwy";
+ sha256 = "1vbyydl1b13lx73di4bhc4br9ih24hcqv7bky0kyrn1c2x1c5yh9";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
index a83e554b6f..a2464aeb58 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
@@ -176,6 +176,11 @@ let
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
};
};
+
+ linux-rt-patch = fetchpatch {
+ url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
+ sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
+ };
in {
# also check if kernel version constraints in
# ./nixos/modules/tasks/filesystems/zfs.nix needs
@@ -188,6 +193,8 @@ in {
version = "2.0.0";
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+
+ extraPatches = [ linux-rt-patch ];
};
zfsUnstable = common {
@@ -198,5 +205,7 @@ in {
version = "2.0.0";
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+
+ extraPatches = [ linux-rt-patch ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
index 6daf325110..9ab14140c6 100644
--- a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
@@ -3,51 +3,6 @@
let
versionMap = {
- "0.9" = {
- kafkaVersion = "0.9.0.1";
- scalaVersion = "2.11";
- sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
- };
- "0.10" = {
- kafkaVersion = "0.10.2.2";
- scalaVersion = "2.12";
- sha256 = "13wibnz7n7znv2g13jlpkz1r0y73qy5b02pdqhsq7cl72h9s6wms";
- };
- "0.11" = {
- kafkaVersion = "0.11.0.3";
- scalaVersion = "2.12";
- sha256 = "0zkzp9a8lcfcpavks131119v10hpn90sc0pw4f90jc4zn2yw3rgd";
- };
- "1.0" = {
- kafkaVersion = "1.0.2";
- scalaVersion = "2.12";
- sha256 = "0cmq8ww1lbkp3ipy9d1q8c1yz4kfwj0v4ynnhsk1i48sqlmvwybj";
- };
- "1.1" = {
- kafkaVersion = "1.1.1";
- scalaVersion = "2.12";
- sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2";
- };
- "2.0" = {
- kafkaVersion = "2.0.1";
- scalaVersion = "2.12";
- sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
- };
- "2.1" = {
- kafkaVersion = "2.1.1";
- scalaVersion = "2.12";
- sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0";
- };
- "2.2" = {
- kafkaVersion = "2.2.1";
- scalaVersion = "2.12";
- sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv";
- };
- "2.3" = {
- kafkaVersion = "2.3.1";
- scalaVersion = "2.12";
- sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas";
- };
"2.4" = {
kafkaVersion = "2.4.1";
scalaVersion = "2.12";
diff --git a/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix b/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix
index aa5f79ff8f..d81feb3b72 100644
--- a/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, installShellFiles }:
+
stdenv.mkDerivation rec {
version = "1.12";
pname = "beanstalkd";
- installPhase=''make install "PREFIX=$out"'';
-
src = fetchurl {
url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";
sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl";
@@ -12,6 +11,14 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "fortify" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installManPage doc/beanstalkd.1
+ '';
+
meta = with stdenv.lib; {
homepage = "http://kr.github.io/beanstalkd/";
description = "A simple, fast work queue";
@@ -20,4 +27,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
index bde82468b7..ac261a9a11 100644
--- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
- version = "20.02.6.1";
+ version = "20.11.0.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
- sha256 = "0vllyljsmv3y9hw4vfgnz9cnjqhlk55dy1bipssw872aldlxfcdk";
+ sha256 = "0f750wlvm48j5b2fkvhy47zyagxfl6kbn2m9lx0spxwyn9qgh6bn";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix
index 81cd2db7bd..5d741cf0bb 100644
--- a/third_party/nixpkgs/pkgs/servers/consul/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.9.0";
+ version = "1.9.1";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "06brmzj3h6my0pvi5n261180bfwgfn923702837jmkz7snpsdr9q";
+ sha256 = "06nw27crcrmz9p0hdc6g8ycq8p0kpbgf1g3i879f6h4jp4ca6zi3";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- vendorSha256 = "1mc567zgymfz8iy6bg603f857c05xfna1npk2hh490dsnskkfag0";
+ vendorSha256 = "01fwbgdr4kxq4li83xxadl33ry1lkb3zhmcf2yrimfk042zabpck";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/demoit/default.nix b/third_party/nixpkgs/pkgs/servers/demoit/default.nix
index 675792da68..9a78d5c7c1 100644
--- a/third_party/nixpkgs/pkgs/servers/demoit/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/demoit/default.nix
@@ -6,7 +6,6 @@
buildGoModule {
pname = "demoit";
version = "unstable-2020-06-11";
- goPackagePath = "github.com/dgageot/demoit";
src = fetchFromGitHub {
owner = "dgageot";
diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
index 61ab6f98d2..858a4fcb5f 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.16.8";
+ version = "9.16.10";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
- sha256 = "0ccdbqmpvnxlbrxjsx2w8ir4xh961svzcw7n87n8dglj6rb9r6wy";
+ sha256 = "sha256-vEf8AZxiBeamv7g5xUShRyMh3wU3upBbhGpMv/4zYrM=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -22,11 +22,6 @@ stdenv.mkDerivation rec {
patches = [
./dont-keep-configure-flags.patch
./remove-mkdir-var.patch
- # Fix cross-compilation (will be included in next release after 9.16.8)
- (fetchpatch {
- url = "https://gitlab.isc.org/isc-projects/bind9/-/commit/35ca6df07277adff4df7472a0b01ea5438cdf1ff.patch";
- sha256 = "1sj0hcd0wgkam7hrbp2vw2yymmni4azr9ixd9shz1l6ja90bdj9h";
- })
];
nativeBuildInputs = [ perl pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
index 9eb3fc4e74..ee37ae1f0b 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "f813a5e53263ef51d0415508e1f7d33cfbb75a139ccb10a344ae5a91689933fb";
+ sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
index ed315c854c..0d6ae781b7 100644
--- a/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
+++ b/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
@@ -1,20 +1,20 @@
-From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001
+From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch
-Date: Fri, 6 Mar 2020 23:43:58 +0100
+Date: Tue, 22 Dec 2020 15:38:56 +0100
Subject: [PATCH 1/2] Define configs with env vars
---
app.php | 4 ++--
services/DatabaseService.php | 2 +-
services/FilesService.php | 2 +-
- services/StockService.php | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ services/StockService.php | 3 +--
+ 4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app.php b/app.php
-index af65ad1..4963c28 100644
+index 8176ebe..04432ba 100644
--- a/app.php
+++ b/app.php
-@@ -25,7 +25,7 @@ else
+@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory;
require_once __DIR__ . '/vendor/autoload.php';
// Load config files
@@ -23,33 +23,32 @@ index af65ad1..4963c28 100644
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
// Definitions for dev/demo/prerelease mode
-@@ -50,7 +50,7 @@ $app = AppFactory::create();
+@@ -37,7 +37,7 @@ $app = AppFactory::create();
+
$container = $app->getContainer();
- $container->set('view', function(Container $container)
- {
+ $container->set('view', function (Container $container) {
- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
-+ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
++ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
});
- $container->set('LoginControllerInstance', function(Container $container)
- {
+ $container->set('UrlManager', function (Container $container) {
+ return new UrlManager(GROCY_BASE_URL);
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
-index 23fc7b9..daa1993 100644
+index d1080b0..8bc4ee1 100644
--- a/services/DatabaseService.php
+++ b/services/DatabaseService.php
-@@ -25,7 +25,7 @@ class DatabaseService
- return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db';
+@@ -105,6 +105,6 @@ class DatabaseService
+ return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
}
- return GROCY_DATAPATH . '/grocy.db';
+ return getenv('GROCY_DB_FILE');
}
-
- private static $DbConnectionRaw = null;
+ }
diff --git a/services/FilesService.php b/services/FilesService.php
-index cecdae3..357298d 100644
+index 8c1483e..8f74b4b 100644
--- a/services/FilesService.php
+++ b/services/FilesService.php
-@@ -12,7 +12,7 @@ class FilesService extends BaseService
+@@ -70,7 +70,7 @@ class FilesService extends BaseService
{
parent::__construct();
@@ -59,18 +58,19 @@ index cecdae3..357298d 100644
if (!file_exists($this->StoragePath))
{
diff --git a/services/StockService.php b/services/StockService.php
-index bfde3fc..53b2245 100644
+index 4741b4b..6d4e748 100644
--- a/services/StockService.php
+++ b/services/StockService.php
-@@ -934,7 +934,7 @@ class StockService extends BaseService
+@@ -1374,8 +1374,7 @@ class StockService extends BaseService
throw new \Exception('No barcode lookup plugin defined');
}
- $path = GROCY_DATAPATH . "/plugins/$pluginName.php";
-+ $path = getenv('GROCY_PLUGIN_DIR');
+-
++ $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
if (file_exists($path))
{
require_once $path;
--
-2.25.0
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
index e7f84a146f..b065ca801d 100644
--- a/third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
+++ b/third_party/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
@@ -1,24 +1,24 @@
-From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch
-Date: Thu, 16 Apr 2020 19:37:32 +0200
-Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
-
----
- helpers/PrerequisiteChecker.php | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
-index d4bf74c6..ca7686c9 100644
---- a/helpers/PrerequisiteChecker.php
-+++ b/helpers/PrerequisiteChecker.php
-@@ -8,7 +8,6 @@ class PrerequisiteChecker
+From c46323dfc4a3d5bf17f7508f5b5f223858a598c3 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Tue, 22 Dec 2020 15:39:15 +0100
+Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
+
+---
+ helpers/PrerequisiteChecker.php | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
+index cbe0a3a..a484db2 100644
+--- a/helpers/PrerequisiteChecker.php
++++ b/helpers/PrerequisiteChecker.php
+@@ -11,7 +11,6 @@ class PrerequisiteChecker
{
- public function checkRequirements()
- {
-- self::checkForConfigFile();
- self::checkForConfigDistFile();
- self::checkForComposer();
- self::checkForYarn();
---
-2.25.0
-
+ public function checkRequirements()
+ {
+- self::checkForConfigFile();
+ self::checkForConfigDistFile();
+ self::checkForComposer();
+ self::checkForPhpExtensions();
+--
+2.29.2
+
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/default.nix b/third_party/nixpkgs/pkgs/servers/grocy/default.nix
index 193f392980..2f2772505f 100644
--- a/third_party/nixpkgs/pkgs/servers/grocy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/grocy/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "grocy";
- version = "2.7.1";
+ version = "3.0.0";
src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
- sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r";
+ sha256 = "sha256-O7DksfA95IHvLJyRrWG8iECcUUDsOtytd78koNZdQzE=";
};
nativeBuildInputs = [ unzip ];
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
unzip ${src} -d .
'';
+ # NOTE: if patches are created from a git checkout, those should be modified
+ # with `unixdos` to make sure those apply here.
patches = [
./0001-Define-configs-with-env-vars.patch
./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 456b30cb39..9135ea549f 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.118.5";
+ version = "2020.12.1";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -56,7 +56,7 @@
"aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu
"atome" = ps: with ps; [ ]; # missing inputs: pyatome
"august" = ps: with ps; [ ]; # missing inputs: py-august
- "aurora" = ps: with ps; [ ];
+ "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
"auth" = ps: with ps; [ aiohttp-cors ];
"automation" = ps: with ps; [ aiohttp-cors ];
@@ -113,7 +113,7 @@
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
"cisco_ios" = ps: with ps; [ pexpect ];
- "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress
+ "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ];
"cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk
"citybikes" = ps: with ps; [ ];
"clementine" = ps: with ps; [ ]; # missing inputs: python-clementine-remote
@@ -253,6 +253,7 @@
"filesize" = ps: with ps; [ ];
"filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"fints" = ps: with ps; [ fints ];
+ "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota
"firmata" = ps: with ps; [ ]; # missing inputs: pymata-express
"fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
"fixer" = ps: with ps; [ ]; # missing inputs: fixerio
@@ -421,6 +422,7 @@
"knx" = ps: with ps; [ ]; # missing inputs: xknx
"kodi" = ps: with ps; [ ]; # missing inputs: pykodi
"konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
+ "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
"kwb" = ps: with ps; [ ]; # missing inputs: pykwb
"lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse
"lametric" = ps: with ps; [ ]; # missing inputs: lmnotify
@@ -506,6 +508,7 @@
"mold_indicator" = ps: with ps; [ ];
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
"moon" = ps: with ps; [ ];
+ "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds
"mpchc" = ps: with ps; [ ];
"mpd" = ps: with ps; [ mpd2 ];
"mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
@@ -558,6 +561,7 @@
"nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo
"nuki" = ps: with ps; [ ]; # missing inputs: pynuki
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
+ "number" = ps: with ps; [ ];
"nut" = ps: with ps; [ ]; # missing inputs: pynut2
"nws" = ps: with ps; [ ]; # missing inputs: pynws
"nx584" = ps: with ps; [ ]; # missing inputs: pynx584
@@ -596,7 +600,7 @@
"otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
"owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ];
- "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt
+ "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt[mqtt-client]
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect ];
@@ -618,7 +622,7 @@
"plaato" = ps: with ps; [ aiohttp-cors ];
"plant" = ps: with ps; [ sqlalchemy ];
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
- "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile
+ "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
@@ -697,7 +701,6 @@
"sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd
"safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; # missing inputs: home-assistant-frontend
"saj" = ps: with ps; [ ]; # missing inputs: pysaj
- "salt" = ps: with ps; [ ]; # missing inputs: saltbox
"samsungtv" = ps: with ps; [ samsungctl samsungtvws ];
"satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
"scene" = ps: with ps; [ ];
@@ -774,6 +777,7 @@
"spotify" = ps: with ps; [ aiohttp-cors spotipy ];
"sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ pysqueezebox ];
+ "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy
"ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ];
"starline" = ps: with ps; [ ]; # missing inputs: starline
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
@@ -801,7 +805,7 @@
"syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize
"synology" = ps: with ps; [ ]; # missing inputs: py-synology
"synology_chat" = ps: with ps; [ ];
- "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology
+ "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
"syslog" = ps: with ps; [ ];
"system_health" = ps: with ps; [ aiohttp-cors ];
@@ -864,9 +868,9 @@
"twilio" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
+ "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client
"twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client
"twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI
- "ubee" = ps: with ps; [ ]; # missing inputs: pyubee
"ubus" = ps: with ps; [ ];
"ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ];
@@ -954,7 +958,6 @@
"yandextts" = ps: with ps; [ ];
"yeelight" = ps: with ps; [ yeelight ];
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
- "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
"yi" = ps: with ps; [ aioftp ha-ffmpeg ];
"zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix
"zamg" = ps: with ps; [ ];
@@ -962,7 +965,7 @@
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
"zestimate" = ps: with ps; [ xmltodict ];
- "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
+ "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zodiac" = ps: with ps; [ ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index bc0622e4f5..12dc7b6816 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -62,7 +62,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.118.5";
+ hassVersion = "2020.12.1";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "1711qhcvrzl599cryd9wzamacn1vv37w67vprqgibnbw58kcpilj";
+ sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -87,8 +87,10 @@ in with py.pkgs; buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \
+ --replace "attrs==19.3.0" "attrs>=19.3.0" \
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
--replace "cryptography==3.2" "cryptography" \
+ --replace "pip>=8.0.3,<20.3" "pip" \
--replace "requests==2.25.0" "requests>=2.24.0" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
@@ -172,6 +174,8 @@ in with py.pkgs; buildPythonApplication rec {
"test_device_tracker_not_home"
# Racy https://github.com/home-assistant/core/issues/41425
"test_cached_event_message"
+ # ValueError: count must be a positive integer (got 0)
+ "test_media_view"
];
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index 825576e92a..36f89dc006 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20201111.2";
+ version = "20201212.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1pk4l78j72zn6gxc0yr3azdlcqwkvf7ki0khm176qpvs34scs1l8";
+ sha256 = "1nz5f7bpj0xs740af8i6j33idff6yzx7z9vydlah2sxcdgpwmz84";
};
# no Python tests implemented
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 6ec5b0a785..2b2af8966e 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
@@ -149,6 +149,6 @@ stdenv.mkDerivation {
homepage = "http://nginx.org";
license = licenses.bsd2;
platforms = platforms.all;
- maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ];
+ maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ajs124 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index edb87258d6..cadc1064ac 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.19.5";
- sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw";
+ version = "1.19.6";
+ sha256 = "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di";
}
diff --git a/third_party/nixpkgs/pkgs/servers/icecream/default.nix b/third_party/nixpkgs/pkgs/servers/icecream/default.nix
new file mode 100644
index 0000000000..1800700b04
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/icecream/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, zstd, docbook_xml_dtd_45 }:
+
+stdenv.mkDerivation rec {
+ pname = "icecream";
+ version = "2020-04-15";
+
+ src = fetchFromGitHub {
+ owner = "icecc";
+ repo = pname;
+ rev = "c370c4d701d05e1872d44d1c1642a774a7f25807";
+ sha256 = "0ld2ihd39irlk4wshpbw7inmgyl3x0gbkgsy10izcm1wwfc0x2ac";
+ };
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ autoreconfHook docbook2x ];
+ buildInputs = [ libarchive libcap_ng lzo zstd docbook_xml_dtd_45 ];
+
+ meta = with stdenv.lib; {
+ description = "Distributed compiler with a central scheduler to share build load";
+ inherit (src.meta) homepage;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ emantor ];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
index 97bac4fa92..61a845d75f 100644
--- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.16.2347";
+ version = "0.17.15";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "0xqmkcwlgic38frf1myybj34fp9qpabagxcbmbxvmjb1knw19lrm";
+ sha256 = "1pp5pnnmy8m0jvpxrldshcx71dl5g16dqvnnzaqhvs4cjhpgq8fw";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix
index 10b2306130..d0fded5c63 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix
@@ -2,24 +2,22 @@
buildGoPackage rec {
pname = "MailHog";
- version = "1.0.0";
- rev = "v${version}";
+ version = "1.0.1";
goPackagePath = "github.com/mailhog/MailHog";
src = fetchFromGitHub {
- inherit rev;
owner = "mailhog";
repo = "MailHog";
- sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83";
+ rev = "v${version}";
+ sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y";
};
- goDeps = ./deps.nix;
-
meta = with stdenv.lib; {
description = "Web and API based SMTP testing";
homepage = "https://github.com/mailhog/MailHog";
- maintainers = with maintainers; [ disassembler ];
+ changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}";
+ maintainers = with maintainers; [ disassembler jojosch ];
license = licenses.mit;
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailhog/deps.nix b/third_party/nixpkgs/pkgs/servers/mail/mailhog/deps.nix
deleted file mode 100644
index 9967c3a549..0000000000
--- a/third_party/nixpkgs/pkgs/servers/mail/mailhog/deps.nix
+++ /dev/null
@@ -1,191 +0,0 @@
-[
- {
- goPackagePath = "github.com/gorilla/pat";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/pat";
- rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d";
- sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf";
- };
- }
- {
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a";
- sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "bcd8bc72b08df0f70df986b97f95590779502d31";
- sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13";
- sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc";
- };
- }
- {
- goPackagePath = "github.com/ian-kent/go-log";
- fetch = {
- type = "git";
- url = "https://github.com/ian-kent/go-log";
- rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1";
- sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d";
- };
- }
- {
- goPackagePath = "github.com/ian-kent/envconf";
- fetch = {
- type = "git";
- url = "https://github.com/ian-kent/envconf";
- rev = "c19809918c02ab33dc8635d68c77649313185275";
- sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx";
- };
- }
- {
- goPackagePath = "github.com/ian-kent/goose";
- fetch = {
- type = "git";
- url = "https://github.com/ian-kent/goose";
- rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c";
- sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv";
- };
- }
- {
- goPackagePath = "github.com/ian-kent/linkio";
- fetch = {
- type = "git";
- url = "https://github.com/ian-kent/linkio";
- rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd";
- sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq";
- };
- }
- {
- goPackagePath = "github.com/mailhog/MailHog-Server";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/MailHog-Server";
- rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd";
- sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla";
- };
- }
- {
- goPackagePath = "github.com/mailhog/MailHog-UI";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/MailHog-UI";
- rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7";
- sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54";
- };
- }
- {
- goPackagePath = "github.com/mailhog/http";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/http";
- rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2";
- sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8";
- };
- }
- {
- goPackagePath = "github.com/mailhog/mhsendmail";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/mhsendmail";
- rev = "002527025ef50364446d7560600aedc5daaa1997";
- sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91";
- };
- }
- {
- goPackagePath = "github.com/mailhog/data";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/data";
- rev = "024d554958b5bea5db220bfd84922a584d878ded";
- sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf";
- };
- }
- {
- goPackagePath = "github.com/mailhog/smtp";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/smtp";
- rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54";
- sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6";
- };
- }
- {
- goPackagePath = "github.com/mailhog/storage";
- fetch = {
- type = "git";
- url = "https://github.com/mailhog/storage";
- rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa";
- sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk";
- };
- }
- {
- goPackagePath = "github.com/ogier/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/ogier/pflag";
- rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f";
- sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj";
- };
- }
- {
- goPackagePath = "github.com/tinylib/msgp";
- fetch = {
- type = "git";
- url = "https://github.com/tinylib/msgp";
- rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d";
- sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r";
- };
- }
- {
- goPackagePath = "github.com/philhofer/fwd";
- fetch = {
- type = "git";
- url = "https://github.com/philhofer/fwd";
- rev = "1612a298117663d7bc9a760ae20d383413859798";
- sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
- };
- }
- {
- goPackagePath = "github.com/t-k/fluent-logger-golang";
- fetch = {
- type = "git";
- url = "https://github.com/t-k/fluent-logger-golang";
- rev = "0f8ec08f2057a61574b6943e75045fffbeae894e";
- sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
- sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
- };
- }
- {
- goPackagePath = "gopkg.in/mgo.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/mgo.v2";
- rev = "d90005c5262a3463800497ea5a89aed5fe22c886";
- sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index e6266268a9..112fdac53d 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -1,20 +1,22 @@
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? false
+, callPackage
}:
with python3.pkgs;
let
plugins = python3.pkgs.callPackage ./plugins { };
+ tools = callPackage ./tools { };
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.23.0";
+ version = "1.24.0";
src = fetchPypi {
inherit pname version;
- sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al";
+ sha256 = "sha256-yxcdFd7iVXbDIUx1lW73FKLy+BZfSspz60LKw7BCtl4=";
};
patches = [
@@ -68,6 +70,7 @@ buildPythonApplication rec {
passthru.tests = { inherit (nixosTests) matrix-synapse; };
passthru.plugins = plugins;
+ passthru.tools = tools;
passthru.python = python3;
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/default.nix
new file mode 100644
index 0000000000..43667f9e16
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/default.nix
@@ -0,0 +1,4 @@
+{ callPackage }:
+{
+ rust-synapse-compress-state = callPackage ./rust-synapse-compress-state.nix { };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
new file mode 100644
index 0000000000..f770da75fd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
@@ -0,0 +1,22 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rust-synapse-compress-state";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh";
+ };
+
+ cargoSha256 = "1zdf091s0wyribsqp8l6arkablchqxmdyg2xdc57hh06p4fjiw48";
+
+ meta = with lib; {
+ description = "A tool to compress some state in a Synapse instance's database";
+ homepage = "https://github.com/matrix-org/rust-synapse-compress-state";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hexa maralorn ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
index 42b07e605a..a7d2da6ac5 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,32 +1,18 @@
-{ stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
, fetchFromGitHub, makeWrapper
}:
perlPackages.buildPerlPackage rec {
pname = "FusionInventory-Agent";
- version = "2.3.21";
+ version = "2.6";
src = fetchFromGitHub {
owner = "fusioninventory";
repo = "fusioninventory-agent";
rev = version;
- sha256 = "034clffcn0agx85macjgml4lyhvvck7idn94pqd2c77pk6crvw2y";
+ sha256 = "1hbp5a9m03n6a80xc8z640zs71qhqk4ifafr6fp0vvzzvq097ip2";
};
- patches = [
- ./remove_software_test.patch
- # support for os-release file
- (fetchurl {
- url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff";
- sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb";
- })
- # support for Nix software inventory
- (fetchurl {
- url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff";
- sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw";
- })
- ];
-
postPatch = ''
patchShebangs bin
@@ -68,6 +54,9 @@ perlPackages.buildPerlPackage rec {
XMLTreePP
];
+ # Test fails due to "Argument list too long"
+ doCheck = false;
+
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
deleted file mode 100644
index b360f418aa..0000000000
--- a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t
-index 8ee7ff02c..bd5551ab3 100755
---- a/t/agent/snmp/live.t
-+++ b/t/agent/snmp/live.t
-@@ -11,7 +11,7 @@ use Test::More;
- use FusionInventory::Agent::XML::Response;
- use FusionInventory::Agent::SNMP::Live;
-
--plan tests => 12;
-+plan tests => 11;
-
- my $snmp;
- throws_ok {
-@@ -52,15 +52,6 @@ throws_ok {
- } qr/^Unable to resolve the UDP\/IPv4 address "none"/,
- 'instanciation: unresolvable host';
-
--throws_ok {
-- $snmp = FusionInventory::Agent::SNMP::Live->new(
-- version => 1,
-- community => 'public',
-- hostname => '1.1.1.1'
-- );
--} qr/no response from host 1.1.1.1/,
--'instanciation: unresponding host';
--
- SKIP: {
- skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
-
-diff --git a/t/apps/agent.t b/t/apps/agent.t
-index c0f6fc52f..c83837d70 100755
---- a/t/apps/agent.t
-+++ b/t/apps/agent.t
-@@ -12,7 +12,7 @@ use XML::TreePP;
- use FusionInventory::Agent::Tools;
- use FusionInventory::Test::Utils;
-
--plan tests => 34;
-+plan tests => 33;
-
- my ($content, $out, $err, $rc);
-
-@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub {
- check_content_ok($out);
- };
-
--ok(
-- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
-- 'inventory has software'
--);
--
- ok(
- exists $content->{REQUEST}->{CONTENT}->{ENVS},
- 'inventory has environment variables'
-diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t
-index 72a0e578c..13944f34f 100755
---- a/t/tasks/inventory/linux/softwares.t
-+++ b/t/tasks/inventory/linux/softwares.t
-@@ -89,7 +89,7 @@ my $rpm_packages = [
- PUBLISHER => 'Mageia.Org',
- NAME => 'xfsprogs',
- COMMENTS => 'Utilities for managing the XFS filesystem',
-- INSTALLDATE => '25/03/2012',
-+ INSTALLDATE => '24/03/2012',
- FILESIZE => '3628382',
- FROM => 'rpm',
- ARCH => 'x86_64',
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index ccd7428eef..588113aa63 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.3.4";
+ version = "7.3.5";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0vav3zhn4yw87z8xlcljs62xx4v3mxxvy0kgjh7w4njyqq1j3ayi";
+ sha256 = "1gxa1j7sd4xcyb2gh2ja6mwp0j4zcqwzaz25n9f9p9azhjyd2zh5";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "1fmfscfbdg2wdzf5fbad83pln4azy2y3fcghcanafkvqr2vv4hwk";
+ sha256 = "0vplzj5jrx643qp68kxg1g1gazxjrnx771dmc1703zalv28z8fq3";
};
- vendorSha256 = "0rn1zqczqa44k6g8rm9xdrd6hw5rbbvihcbzcdx758gv2lpbikxq";
+ vendorSha256 = "05brpjac54a8bxh7psy8gix9q2g36fr4z5msahp6i8wv2xfrf98b";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
index 6ab1c80ece..2852fb2afc 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests
+, fetchpatch
+}:
let
- version = "2.22.2";
+ version = "2.23.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
- sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv";
+ sha256 = "sha256-UQ1r8271EiZDU/h2zta6toMRfk2GjXol8GexYL9n+BE=";
};
webui = mkYarnPackage {
@@ -29,15 +31,23 @@ in buildGoPackage rec {
goPackagePath = "github.com/prometheus/prometheus";
+ patches = [
+ # Fix https://github.com/prometheus/prometheus/issues/8144
+ (fetchpatch {
+ url = "https://github.com/prometheus/prometheus/commit/8b64b70fe4a5aa2877c95aa12c6798b12d3ff7ec.patch";
+ sha256 = "sha256-RuXT5pBXv8z6WoE59KNGh+OXr1KGLGWs/n0Hjf4BuH8=";
+ })
+ ];
+
postPatch = ''
ln -s ${webui.node_modules} web/ui/react-app/node_modules
ln -s ${webui} web/ui/static/react
'';
+ buildFlags = "-tags=builtinassets";
buildFlagsArray = let
t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
in [
- "-tags=builtinassets"
''
-ldflags=
-X ${t}.Version=${version}
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
index 9499f70e71..cdece12124 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
@@ -1,17 +1,17 @@
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
- pname = "lndmon-unstable";
- version = "2020-01-09";
+ pname = "lndmon";
+ version = "unstable-2020-12-04";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "lndmon";
- sha256 = "0d4z8yv2459wsi4c91qs5an13acn73fd8s321xya5vxxiyf51q24";
- rev = "2c7c5ce0fcb4e7eef4df60efe8a644587a309f6c";
+ sha256 = "0q72jbkhw1vpwxd0r80l1v4ab71sakc315plfqbijy7al9ywq5nl";
+ rev = "f07d574320dd1a6a428fecd47f3a5bb46a0fc4d1";
};
- vendorSha256 = "083h2ksnqmcr48958r5pag9a28xvljpc3prip6wn70ifp2wpjpin";
+ vendorSha256 = "06if387b9m02ciqgcissih1x06l33djp87vgspwzz589f77vczk8";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
index 2c2fabf235..771bbf39b0 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
@@ -1,21 +1,23 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "nginxlog_exporter";
- version = "1.3.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "martin-helmich";
repo = "prometheus-nginxlog-exporter";
rev = "v${version}";
- sha256 = "0cma6hgagqdms6x40v0q4jn8gjq1awyg1aqk5l8mz7l6k132qq7k";
+ sha256 = "1kqyjw5yqgjb8xa5irdhpqvwp1qhba6igpc23n2qljhbh0aybkbq";
};
- goPackagePath = "github.com/martin-helmich/prometheus-nginxlog-exporter";
+ vendorSha256 = "130hq19y890amxhjywg5blassl8br2p9d62aai8fj839p3p2a7zp";
- goDeps = ./nginxlog-exporter_deps.nix;
+ subPackages = [ "." ];
- doCheck = true;
+ runVend = true;
+
+ passthru.tests = { inherit (nixosTests.prometheus-exporters) nginxlog; };
meta = with stdenv.lib; {
description = "Export metrics from Nginx access log files to Prometheus";
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix
deleted file mode 100644
index 3051258a63..0000000000
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix
+++ /dev/null
@@ -1,282 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/armon/go-radix";
- fetch = {
- type = "git";
- url = "https://github.com/armon/go-radix";
- rev = "v1.0.0";
- sha256 = "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "3ac7bf7a47d1";
- sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "0c1f6d65b5a1";
- sha256 = "1ad3zv0s3swslfwmk0wry9qbjz596689z13f2s7d9gska6msigsl";
- };
- }
- {
- goPackagePath = "github.com/gopherjs/gopherjs";
- fetch = {
- type = "git";
- url = "https://github.com/gopherjs/gopherjs";
- rev = "0766667cb4d1";
- sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/consul";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/consul";
- rev = "de080672fee9";
- sha256 = "1q46gn7gv7ara21akkbyzlnari4naxax2d0z917y56ra4lwm259i";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-msgpack";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-msgpack";
- rev = "v0.5.3";
- sha256 = "00jv0ajqd58pkb2yyhlrjp0rv1mvb1ijx3yqjyikcmzvk9jb4h5m";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/golang-lru";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/golang-lru";
- rev = "v0.5.1";
- sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "v1.0.0";
- sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
- };
- }
- {
- goPackagePath = "github.com/hpcloud/tail";
- fetch = {
- type = "git";
- url = "https://github.com/hpcloud/tail";
- rev = "v1.0.0";
- sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
- };
- }
- {
- goPackagePath = "github.com/jtolds/gls";
- fetch = {
- type = "git";
- url = "https://github.com/jtolds/gls";
- rev = "v4.20.0";
- sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
- };
- }
- {
- goPackagePath = "github.com/kr/pretty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pretty";
- rev = "v0.1.0";
- sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "v1.1.1";
- sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
- };
- }
- {
- goPackagePath = "github.com/kr/text";
- fetch = {
- type = "git";
- url = "https://github.com/kr/text";
- rev = "v0.1.0";
- sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "v1.0.1";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "5636dc67ae77";
- sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec335";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "4402f4e5ea79";
- sha256 = "1nskicw0k0kay9dqg8hw2clgcnvjfcz839rijvrz4wh7gl42qiag";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "abf152e5f3e9";
- sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
- };
- }
- {
- goPackagePath = "github.com/satyrius/gonx";
- fetch = {
- type = "git";
- url = "https://github.com/satyrius/gonx";
- rev = "47c52b995fe5";
- sha256 = "0f0b6ac9xlai168d32zas4v2afk5b2q1bs0qi3dykkk6lhq7b58m";
- };
- }
- {
- goPackagePath = "github.com/smartystreets/assertions";
- fetch = {
- type = "git";
- url = "https://github.com/smartystreets/assertions";
- rev = "b2de0cb4f26d";
- sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
- };
- }
- {
- goPackagePath = "github.com/smartystreets/goconvey";
- fetch = {
- type = "git";
- url = "https://github.com/smartystreets/goconvey";
- rev = "200a235640ff";
- sha256 = "08hgfwjs5zqwsx1z5ja15d0g4glprb3ck7dfi88kwv5q5fl1p139";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.0";
- sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.4.0";
- sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "c200b10b5d5e";
- sha256 = "1f764m3q05q2dq1pdms07jcixw4xakqw46w1djrmbhjmd9q8b0av";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "788fd7840127";
- sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/tomb.v1";
- rev = "dd632973f1e7";
- sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.4";
- sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix
index f8827b1f1f..ccc096fb72 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "promscale";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
- sha256 = "sha256-Yl61hX4YBddw0euTwheMIOy08jgS47rAU0cKyXiz9s4=";
+ sha256 = "sha256-xkVT7Kn7mW23p8oGU4AsmB66lNd4QLnhEW7J66ldFHM=";
};
- vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";
+ vendorSha256 = "sha256:1wfyawbdbabyp9nyhzfp632hg9rvwdyagsdqvvq6gv8bn5xfcjvh";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
index 56f9ec7227..8475e7533b 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
@@ -18,11 +18,11 @@
};
}
{
- name = "_babel_compat_data___compat_data_7.11.0.tgz";
+ name = "_babel_compat_data___compat_data_7.12.5.tgz";
path = fetchurl {
- name = "_babel_compat_data___compat_data_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz";
- sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c";
+ name = "_babel_compat_data___compat_data_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz";
+ sha1 = "f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9";
};
}
{
@@ -34,19 +34,19 @@
};
}
{
- name = "_babel_core___core_7.11.6.tgz";
+ name = "_babel_core___core_7.12.3.tgz";
path = fetchurl {
- name = "_babel_core___core_7.11.6.tgz";
- url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz";
- sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651";
+ name = "_babel_core___core_7.12.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz";
+ sha1 = "1b436884e1e3bff6fb1328dc02b208759de92ad8";
};
}
{
- name = "_babel_generator___generator_7.11.6.tgz";
+ name = "_babel_generator___generator_7.12.5.tgz";
path = fetchurl {
- name = "_babel_generator___generator_7.11.6.tgz";
- url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz";
- sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620";
+ name = "_babel_generator___generator_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz";
+ sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de";
};
}
{
@@ -66,11 +66,11 @@
};
}
{
- name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz";
+ name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz";
path = fetchurl {
- name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz";
- sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f";
+ name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz";
+ sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48";
};
}
{
@@ -82,27 +82,27 @@
};
}
{
- name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz";
+ name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz";
path = fetchurl {
- name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz";
- sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2";
+ name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+ sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831";
};
}
{
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz";
- sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d";
+ name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
+ sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e";
};
}
{
- name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz";
+ name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz";
- sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8";
+ name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz";
+ sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8";
};
}
{
@@ -114,11 +114,11 @@
};
}
{
- name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz";
+ name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz";
- sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b";
+ name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
+ sha1 = "8006a466695c4ad86a2a5f2fb15b5f2c31ad5633";
};
}
{
@@ -146,27 +146,27 @@
};
}
{
- name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
+ name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
- sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df";
+ name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
+ sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c";
};
}
{
- name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
+ name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz";
path = fetchurl {
- name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
- sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620";
+ name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+ sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb";
};
}
{
- name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
- sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359";
+ name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+ sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c";
};
}
{
@@ -194,35 +194,35 @@
};
}
{
- name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz";
+ name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz";
- sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d";
+ name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
+ sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd";
};
}
{
- name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz";
path = fetchurl {
- name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
- sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf";
+ name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+ sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9";
};
}
{
- name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
+ name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
- sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461";
+ name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+ sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136";
};
}
{
- name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz";
+ 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.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz";
- sha1 = "eec162f112c2f58d3af0af125e3bb57665146729";
+ 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";
};
}
{
@@ -242,19 +242,27 @@
};
}
{
- name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz";
+ name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz";
path = fetchurl {
- name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz";
- sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87";
+ name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
+ sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9";
};
}
{
- name = "_babel_helpers___helpers_7.10.4.tgz";
+ name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz";
path = fetchurl {
- name = "_babel_helpers___helpers_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz";
- sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044";
+ name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
+ sha1 = "3332339fc4d1fbbf1c27d7958c27d34708e990d9";
+ };
+ }
+ {
+ name = "_babel_helpers___helpers_7.12.5.tgz";
+ path = fetchurl {
+ name = "_babel_helpers___helpers_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz";
+ sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e";
};
}
{
@@ -266,19 +274,19 @@
};
}
{
- name = "_babel_parser___parser_7.11.5.tgz";
+ name = "_babel_parser___parser_7.12.5.tgz";
path = fetchurl {
- name = "_babel_parser___parser_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz";
- sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037";
+ name = "_babel_parser___parser_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz";
+ sha1 = "b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0";
};
}
{
- name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz";
+ name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz";
- sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558";
+ name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
+ sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e";
};
}
{
@@ -290,11 +298,11 @@
};
}
{
- name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz";
+ name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz";
- sha1 = "a33bf632da390a59c7a8c570045d1115cd778807";
+ name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
+ sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de";
};
}
{
@@ -306,35 +314,35 @@
};
}
{
- name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz";
+ name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz";
- sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e";
+ name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
+ sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc";
};
}
{
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz";
+ name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz";
- sha1 = "570d883b91031637b3e2958eea3c438e62c05f54";
+ name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
+ sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4";
};
}
{
- name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz";
+ name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz";
- sha1 = "593e59c63528160233bd321b1aebe0820c2341db";
+ name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
+ sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c";
};
}
{
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz";
+ name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz";
- sha1 = "9f80e482c03083c87125dee10026b58527ea20c8";
+ name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
+ sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751";
};
}
{
@@ -346,11 +354,11 @@
};
}
{
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz";
+ name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz";
- sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a";
+ name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
+ sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c";
};
}
{
@@ -362,27 +370,27 @@
};
}
{
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz";
+ name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz";
- sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06";
+ name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
+ sha1 = "b1ce757156d40ed79d59d467cb2b154a5c4149ba";
};
}
{
- name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz";
+ name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz";
- sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af";
+ name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz";
+ sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069";
};
}
{
- name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz";
+ name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz";
- sha1 = "31c938309d24a78a49d68fdabffaa863758554dd";
+ name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
+ sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942";
};
}
{
@@ -394,27 +402,27 @@
};
}
{
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz";
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz";
- sha1 = "de5866d0646f6afdaab8a566382fe3a221755076";
+ name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz";
+ sha1 = "cce122203fc8a32794296fc377c6dedaf4363797";
};
}
{
- name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz";
+ name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz";
- sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909";
+ name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
+ sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389";
};
}
{
- name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz";
+ name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz";
- sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d";
+ name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
+ sha1 = "2a183958d417765b9eae334f47758e5d6a82e072";
};
}
{
@@ -426,19 +434,19 @@
};
}
{
- name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz";
+ name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz";
- sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c";
+ name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+ sha1 = "bcb297c5366e79bebadef509549cd93b04f19978";
};
}
{
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz";
+ name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz";
- sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c";
+ name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz";
+ sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd";
};
}
{
@@ -458,11 +466,11 @@
};
}
{
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz";
+ name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz";
- sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6";
+ name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz";
+ sha1 = "a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd";
};
}
{
@@ -474,11 +482,11 @@
};
}
{
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz";
+ name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz";
- sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c";
+ name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz";
+ sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926";
};
}
{
@@ -530,99 +538,99 @@
};
}
{
- name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz";
+ name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz";
- sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d";
+ name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+ sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0";
};
}
{
- name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz";
+ name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz";
- sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25";
+ name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz";
+ sha1 = "460ba9d77077653803c3dd2e673f76d66b4029e5";
};
}
{
- name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz";
+ name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz";
- sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd";
+ name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
+ sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3";
};
}
{
- name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz";
+ name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz";
- sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37";
+ name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
+ sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1";
};
}
{
- name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz";
+ name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz";
- sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8";
+ name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
+ sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9";
};
}
{
- name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz";
+ name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz";
- sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215";
+ name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
+ sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1";
};
}
{
- name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz";
+ name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz";
- sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7";
+ name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
+ sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6";
};
}
{
- name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz";
+ name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz";
- sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb";
+ name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
+ sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852";
};
}
{
- name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz";
+ name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz";
- sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5";
+ name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
+ sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847";
};
}
{
- name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz";
+ name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz";
- sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee";
+ name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
+ sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975";
};
}
{
- name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz";
+ name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz";
- sha1 = "697e50c9fee14380fe843d1f306b295617431e47";
+ name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
+ sha1 = "745661baba295ac06e686822797a69fbaa2ca228";
};
}
{
- name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz";
+ name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz";
- sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e";
+ name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
+ sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0";
};
}
{
@@ -634,115 +642,115 @@
};
}
{
- name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz";
+ name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz";
- sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9";
+ name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
+ sha1 = "07640f28867ed16f9511c99c888291f560921cfa";
};
}
{
- name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz";
+ name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz";
- sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7";
+ name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
+ sha1 = "2ec76258c70fe08c6d7da154003a480620eba667";
};
}
{
- name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz";
+ name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz";
- sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c";
+ name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
+ sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57";
};
}
{
- name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz";
+ name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz";
- sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7";
+ name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
+ sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad";
};
}
{
- name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz";
+ name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz";
- sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1";
+ name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
+ sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9";
};
}
{
- name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
+ name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
- sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0";
+ name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
+ sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648";
};
}
{
- name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz";
+ name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz";
- sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85";
+ name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
+ sha1 = "663fea620d593c93f214a464cd399bf6dc683086";
};
}
{
- name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz";
+ name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz";
- sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e";
+ name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
+ sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902";
};
}
{
- name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz";
+ name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz";
- sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6";
+ name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
+ sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753";
};
}
{
- name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz";
+ name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz";
- sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888";
+ name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
+ sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0";
};
}
{
- name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz";
+ name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz";
- sha1 = "d7146c4d139433e7a6526f888c667e314a093894";
+ name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
+ sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e";
};
}
{
- name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz";
+ name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz";
- sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a";
+ name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
+ sha1 = "d2e963b038771650c922eff593799c96d853255d";
};
}
{
- name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz";
+ name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz";
- sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0";
+ name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
+ sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd";
};
}
{
- name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz";
+ name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz";
- sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e";
+ name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz";
+ sha1 = "4471f0851feec3231cc9aaa0dccde39947c1ac1e";
};
}
{
@@ -754,67 +762,67 @@
};
}
{
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz";
+ name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz";
- sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d";
+ name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz";
+ sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d";
};
}
{
- name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz";
+ name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz";
- sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6";
+ name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz";
+ sha1 = "677de5b96da310430d6cfb7fee16a1603afa3d56";
};
}
{
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz";
+ name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz";
- sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369";
+ name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz";
+ sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28";
};
}
{
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz";
+ name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz";
- sha1 = "34f1779117520a779c054f2cdd9680435b9222b4";
+ name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz";
+ sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b";
};
}
{
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz";
+ name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz";
- sha1 = "673c9f913948764a4421683b2bef2936968fddf2";
+ name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz";
+ sha1 = "39ede0e30159770561b6963be143e40af3bde00c";
};
}
{
- name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz";
+ 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.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz";
- sha1 = "3eefbb73db94afbc075f097523e445354a1c6501";
+ 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.10.4.tgz";
+ name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz";
- sha1 = "2015e59d839074e76838de2159db421966fd8b63";
+ name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
+ sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753";
};
}
{
- name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz";
+ name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz";
- sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd";
+ name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
+ sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8";
};
}
{
@@ -826,67 +834,67 @@
};
}
{
- name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz";
+ name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz";
- sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6";
+ name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
+ sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3";
};
}
{
- name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz";
+ name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz";
- sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc";
+ name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
+ sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e";
};
}
{
- name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz";
+ name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz";
- sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d";
+ name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz";
+ sha1 = "5c24cf50de396d30e99afc8d1c700e8bce0f5caf";
};
}
{
- name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz";
+ name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz";
- sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c";
+ name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
+ sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843";
};
}
{
- name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz";
+ name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz";
- sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc";
+ name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
+ sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a";
};
}
{
- name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz";
+ name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz";
- sha1 = "2b4879676af37342ebb278216dd090ac67f13abb";
+ name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz";
+ sha1 = "d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4";
};
}
{
- name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz";
+ name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz";
- sha1 = "feae523391c7651ddac115dae0a9d06857892007";
+ name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
+ sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709";
};
}
{
- name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz";
+ name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz";
path = fetchurl {
- name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz";
- sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8";
+ name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
+ sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb";
};
}
{
@@ -898,11 +906,11 @@
};
}
{
- name = "_babel_preset_env___preset_env_7.11.5.tgz";
+ name = "_babel_preset_env___preset_env_7.12.1.tgz";
path = fetchurl {
- name = "_babel_preset_env___preset_env_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz";
- sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272";
+ name = "_babel_preset_env___preset_env_7.12.1.tgz";
+ url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz";
+ sha1 = "9c7e5ca82a19efc865384bb4989148d2ee5d7ac2";
};
}
{
@@ -922,11 +930,11 @@
};
}
{
- name = "_babel_preset_react___preset_react_7.10.4.tgz";
+ name = "_babel_preset_react___preset_react_7.12.5.tgz";
path = fetchurl {
- name = "_babel_preset_react___preset_react_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz";
- sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf";
+ name = "_babel_preset_react___preset_react_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz";
+ sha1 = "d45625f65d53612078a43867c5c6750e78772c56";
};
}
{
@@ -938,11 +946,11 @@
};
}
{
- name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz";
+ name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz";
path = fetchurl {
- name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz";
- sha1 = "02c3029743150188edeb66541195f54600278419";
+ name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz";
+ sha1 = "ffee91da0eb4c6dae080774e94ba606368e414f4";
};
}
{
@@ -954,11 +962,11 @@
};
}
{
- name = "_babel_runtime___runtime_7.11.2.tgz";
+ name = "_babel_runtime___runtime_7.12.5.tgz";
path = fetchurl {
- name = "_babel_runtime___runtime_7.11.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz";
- sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736";
+ name = "_babel_runtime___runtime_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz";
+ sha1 = "410e7e487441e1b360c29be715d870d9b985882e";
};
}
{
@@ -970,19 +978,19 @@
};
}
{
- name = "_babel_traverse___traverse_7.11.5.tgz";
+ name = "_babel_traverse___traverse_7.12.5.tgz";
path = fetchurl {
- name = "_babel_traverse___traverse_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz";
- sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3";
+ name = "_babel_traverse___traverse_7.12.5.tgz";
+ url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz";
+ sha1 = "78a0c68c8e8a35e4cacfd31db8bb303d5606f095";
};
}
{
- name = "_babel_types___types_7.11.5.tgz";
+ name = "_babel_types___types_7.12.6.tgz";
path = fetchurl {
- name = "_babel_types___types_7.11.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz";
- sha1 = "d9de577d01252d77c6800cee039ee64faf75662d";
+ name = "_babel_types___types_7.12.6.tgz";
+ url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz";
+ sha1 = "ae0e55ef1cce1fbc881cd26f8234eb3e657edc96";
};
}
{
@@ -1034,11 +1042,11 @@
};
}
{
- name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz";
+ name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz";
path = fetchurl {
- name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz";
- url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.11.tgz";
- sha1 = "c1a95a2bdb6a18fa97b355a563832e248bf6ef4a";
+ name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz";
+ url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz";
+ sha1 = "fbdea86e8b73032895e6ded1ee1dbb1874902d1a";
};
}
{
@@ -1162,11 +1170,11 @@
};
}
{
- name = "_jest_types___types_25.5.0.tgz";
+ name = "_jest_types___types_26.6.2.tgz";
path = fetchurl {
- name = "_jest_types___types_25.5.0.tgz";
- url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz";
- sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d";
+ name = "_jest_types___types_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz";
+ sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e";
};
}
{
@@ -1218,11 +1226,11 @@
};
}
{
- name = "_sinonjs_samsam___samsam_5.2.0.tgz";
+ name = "_sinonjs_samsam___samsam_5.3.0.tgz";
path = fetchurl {
- name = "_sinonjs_samsam___samsam_5.2.0.tgz";
- url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.2.0.tgz";
- sha1 = "fcff83ab86f83b5498f4a967869c079408d9b5eb";
+ name = "_sinonjs_samsam___samsam_5.3.0.tgz";
+ url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz";
+ sha1 = "1d2f0743dc54bf13fe9d508baefacdffa25d4329";
};
}
{
@@ -1354,11 +1362,11 @@
};
}
{
- name = "_types_babel__core___babel__core_7.1.10.tgz";
+ name = "_types_babel__core___babel__core_7.1.12.tgz";
path = fetchurl {
- name = "_types_babel__core___babel__core_7.1.10.tgz";
- url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz";
- sha1 = "ca58fc195dd9734e77e57c6f2df565623636ab40";
+ name = "_types_babel__core___babel__core_7.1.12.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz";
+ sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d";
};
}
{
@@ -1370,11 +1378,11 @@
};
}
{
- name = "_types_babel__template___babel__template_7.0.3.tgz";
+ name = "_types_babel__template___babel__template_7.4.0.tgz";
path = fetchurl {
- name = "_types_babel__template___babel__template_7.0.3.tgz";
- url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz";
- sha1 = "b8aaeba0a45caca7b56a5de9459872dde3727214";
+ name = "_types_babel__template___babel__template_7.4.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz";
+ sha1 = "0c888dd70b3ee9eebb6e4f200e809da0076262be";
};
}
{
@@ -1402,11 +1410,11 @@
};
}
{
- name = "_types_enzyme___enzyme_3.10.7.tgz";
+ name = "_types_enzyme___enzyme_3.10.8.tgz";
path = fetchurl {
- name = "_types_enzyme___enzyme_3.10.7.tgz";
- url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.7.tgz";
- sha1 = "ebdf3b972d293095e09af479e36c772025285e3a";
+ name = "_types_enzyme___enzyme_3.10.8.tgz";
+ url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.8.tgz";
+ sha1 = "ad7ac9d3af3de6fd0673773123fafbc63db50d42";
};
}
{
@@ -1466,19 +1474,27 @@
};
}
{
- name = "_types_jest___jest_26.0.14.tgz";
+ name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
path = fetchurl {
- name = "_types_jest___jest_26.0.14.tgz";
- url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz";
- sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3";
+ name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz";
+ sha1 = "508b13aa344fa4976234e75dddcc34925737d821";
};
}
{
- name = "_types_jquery___jquery_3.5.2.tgz";
+ name = "_types_jest___jest_26.0.15.tgz";
path = fetchurl {
- name = "_types_jquery___jquery_3.5.2.tgz";
- url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.2.tgz";
- sha1 = "e17c1756ecf7bbb431766c6761674a5d1de16579";
+ name = "_types_jest___jest_26.0.15.tgz";
+ url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz";
+ sha1 = "12e02c0372ad0548e07b9f4e19132b834cb1effe";
+ };
+ }
+ {
+ name = "_types_jquery___jquery_3.5.4.tgz";
+ path = fetchurl {
+ name = "_types_jquery___jquery_3.5.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.4.tgz";
+ sha1 = "e923f7d05ca790530f17f80a3b89bc28853fa17f";
};
}
{
@@ -1514,19 +1530,19 @@
};
}
{
- name = "_types_node___node_14.11.5.tgz";
+ name = "_types_node___node_14.14.8.tgz";
path = fetchurl {
- name = "_types_node___node_14.11.5.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz";
- sha1 = "fecad41c041cae7f2404ad4b2d0742fdb628b305";
+ name = "_types_node___node_14.14.8.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz";
+ sha1 = "2127bd81949a95c8b7d3240f3254352d72563aec";
};
}
{
- name = "_types_node___node_12.12.64.tgz";
+ name = "_types_node___node_12.19.5.tgz";
path = fetchurl {
- name = "_types_node___node_12.12.64.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.64.tgz";
- sha1 = "e3b336dc4c6ba52c6b59e3bd69a100347c20b1c0";
+ name = "_types_node___node_12.19.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz";
+ sha1 = "9be3946136e818597c71c62d04240d0602c645d4";
};
}
{
@@ -1570,11 +1586,11 @@
};
}
{
- name = "_types_react_dom___react_dom_16.9.8.tgz";
+ name = "_types_react_dom___react_dom_16.9.9.tgz";
path = fetchurl {
- name = "_types_react_dom___react_dom_16.9.8.tgz";
- url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz";
- sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423";
+ name = "_types_react_dom___react_dom_16.9.9.tgz";
+ url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz";
+ sha1 = "d2d0a6f720a0206369ccbefff752ba37b9583136";
};
}
{
@@ -1594,19 +1610,19 @@
};
}
{
- name = "_types_react___react_16.9.51.tgz";
+ name = "_types_react___react_16.9.56.tgz";
path = fetchurl {
- name = "_types_react___react_16.9.51.tgz";
- url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.51.tgz";
- sha1 = "f8aa51ffa9996f1387f63686696d9b59713d2b60";
+ name = "_types_react___react_16.9.56.tgz";
+ url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz";
+ sha1 = "ea25847b53c5bec064933095fc366b1462e2adf0";
};
}
{
- name = "_types_reactstrap___reactstrap_8.5.1.tgz";
+ name = "_types_reactstrap___reactstrap_8.7.2.tgz";
path = fetchurl {
- name = "_types_reactstrap___reactstrap_8.5.1.tgz";
- url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.5.1.tgz";
- sha1 = "bd01ed7b14b9aeb476c0b8e195443dda98ac6156";
+ name = "_types_reactstrap___reactstrap_8.7.2.tgz";
+ url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.7.2.tgz";
+ sha1 = "0ab86f35e472e8f2002eaf8c7a42193c9cea6add";
};
}
{
@@ -1674,11 +1690,11 @@
};
}
{
- name = "_types_yargs___yargs_15.0.7.tgz";
+ name = "_types_yargs___yargs_15.0.10.tgz";
path = fetchurl {
- name = "_types_yargs___yargs_15.0.7.tgz";
- url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz";
- sha1 = "dad50a7a234a35ef9460737a56024287a3de1d2b";
+ name = "_types_yargs___yargs_15.0.10.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz";
+ sha1 = "0fe3c8173a0d5c3e780b389050140c3f5ea6ea74";
};
}
{
@@ -2002,11 +2018,11 @@
};
}
{
- name = "ajv___ajv_6.12.5.tgz";
+ name = "ajv___ajv_6.12.6.tgz";
path = fetchurl {
- name = "ajv___ajv_6.12.5.tgz";
- url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz";
- sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da";
+ name = "ajv___ajv_6.12.6.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
+ sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
};
}
{
@@ -2258,19 +2274,19 @@
};
}
{
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+ name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz";
path = fetchurl {
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
- sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
+ 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.3.tgz";
+ name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz";
path = fetchurl {
- name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz";
- sha1 = "1c13f84a178566042dd63de4414440db9222e443";
+ 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";
};
}
{
@@ -2410,19 +2426,19 @@
};
}
{
- name = "aws4___aws4_1.10.1.tgz";
+ name = "aws4___aws4_1.11.0.tgz";
path = fetchurl {
- name = "aws4___aws4_1.10.1.tgz";
- url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz";
- sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428";
+ name = "aws4___aws4_1.11.0.tgz";
+ url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz";
+ sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59";
};
}
{
- name = "axe_core___axe_core_3.5.5.tgz";
+ name = "axe_core___axe_core_4.1.0.tgz";
path = fetchurl {
- name = "axe_core___axe_core_3.5.5.tgz";
- url = "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz";
- sha1 = "84315073b53fa3c0c51676c588d59da09a192227";
+ name = "axe_core___axe_core_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz";
+ sha1 = "93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd";
};
}
{
@@ -2506,11 +2522,11 @@
};
}
{
- name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz";
+ name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.7.tgz";
path = fetchurl {
- name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz";
- url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz";
- sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be";
+ name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.7.tgz";
+ url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz";
+ sha1 = "156cd55d3f1228a5765774340937afc8398067dd";
};
}
{
@@ -2578,11 +2594,11 @@
};
}
{
- name = "base64_js___base64_js_1.3.1.tgz";
+ name = "base64_js___base64_js_1.5.1.tgz";
path = fetchurl {
- name = "base64_js___base64_js_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz";
- sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1";
+ name = "base64_js___base64_js_1.5.1.tgz";
+ url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz";
+ sha1 = "1b1b440160a5bf7ad40b650f095963481903930a";
};
}
{
@@ -2690,11 +2706,11 @@
};
}
{
- name = "bootstrap___bootstrap_4.5.2.tgz";
+ name = "bootstrap___bootstrap_4.5.3.tgz";
path = fetchurl {
- name = "bootstrap___bootstrap_4.5.2.tgz";
- url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz";
- sha1 = "a85c4eda59155f0d71186b6e6ad9b875813779ab";
+ name = "bootstrap___bootstrap_4.5.3.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz";
+ sha1 = "c6a72b355aaf323920be800246a6e4ef30997fe6";
};
}
{
@@ -2770,11 +2786,11 @@
};
}
{
- name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+ name = "browserify_rsa___browserify_rsa_4.1.0.tgz";
path = fetchurl {
- name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
- sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+ name = "browserify_rsa___browserify_rsa_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
+ sha1 = "b2fd06b5b75ae297f7ce2dc651f918f5be158c8d";
};
}
{
@@ -2802,11 +2818,11 @@
};
}
{
- name = "browserslist___browserslist_4.14.5.tgz";
+ name = "browserslist___browserslist_4.14.7.tgz";
path = fetchurl {
- name = "browserslist___browserslist_4.14.5.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz";
- sha1 = "1c751461a102ddc60e40993639b709be7f2c4015";
+ name = "browserslist___browserslist_4.14.7.tgz";
+ url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz";
+ sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6";
};
}
{
@@ -2897,6 +2913,14 @@
sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2";
};
}
+ {
+ name = "call_bind___call_bind_1.0.0.tgz";
+ path = fetchurl {
+ name = "call_bind___call_bind_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz";
+ sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce";
+ };
+ }
{
name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
path = fetchurl {
@@ -2970,11 +2994,11 @@
};
}
{
- name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz";
+ name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz";
path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001146.tgz";
- sha1 = "c61fcb1474520c1462913689201fb292ba6f447c";
+ name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz";
+ url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz";
+ sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20";
};
}
{
@@ -3017,14 +3041,6 @@
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
};
}
- {
- name = "chalk___chalk_3.0.0.tgz";
- path = fetchurl {
- name = "chalk___chalk_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
- sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
- };
- }
{
name = "chalk___chalk_4.1.0.tgz";
path = fetchurl {
@@ -3058,11 +3074,11 @@
};
}
{
- name = "chokidar___chokidar_3.4.2.tgz";
+ name = "chokidar___chokidar_3.4.3.tgz";
path = fetchurl {
- name = "chokidar___chokidar_3.4.2.tgz";
- url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz";
- sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d";
+ name = "chokidar___chokidar_3.4.3.tgz";
+ url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz";
+ sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b";
};
}
{
@@ -3234,19 +3250,19 @@
};
}
{
- name = "color_string___color_string_1.5.3.tgz";
+ name = "color_string___color_string_1.5.4.tgz";
path = fetchurl {
- name = "color_string___color_string_1.5.3.tgz";
- url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz";
- sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc";
+ name = "color_string___color_string_1.5.4.tgz";
+ url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz";
+ sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6";
};
}
{
- name = "color___color_3.1.2.tgz";
+ name = "color___color_3.1.3.tgz";
path = fetchurl {
- name = "color___color_3.1.2.tgz";
- url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz";
- sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10";
+ name = "color___color_3.1.3.tgz";
+ url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz";
+ sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e";
};
}
{
@@ -3354,11 +3370,11 @@
};
}
{
- name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
+ name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz";
path = fetchurl {
- name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
- url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz";
- sha1 = "72bc13b483c0276801681871d4898516f8f54fdd";
+ 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";
};
}
{
@@ -3466,19 +3482,19 @@
};
}
{
- name = "core_js_compat___core_js_compat_3.6.5.tgz";
+ name = "core_js_compat___core_js_compat_3.7.0.tgz";
path = fetchurl {
- name = "core_js_compat___core_js_compat_3.6.5.tgz";
- url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz";
- sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c";
+ name = "core_js_compat___core_js_compat_3.7.0.tgz";
+ url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz";
+ sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed";
};
}
{
- name = "core_js_pure___core_js_pure_3.6.5.tgz";
+ name = "core_js_pure___core_js_pure_3.7.0.tgz";
path = fetchurl {
- name = "core_js_pure___core_js_pure_3.6.5.tgz";
- url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz";
- sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813";
+ name = "core_js_pure___core_js_pure_3.7.0.tgz";
+ url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz";
+ sha1 = "28a57c861d5698e053f0ff36905f7a3301b4191e";
};
}
{
@@ -3490,11 +3506,11 @@
};
}
{
- name = "core_js___core_js_3.6.5.tgz";
+ name = "core_js___core_js_3.7.0.tgz";
path = fetchurl {
- name = "core_js___core_js_3.6.5.tgz";
- url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz";
- sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a";
+ name = "core_js___core_js_3.7.0.tgz";
+ url = "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz";
+ sha1 = "b0a761a02488577afbf97179e4681bf49568520f";
};
}
{
@@ -3666,11 +3682,11 @@
};
}
{
- name = "css_tree___css_tree_1.0.0_alpha.39.tgz";
+ name = "css_tree___css_tree_1.1.1.tgz";
path = fetchurl {
- name = "css_tree___css_tree_1.0.0_alpha.39.tgz";
- url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz";
- sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb";
+ name = "css_tree___css_tree_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz";
+ sha1 = "30b8c0161d9fb4e9e2141d762589b6ec2faebd2e";
};
}
{
@@ -3682,11 +3698,11 @@
};
}
{
- name = "css_what___css_what_3.4.1.tgz";
+ name = "css_what___css_what_3.4.2.tgz";
path = fetchurl {
- name = "css_what___css_what_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.1.tgz";
- sha1 = "81cb70b609e4b1351b1e54cbc90fd9c54af86e2e";
+ name = "css_what___css_what_3.4.2.tgz";
+ url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz";
+ sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4";
};
}
{
@@ -3778,11 +3794,11 @@
};
}
{
- name = "csso___csso_4.0.3.tgz";
+ name = "csso___csso_4.1.1.tgz";
path = fetchurl {
- name = "csso___csso_4.0.3.tgz";
- url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz";
- sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903";
+ name = "csso___csso_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz";
+ sha1 = "e0cb02d6eb3af1df719222048e4359efd662af13";
};
}
{
@@ -3818,11 +3834,11 @@
};
}
{
- name = "csstype___csstype_3.0.3.tgz";
+ name = "csstype___csstype_3.0.5.tgz";
path = fetchurl {
- name = "csstype___csstype_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz";
- sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8";
+ name = "csstype___csstype_3.0.5.tgz";
+ url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz";
+ sha1 = "7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8";
};
}
{
@@ -3882,19 +3898,19 @@
};
}
{
- name = "debug___debug_3.2.6.tgz";
+ name = "debug___debug_3.2.7.tgz";
path = fetchurl {
- name = "debug___debug_3.2.6.tgz";
- url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz";
- sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b";
+ name = "debug___debug_3.2.7.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz";
+ sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a";
};
}
{
- name = "debug___debug_4.2.0.tgz";
+ name = "debug___debug_4.3.1.tgz";
path = fetchurl {
- name = "debug___debug_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz";
- sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1";
+ name = "debug___debug_4.3.1.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz";
+ sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee";
};
}
{
@@ -4050,11 +4066,11 @@
};
}
{
- name = "diff_sequences___diff_sequences_25.2.6.tgz";
+ name = "diff_sequences___diff_sequences_26.6.2.tgz";
path = fetchurl {
- name = "diff_sequences___diff_sequences_25.2.6.tgz";
- url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz";
- sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd";
+ name = "diff_sequences___diff_sequences_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz";
+ sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1";
};
}
{
@@ -4330,11 +4346,11 @@
};
}
{
- name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz";
+ name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz";
path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz";
- sha1 = "e6671936f4571a874eb26e2e833aa0b2c0b776e0";
+ name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz";
+ url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz";
+ sha1 = "881824eaef0b2f97c89e1abb5835fdd224997d34";
};
}
{
@@ -4362,11 +4378,11 @@
};
}
{
- name = "emoji_regex___emoji_regex_9.0.0.tgz";
+ name = "emoji_regex___emoji_regex_9.2.0.tgz";
path = fetchurl {
- name = "emoji_regex___emoji_regex_9.0.0.tgz";
- url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz";
- sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4";
+ name = "emoji_regex___emoji_regex_9.2.0.tgz";
+ url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz";
+ sha1 = "a26da8e832b16a9753309f25e35e3c0efb9a066a";
};
}
{
@@ -4418,11 +4434,11 @@
};
}
{
- name = "entities___entities_2.0.3.tgz";
+ name = "entities___entities_2.1.0.tgz";
path = fetchurl {
- name = "entities___entities_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz";
- sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f";
+ name = "entities___entities_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz";
+ sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5";
};
}
{
@@ -4530,11 +4546,11 @@
};
}
{
- name = "escalade___escalade_3.1.0.tgz";
+ name = "escalade___escalade_3.1.1.tgz";
path = fetchurl {
- name = "escalade___escalade_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz";
- sha1 = "e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e";
+ name = "escalade___escalade_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz";
+ sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40";
};
}
{
@@ -4570,11 +4586,11 @@
};
}
{
- name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz";
+ name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz";
path = fetchurl {
- name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz";
- sha1 = "9eb2bccff727db1c52104f0b49e87ea46605a0d2";
+ name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz";
+ sha1 = "7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9";
};
}
{
@@ -4650,11 +4666,11 @@
};
}
{
- name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz";
+ 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.3.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz";
- sha1 = "99ef7e97f567cc6a5b8dd5ab95a94a67058a2660";
+ 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";
};
}
{
@@ -4690,11 +4706,11 @@
};
}
{
- name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz";
+ name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz";
path = fetchurl {
- name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.3.tgz";
- sha1 = "71655d2af5155b19285ec929dd2cdc67a4470b52";
+ name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz";
+ sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3";
};
}
{
@@ -5378,11 +5394,11 @@
};
}
{
- name = "gensync___gensync_1.0.0_beta.1.tgz";
+ name = "gensync___gensync_1.0.0_beta.2.tgz";
path = fetchurl {
- name = "gensync___gensync_1.0.0_beta.1.tgz";
- url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz";
- sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269";
+ name = "gensync___gensync_1.0.0_beta.2.tgz";
+ url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz";
+ sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0";
};
}
{
@@ -5393,6 +5409,14 @@
sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
};
}
+ {
+ name = "get_intrinsic___get_intrinsic_1.0.1.tgz";
+ path = fetchurl {
+ name = "get_intrinsic___get_intrinsic_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+ sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be";
+ };
+ }
{
name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz";
path = fetchurl {
@@ -5906,11 +5930,11 @@
};
}
{
- name = "ieee754___ieee754_1.1.13.tgz";
+ name = "ieee754___ieee754_1.2.1.tgz";
path = fetchurl {
- name = "ieee754___ieee754_1.1.13.tgz";
- url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz";
- sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84";
+ name = "ieee754___ieee754_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz";
+ sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352";
};
}
{
@@ -5962,11 +5986,11 @@
};
}
{
- name = "import_fresh___import_fresh_3.2.1.tgz";
+ name = "import_fresh___import_fresh_3.2.2.tgz";
path = fetchurl {
- name = "import_fresh___import_fresh_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
- sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
+ name = "import_fresh___import_fresh_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz";
+ sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e";
};
}
{
@@ -6233,6 +6257,14 @@
sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
};
}
+ {
+ name = "is_core_module___is_core_module_2.1.0.tgz";
+ path = fetchurl {
+ name = "is_core_module___is_core_module_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz";
+ sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946";
+ };
+ }
{
name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
path = fetchurl {
@@ -6674,11 +6706,11 @@
};
}
{
- name = "jest_diff___jest_diff_25.5.0.tgz";
+ name = "jest_diff___jest_diff_26.6.2.tgz";
path = fetchurl {
- name = "jest_diff___jest_diff_25.5.0.tgz";
- url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz";
- sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9";
+ name = "jest_diff___jest_diff_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz";
+ sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394";
};
}
{
@@ -6738,11 +6770,11 @@
};
}
{
- name = "jest_get_type___jest_get_type_25.2.6.tgz";
+ name = "jest_get_type___jest_get_type_26.3.0.tgz";
path = fetchurl {
- name = "jest_get_type___jest_get_type_25.2.6.tgz";
- url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz";
- sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877";
+ name = "jest_get_type___jest_get_type_26.3.0.tgz";
+ url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz";
+ sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0";
};
}
{
@@ -7113,6 +7145,14 @@
sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e";
};
}
+ {
+ name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz";
+ path = fetchurl {
+ name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz";
+ sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891";
+ };
+ }
{
name = "just_extend___just_extend_4.1.1.tgz";
path = fetchurl {
@@ -7178,11 +7218,11 @@
};
}
{
- name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz";
+ name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz";
path = fetchurl {
- name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz";
- url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz";
- sha1 = "a00a37121894f224f763268e431c55556b0c0755";
+ name = "language_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";
};
}
{
@@ -7505,6 +7545,14 @@
sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f";
};
}
+ {
+ 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 {
@@ -7513,14 +7561,6 @@
sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b";
};
}
- {
- name = "mdn_data___mdn_data_2.0.6.tgz";
- path = fetchurl {
- name = "mdn_data___mdn_data_2.0.6.tgz";
- url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz";
- sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978";
- };
- }
{
name = "media_typer___media_typer_0.3.0.tgz";
path = fetchurl {
@@ -7762,11 +7802,11 @@
};
}
{
- name = "moment_timezone___moment_timezone_0.5.31.tgz";
+ name = "moment_timezone___moment_timezone_0.5.32.tgz";
path = fetchurl {
- name = "moment_timezone___moment_timezone_0.5.31.tgz";
- url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz";
- sha1 = "9c40d8c5026f0c7ab46eda3d63e49c155148de05";
+ name = "moment_timezone___moment_timezone_0.5.32.tgz";
+ url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz";
+ sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2";
};
}
{
@@ -7850,11 +7890,11 @@
};
}
{
- name = "nan___nan_2.14.1.tgz";
+ name = "nan___nan_2.14.2.tgz";
path = fetchurl {
- name = "nan___nan_2.14.1.tgz";
- url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz";
- sha1 = "d7be34dfa3105b91494c3147089315eff8874b01";
+ name = "nan___nan_2.14.2.tgz";
+ url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz";
+ sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19";
};
}
{
@@ -7978,11 +8018,11 @@
};
}
{
- name = "node_releases___node_releases_1.1.61.tgz";
+ name = "node_releases___node_releases_1.1.67.tgz";
path = fetchurl {
- name = "node_releases___node_releases_1.1.61.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz";
- sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e";
+ name = "node_releases___node_releases_1.1.67.tgz";
+ url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz";
+ sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12";
};
}
{
@@ -8138,11 +8178,11 @@
};
}
{
- name = "object.assign___object.assign_4.1.1.tgz";
+ name = "object.assign___object.assign_4.1.2.tgz";
path = fetchurl {
- name = "object.assign___object.assign_4.1.1.tgz";
- url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz";
- sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd";
+ name = "object.assign___object.assign_4.1.2.tgz";
+ url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz";
+ sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940";
};
}
{
@@ -8970,11 +9010,11 @@
};
}
{
- name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz";
+ name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz";
path = fetchurl {
- name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz";
- url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz";
- sha1 = "71dd3c6c10a0d846c5eda07803439617bbbabacc";
+ name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz";
+ sha1 = "42d4c0ab30894f60f98b17561eb5c0321f502641";
};
}
{
@@ -9426,11 +9466,11 @@
};
}
{
- name = "pretty_error___pretty_error_2.1.1.tgz";
+ name = "pretty_error___pretty_error_2.1.2.tgz";
path = fetchurl {
- name = "pretty_error___pretty_error_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz";
- sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3";
+ name = "pretty_error___pretty_error_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz";
+ sha1 = "be89f82d81b1c86ec8fdfbc385045882727f93b6";
};
}
{
@@ -9442,11 +9482,11 @@
};
}
{
- name = "pretty_format___pretty_format_25.5.0.tgz";
+ name = "pretty_format___pretty_format_26.6.2.tgz";
path = fetchurl {
- name = "pretty_format___pretty_format_25.5.0.tgz";
- url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz";
- sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a";
+ name = "pretty_format___pretty_format_26.6.2.tgz";
+ url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz";
+ sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93";
};
}
{
@@ -9482,11 +9522,11 @@
};
}
{
- name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
+ name = "promise_polyfill___promise_polyfill_8.2.0.tgz";
path = fetchurl {
- name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
- url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz";
- sha1 = "8c99b3cf53f3a91c68226ffde7bde81d7f904116";
+ name = "promise_polyfill___promise_polyfill_8.2.0.tgz";
+ url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.0.tgz";
+ sha1 = "367394726da7561457aba2133c9ceefbd6267da0";
};
}
{
@@ -9498,11 +9538,11 @@
};
}
{
- name = "prompts___prompts_2.3.2.tgz";
+ name = "prompts___prompts_2.4.0.tgz";
path = fetchurl {
- name = "prompts___prompts_2.3.2.tgz";
- url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz";
- sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068";
+ name = "prompts___prompts_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz";
+ sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7";
};
}
{
@@ -9746,19 +9786,19 @@
};
}
{
- name = "react_dom___react_dom_16.13.1.tgz";
+ name = "react_dom___react_dom_16.14.0.tgz";
path = fetchurl {
- name = "react_dom___react_dom_16.13.1.tgz";
- url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz";
- sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f";
+ 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_error_overlay___react_error_overlay_6.0.7.tgz";
+ name = "react_error_overlay___react_error_overlay_6.0.8.tgz";
path = fetchurl {
- name = "react_error_overlay___react_error_overlay_6.0.7.tgz";
- url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz";
- sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108";
+ name = "react_error_overlay___react_error_overlay_6.0.8.tgz";
+ url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz";
+ sha1 = "474ed11d04fc6bda3af643447d85e9127ed6b5de";
};
}
{
@@ -9769,6 +9809,14 @@
sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4";
};
}
+ {
+ name = "react_is___react_is_17.0.1.tgz";
+ path = fetchurl {
+ name = "react_is___react_is_17.0.1.tgz";
+ url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz";
+ sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339";
+ };
+ }
{
name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz";
path = fetchurl {
@@ -9802,11 +9850,11 @@
};
}
{
- name = "react_test_renderer___react_test_renderer_16.13.1.tgz";
+ name = "react_test_renderer___react_test_renderer_16.14.0.tgz";
path = fetchurl {
- name = "react_test_renderer___react_test_renderer_16.13.1.tgz";
- url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz";
- sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1";
+ name = "react_test_renderer___react_test_renderer_16.14.0.tgz";
+ url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz";
+ sha1 = "e98360087348e260c56d4fe2315e970480c228ae";
};
}
{
@@ -9818,19 +9866,19 @@
};
}
{
- name = "react___react_16.13.1.tgz";
+ name = "react___react_16.14.0.tgz";
path = fetchurl {
- name = "react___react_16.13.1.tgz";
- url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz";
- sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e";
+ name = "react___react_16.14.0.tgz";
+ url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz";
+ sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d";
};
}
{
- name = "reactstrap___reactstrap_8.6.0.tgz";
+ name = "reactstrap___reactstrap_8.7.1.tgz";
path = fetchurl {
- name = "reactstrap___reactstrap_8.6.0.tgz";
- url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.6.0.tgz";
- sha1 = "baee0d12990c9fef3c82199fb05e84d9f0af1a26";
+ name = "reactstrap___reactstrap_8.7.1.tgz";
+ url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.7.1.tgz";
+ sha1 = "9631db8460a83a4d40fbee61abdd577b4f1a7069";
};
}
{
@@ -9890,11 +9938,11 @@
};
}
{
- name = "readdirp___readdirp_3.4.0.tgz";
+ name = "readdirp___readdirp_3.5.0.tgz";
path = fetchurl {
- name = "readdirp___readdirp_3.4.0.tgz";
- url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz";
- sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada";
+ name = "readdirp___readdirp_3.5.0.tgz";
+ url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz";
+ sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e";
};
}
{
@@ -9930,11 +9978,11 @@
};
}
{
- name = "regenerate___regenerate_1.4.1.tgz";
+ name = "regenerate___regenerate_1.4.2.tgz";
path = fetchurl {
- name = "regenerate___regenerate_1.4.1.tgz";
- url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz";
- sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f";
+ name = "regenerate___regenerate_1.4.2.tgz";
+ url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz";
+ sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a";
};
}
{
@@ -10042,11 +10090,11 @@
};
}
{
- name = "renderkid___renderkid_2.0.3.tgz";
+ name = "renderkid___renderkid_2.0.4.tgz";
path = fetchurl {
- name = "renderkid___renderkid_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz";
- sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149";
+ name = "renderkid___renderkid_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz";
+ sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c";
};
}
{
@@ -10178,11 +10226,11 @@
};
}
{
- name = "resolve___resolve_1.17.0.tgz";
+ name = "resolve___resolve_1.19.0.tgz";
path = fetchurl {
- name = "resolve___resolve_1.17.0.tgz";
- url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz";
- sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444";
+ name = "resolve___resolve_1.19.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz";
+ sha1 = "1af5bf630409734a067cae29318aac7fa29a267c";
};
}
{
@@ -10634,11 +10682,11 @@
};
}
{
- name = "sinon___sinon_9.2.0.tgz";
+ name = "sinon___sinon_9.2.1.tgz";
path = fetchurl {
- name = "sinon___sinon_9.2.0.tgz";
- url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.0.tgz";
- sha1 = "1d333967e30023609f7347351ebc0dc964c0f3c9";
+ name = "sinon___sinon_9.2.1.tgz";
+ url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz";
+ sha1 = "64cc88beac718557055bd8caa526b34a2231be6d";
};
}
{
@@ -10874,11 +10922,11 @@
};
}
{
- name = "stack_utils___stack_utils_1.0.2.tgz";
+ name = "stack_utils___stack_utils_1.0.3.tgz";
path = fetchurl {
- name = "stack_utils___stack_utils_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz";
- sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8";
+ name = "stack_utils___stack_utils_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz";
+ sha1 = "db7a475733b5b8bf6521907b18891d29006f7751";
};
}
{
@@ -10994,19 +11042,19 @@
};
}
{
- name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz";
path = fetchurl {
- name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
- sha1 = "85812a6b847ac002270f5808146064c995fb6913";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz";
+ sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46";
};
}
{
- name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz";
path = fetchurl {
- name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
- sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54";
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz";
+ sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7";
};
}
{
@@ -11274,11 +11322,11 @@
};
}
{
- name = "timers_browserify___timers_browserify_2.0.11.tgz";
+ name = "timers_browserify___timers_browserify_2.0.12.tgz";
path = fetchurl {
- name = "timers_browserify___timers_browserify_2.0.11.tgz";
- url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz";
- sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f";
+ name = "timers_browserify___timers_browserify_2.0.12.tgz";
+ url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz";
+ sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee";
};
}
{
@@ -11426,11 +11474,11 @@
};
}
{
- name = "tslib___tslib_1.14.0.tgz";
+ name = "tslib___tslib_1.14.1.tgz";
path = fetchurl {
- name = "tslib___tslib_1.14.0.tgz";
- url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.0.tgz";
- sha1 = "d624983f3e2c5e0b55307c3dd6c86acd737622c6";
+ name = "tslib___tslib_1.14.1.tgz";
+ url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz";
+ sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00";
};
}
{
@@ -11770,11 +11818,11 @@
};
}
{
- name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
path = fetchurl {
- name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz";
- sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132";
};
}
{
@@ -11858,19 +11906,19 @@
};
}
{
- name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
+ name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz";
path = fetchurl {
- name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
- sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0";
+ name = "watchpack_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.4.tgz";
+ name = "watchpack___watchpack_1.7.5.tgz";
path = fetchurl {
- name = "watchpack___watchpack_1.7.4.tgz";
- url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz";
- sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b";
+ name = "watchpack___watchpack_1.7.5.tgz";
+ url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz";
+ sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453";
};
}
{
@@ -11986,11 +12034,11 @@
};
}
{
- name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz";
+ name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz";
path = fetchurl {
- name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz";
- sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3";
+ name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz";
+ url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz";
+ sha1 = "605a2cd0a7146e5db141e29d1c62ab84c0c4c868";
};
}
{
@@ -12018,11 +12066,11 @@
};
}
{
- name = "whatwg_url___whatwg_url_8.3.0.tgz";
+ name = "whatwg_url___whatwg_url_8.4.0.tgz";
path = fetchurl {
- name = "whatwg_url___whatwg_url_8.3.0.tgz";
- url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.3.0.tgz";
- sha1 = "d1e11e565334486cdb280d3101b9c3fd1c867582";
+ name = "whatwg_url___whatwg_url_8.4.0.tgz";
+ url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz";
+ sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837";
};
}
{
@@ -12250,11 +12298,11 @@
};
}
{
- name = "ws___ws_7.3.1.tgz";
+ name = "ws___ws_7.4.0.tgz";
path = fetchurl {
- name = "ws___ws_7.3.1.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz";
- sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8";
+ name = "ws___ws_7.4.0.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz";
+ sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7";
};
}
{
@@ -12274,11 +12322,11 @@
};
}
{
- name = "xregexp___xregexp_4.3.0.tgz";
+ name = "xregexp___xregexp_4.4.0.tgz";
path = fetchurl {
- name = "xregexp___xregexp_4.3.0.tgz";
- url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz";
- sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50";
+ name = "xregexp___xregexp_4.4.0.tgz";
+ url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz";
+ sha1 = "29660f5d6567cd2ef981dd4a50cb05d22c10719d";
};
}
{
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
index 8d14414897..f6415ca898 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
- version = "0.17.1";
+ version = "0.17.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
- sha256 = "07814hk6nmvvkf7xklrin24vp17wm6nby358gk20ri4man822q8c";
+ sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6";
};
vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8";
diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix
index 6b1e7de832..8d4b52a015 100644
--- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix
@@ -1,7 +1,10 @@
{ stdenv, fetchurl, nixosTests }:
let
- generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec {
+ generic = {
+ version, sha256,
+ eol ? false, extraVulnerabilities ? []
+ }: stdenv.mkDerivation rec {
pname = "nextcloud";
inherit version;
@@ -23,7 +26,8 @@ let
maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ];
license = licenses.agpl3Plus;
platforms = with platforms; unix;
- knownVulnerabilities = optional insecure "Nextcloud version ${version} is EOL";
+ knownVulnerabilities = extraVulnerabilities
+ ++ (optional eol "Nextcloud version ${version} is EOL");
};
};
in {
@@ -42,16 +46,19 @@ in {
nextcloud18 = generic {
version = "18.0.10";
sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6";
- insecure = true;
+ eol = true;
};
nextcloud19 = generic {
- version = "19.0.4";
- sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6";
+ version = "19.0.6";
+ sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg=";
+ extraVulnerabilities = [
+ "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed!"
+ ];
};
nextcloud20 = generic {
- version = "20.0.1";
- sha256 = "1z1fzz1i41k4dhdhi005l3gzkvnmmgqqz3rdr374cvk73q7bbiln";
+ version = "20.0.4";
+ sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA=";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix
index 76c1130c46..4511fbcd04 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix
@@ -3,4 +3,5 @@
callPackage ./generic.nix (args // {
version = "2.1.22";
sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3";
+ generation = "2_1";
})
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix
index 919fb44ee2..5cec13e4cd 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix
@@ -1,6 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
- version = "2.2.19";
- sha256 = "1f8axpxxpmzlb22k3lqsnw3096qjp6xd36brvq5xbdk698jw15jl";
+ version = "2.2.14";
+ sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q";
+ generation = "2_2";
})
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix
index bb81d0ca79..72af03af1d 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix
@@ -3,4 +3,5 @@
callPackage ./generic.nix (args // {
version = "3.0.23";
sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz";
+ generation = "3_0";
})
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix
index 8ade5aac03..15e11145d5 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix
@@ -3,4 +3,5 @@
callPackage ./generic.nix (args // {
version = "3.11.9";
sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c";
+ generation = "3_11";
})
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
index 97c7341c76..487dbdf07e 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,5 +1,9 @@
{ stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps
-, which, jre, version, sha256, coreutils, ...
+, which, jre, coreutils, nixosTests
+# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
+, generation
+, version, sha256
+, ...
}:
let
@@ -83,11 +87,22 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
'';
+ passthru = {
+ tests =
+ let
+ test = nixosTests."cassandra_${generation}";
+ in {
+ nixos =
+ assert test.testPackage.version == version;
+ test;
+ };
+ };
+
meta = with stdenv.lib; {
homepage = "http://cassandra.apache.org/";
description = "A massively scalable open source NoSQL database";
platforms = platforms.unix;
license = licenses.asl20;
- maintainers = [];
+ maintainers = [ maintainers.roberth ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix
index e27048b272..9e60e9f370 100644
--- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix
+++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.21.0.3711-b509cc236";
+ version = "1.21.1.3795-ee64ab56f";
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 = "0nhxxfcds3byhbz8gsd9107diy182m33xbcc8jgi78hwfadyjj7h";
+ sha256 = "1k4ayb5jygi9g78703r1z4y4m0mp66m6jc72zj4zqk4xckzvjf4f";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "0izsmcc337paakz1nqfsr78s097sxyxy3kbs43qpzpx7w5wshynb";
+ sha256 = "0qfc5k9sgi465pgrhv8nbm5p7s4wdpaljj54m2i7hfydva8ws8ci";
};
outputs = [ "out" "basedb" ];
diff --git a/third_party/nixpkgs/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch b/third_party/nixpkgs/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch
new file mode 100644
index 0000000000..6de704cba2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch
@@ -0,0 +1,569 @@
+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/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
index ec28834659..164604242d 100644
--- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
@@ -12,6 +12,7 @@
, docbook_xml_dtd_45
, readline
, popt
+, dbus
, libbsd
, libarchive
, zlib
@@ -43,11 +44,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "samba";
- version = "4.12.6";
+ version = "4.13.3";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
- sha256 = "1v3cmw40csmi3jd8mhlx4bm7bk4m0426zkyin7kq11skwnsrna02";
+ sha256 = "0hb5fli4kgwg376c289mcmdqszd51vs8pzzrw7j6yr9k7za8a1f1";
};
outputs = [ "out" "dev" "man" ];
@@ -57,6 +58,8 @@ 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 = [
@@ -79,6 +82,7 @@ stdenv.mkDerivation rec {
python
readline
popt
+ dbus
jansson
libbsd
libarchive
@@ -154,6 +158,7 @@ stdenv.mkDerivation rec {
description = "The standard Windows interoperability suite of programs for Linux and Unix";
license = licenses.gpl3;
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
maintainers = with maintainers; [ aneeshusa ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 28e3947f4b..ab80cd1748 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_hll";
- version = "2.15";
+ version = "2.15.1";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-hll";
rev = "refs/tags/v${version}";
- sha256 = "19d50cvp3byjyr2dc5rjmyrlp97bb19mz0ykr3w4iyc6qi5d5qj2";
+ sha256 = "17lg05rw7299fvfhdzvznr692c21s5qar1wzzvgwfv7afv6xzr3y";
};
installPhase = ''
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "HyperLogLog for PostgreSQL";
- homepage = "https://www.citusdata.com/";
+ homepage = "https://github.com/citusdata/postgresql-hll";
+ changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
index 0d6176d859..fdf4b40d3b 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
- version = "3.0.3";
+ version = "3.1.0";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
- sha256 = "05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7";
+ sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
index a32f8115e2..18803636a0 100644
--- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.2.8";
- tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7`
+ version = "1.2.10";
+ tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10`
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg";
+ sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/additional-php-ldflags.patch b/third_party/nixpkgs/pkgs/servers/uwsgi/additional-php-ldflags.patch
new file mode 100644
index 0000000000..8549d5c2d0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/uwsgi/additional-php-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
+index d930c44e..2fcbc22a 100644
+--- a/plugins/php/uwsgiplugin.py
++++ b/plugins/php/uwsgiplugin.py
+@@ -17,6 +17,8 @@ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0]
+ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare']
+ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+
++LDFLAGS.append(os.environ.get('UWSGICONFIG_PHP_LDFLAGS', []))
++
+ if ld_run_path:
+ LDFLAGS.append('-L%s' % ld_run_path)
+ os.environ['LD_RUN_PATH'] = ld_run_path
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
index 39a3113eb4..d9ed810cdf 100644
--- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre
+{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre
# plugins: list of strings, eg. [ "python2" "python3" ]
, plugins ? []
, pam, withPAM ? stdenv.isLinux
@@ -38,8 +38,12 @@ let php-embed = php.override {
(lib.nameValuePair "php" {
# usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
path = "plugins/php";
- inputs = [ php-embed ] ++ php-embed.buildInputs;
- NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
+ inputs = [
+ php-embed
+ php-embed.extensions.session
+ php-embed.extensions.session.dev
+ php-embed.unwrapped.dev
+ ] ++ php-embed.unwrapped.buildInputs;
})
];
@@ -61,6 +65,11 @@ stdenv.mkDerivation rec {
sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn";
};
+ patches = [
+ ./no-ext-session-php_session.h-on-NixOS.patch
+ ./additional-php-ldflags.patch
+ ];
+
nativeBuildInputs = [ python3 pkgconfig ];
buildInputs = [ jansson pcre ]
@@ -83,6 +92,16 @@ stdenv.mkDerivation rec {
substituteAll ${./nixos.ini} buildconf/nixos.ini
'';
+ # this is a hack to make the php plugin link with session.so (which on nixos is a separate package)
+ # the hack works in coordination with ./additional-php-ldflags.patch
+ UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed)
+ (lib.concatStringsSep "," [
+ "-Wl"
+ "-rpath=${php-embed.extensions.session}/lib/php/extensions/"
+ "--library-path=${php-embed.extensions.session}/lib/php/extensions/"
+ "-l:session.so"
+ ]);
+
buildPhase = ''
mkdir -p $pluginDir
python3 uwsgiconfig.py --build nixos
@@ -94,8 +113,6 @@ stdenv.mkDerivation rec {
${lib.concatMapStringsSep "\n" (x: x.install or "") needed}
'';
- NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed);
-
meta = with stdenv.lib; {
homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
@@ -103,4 +120,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar schneefux globin ];
platforms = platforms.unix;
};
+
+ passthru.tests.uwsgi = nixosTests.uwsgi;
+
}
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/third_party/nixpkgs/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
new file mode 100644
index 0000000000..bde8f4fda1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
@@ -0,0 +1,29 @@
+From 6b9b3559d8ce59eda6c5cd6f04224cebaaa5d0ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?=
+ =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
+
+Date: Tue, 8 Sep 2020 17:11:39 +0200
+Subject: [PATCH] no ext/session/php_session.h on NixOS
+
+on NixOS php_session.h is in its own package, and is not installed in
+ext/session/
+---
+ plugins/php/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/php/common.h b/plugins/php/common.h
+index 9bf1c069..be93f519 100644
+--- a/plugins/php/common.h
++++ b/plugins/php/common.h
+@@ -10,7 +10,7 @@
+ #endif
+ #include "ext/standard/info.h"
+
+-#include "ext/session/php_session.h"
++#include "php_session.h"
+
+ #include
+
+--
+2.28.0
+
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/frab/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/frab/default.nix
deleted file mode 100644
index 88e95be461..0000000000
--- a/third_party/nixpkgs/pkgs/servers/web-apps/frab/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, bundlerEnv, fetchFromGitHub, ruby, nodejs }:
-
-let
- env = bundlerEnv {
- name = "frab";
- inherit ruby;
- gemfile = ./Gemfile;
- lockfile = ./Gemfile.lock;
- gemset = ./gemset.nix;
- };
-
-in
-
-stdenv.mkDerivation {
- name = "frab-2016-12-28";
-
- src = fetchFromGitHub {
- owner = "frab";
- repo = "frab";
- rev = "e4bbcfd1a9db7f89f53a8702c236d9628bafb72c";
- sha256 = "04pzmif8jxjww3fdf2zbg3k7cm49vxc9hhf4xhmvdmvywgin6fqp";
- };
-
- buildInputs = [ env nodejs ];
-
- buildPhase = ''
- cp config/database.yml.template config/database.yml
- cp .env.development .env.production
- bundler exec rake assets:precompile RAILS_ENV=production
- rm .env.production
- '';
-
- installPhase = ''
- mkdir -p $out/share
- cp -r . $out/share/frab
-
- ln -sf /run/frab/database.yml $out/share/frab/config/database.yml
- rm -rf $out/share/frab/tmp $out/share/frab/public/system
- ln -sf /run/frab/system $out/share/frab/public/system
- ln -sf /tmp $out/share/frab/tmp
- '';
-
- passthru = {
- inherit env ruby;
- };
-
- meta = with stdenv.lib; {
- description = "Web-based conference planning and management system";
- homepage = "https://github.com/frab/frab";
- license = licenses.mit;
- broken = true; # 2018-09-08; no successful hydra build since 2018-02-14
- };
-}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix
similarity index 68%
rename from third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix
rename to third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix
index 7de539bb09..0e39895d39 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix
@@ -2,14 +2,14 @@
, which, nodejs, mkYarnPackage, python2, nixosTests }:
mkYarnPackage rec {
- name = "codimd";
- version = "1.6.0";
+ name = "hedgedoc";
+ version = "1.7.0";
src = fetchFromGitHub {
- owner = "codimd";
- repo = "server";
+ owner = "hedgedoc";
+ repo = "hedgedoc";
rev = version;
- sha256 = "1208a24v664ha9qzr7ky6i3ynphkaj0xi5l3rsw743i22nv5aj33";
+ sha256 = "1zz5ni9cp1dhcvcrzks13pww5qm2wna2hh0k59pfz7c897rs1l7v";
};
nativeBuildInputs = [ which makeWrapper ];
@@ -20,19 +20,15 @@ mkYarnPackage rec {
packageJSON = ./package.json;
postConfigure = ''
- rm deps/CodiMD/node_modules
- cp -R "$node_modules" deps/CodiMD
- chmod -R u+w deps/CodiMD
+ rm deps/HedgeDoc/node_modules
+ cp -R "$node_modules" deps/HedgeDoc
+ chmod -R u+w deps/HedgeDoc
'';
buildPhase = ''
runHook preBuild
- cd deps/CodiMD
-
- pushd node_modules/codemirror
- npm run install
- popd
+ cd deps/HedgeDoc
pushd node_modules/sqlite3
export CPPFLAGS="-I${nodejs}/include/node"
@@ -52,23 +48,23 @@ mkYarnPackage rec {
mkdir -p $out
cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out
- cat > $out/bin/codimd < $out/bin/hedgedoc <=4.14",
"express-session": "^1.14.2",
@@ -45,24 +46,24 @@
"flowchart.js": "^1.6.4",
"fork-awesome": "^1.1.3",
"formidable": "^1.0.17",
- "gist-embed": "~2.6.0",
+ "gist-embed": "^2.6.0",
"graceful-fs": "^4.1.11",
"handlebars": "^4.5.2",
"helmet": "^3.21.1",
- "highlight.js": "~9.12.0",
- "i18n": "^0.8.3",
+ "highlight.js": "^9.12.0",
+ "i18n": "^0.13.0",
"imgur": "git+https://github.com/hackmdio/node-imgur.git",
- "ionicons": "~2.0.1",
- "jquery": "^3.4.1",
+ "ionicons": "^2.0.1",
+ "jquery": "^3.5.1",
"jquery-mousewheel": "^3.1.13",
"jquery-ui": "^1.12.1",
"js-cookie": "^2.1.3",
- "js-sequence-diagrams": "git+https://github.com/codimd/js-sequence-diagrams.git",
+ "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "^3.13.1",
"jsdom-nogyp": "^0.8.3",
"keymaster": "^1.6.2",
"list.js": "^1.5.0",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.20",
"lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git",
"mariadb": "^2.1.2",
@@ -79,11 +80,10 @@
"markdown-it-regexp": "^0.4.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
- "markdown-pdf": "^10.0.0",
- "mathjax": "~2.7.6",
+ "mathjax": "^2.7.6",
"mattermost": "^3.4.0",
- "mermaid": "~8.4.6",
- "meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5",
+ "mermaid": "^8.5.1",
+ "meta-marked": "git+https://github.com/hedgedoc/meta-marked",
"method-override": "^2.3.7",
"minimist": "^1.2.0",
"minio": "^6.0.0",
@@ -103,22 +103,22 @@
"passport-twitter": "^1.0.4",
"passport.socketio": "^3.7.0",
"pdfobject": "^2.0.201604172",
- "pg": "^7.12.1",
+ "pg": "^8.2.1",
"pg-hstore": "^2.3.3",
- "prismjs": "^1.6.0",
- "randomcolor": "^0.5.3",
- "raphael": "git+https://github.com/dmitrybaranovskiy/raphael",
+ "prismjs": "^1.21.0",
+ "randomcolor": "^0.6.0",
+ "raphael": "^2.3.0",
"readline-sync": "^1.4.7",
"request": "^2.88.0",
- "reveal.js": "~3.9.2",
+ "reveal.js": "^3.9.2",
"scrypt-async": "^2.0.1",
"scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify",
"sequelize": "^5.21.1",
"sequelize-cli": "^5.5.1",
- "shortid": "2.2.8",
- "socket.io": "~2.1.1",
- "socket.io-client": "~2.1.1",
+ "shortid": "2.2.16",
+ "socket.io": "^2.1.1",
+ "socket.io-client": "^2.1.1",
"spin.js": "^2.3.2",
"sqlite3": "^4.1.0",
"store": "^2.0.12",
@@ -137,20 +137,20 @@
"xss": "^1.0.3"
},
"resolutions": {
- "**/tough-cookie": "~2.4.0",
+ "**/tough-cookie": "~2.5.0",
"**/minimatch": "^3.0.2",
"**/request": "^2.88.0"
},
"engines": {
- "node": ">=8.x"
+ "node": ">=10.13"
},
- "bugs": "https://github.com/codimd/server/issues",
+ "bugs": "https://github.com/hedgedoc/hedgedoc/issues",
"keywords": [
"Collaborative",
"Markdown",
"Notes"
],
- "homepage": "https://codimd.org",
+ "homepage": "https://hedgedoc.org",
"maintainers": [
{
"name": "Claudius Coenen",
@@ -164,42 +164,43 @@
],
"repository": {
"type": "git",
- "url": "https://github.com/codimd/server.git"
+ "url": "https://github.com/hedgedoc/hedgedoc.git"
},
"devDependencies": {
- "babel-cli": "^6.26.0",
- "babel-core": "^6.26.3",
- "babel-loader": "^7.1.4",
- "babel-plugin-transform-runtime": "^6.23.0",
- "babel-polyfill": "^6.26.0",
- "babel-preset-env": "^1.7.0",
- "babel-runtime": "^6.26.0",
- "copy-webpack-plugin": "^5.0.5",
- "css-loader": "^3.2.0",
- "eslint": "^5.9.0",
- "eslint-config-standard": "^12.0.0",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-node": "^8.0.0",
- "eslint-plugin-promise": "^4.0.1",
- "eslint-plugin-standard": "^4.0.0",
- "expose-loader": "^0.7.5",
- "file-loader": "^4.3.0",
- "html-webpack-plugin": "^4.0.0-beta.11",
- "imports-loader": "^0.8.0",
- "jsonlint": "^1.6.2",
- "less": "^3.10.3",
- "less-loader": "^5.0.0",
- "mini-css-extract-plugin": "^0.8.0",
- "mocha": "^5.2.0",
- "mock-require": "^3.0.3",
- "optimize-css-assets-webpack-plugin": "^5.0.3",
- "script-loader": "^0.7.2",
- "string-loader": "^0.0.1",
- "style-loader": "^1.0.0",
- "url-loader": "^2.3.0",
- "webpack": "^4.41.2",
- "webpack-cli": "^3.3.10",
- "webpack-merge": "^4.2.2"
+ "babel-cli": "6.26.0",
+ "babel-core": "6.26.3",
+ "babel-loader": "7.1.5",
+ "babel-plugin-transform-runtime": "6.23.0",
+ "babel-polyfill": "6.26.0",
+ "babel-preset-env": "1.7.0",
+ "babel-runtime": "6.26.0",
+ "copy-webpack-plugin": "6.4.1",
+ "css-loader": "3.6.0",
+ "eslint": "5.16.0",
+ "eslint-config-standard": "12.0.0",
+ "eslint-plugin-import": "2.22.1",
+ "eslint-plugin-node": "8.0.1",
+ "eslint-plugin-promise": "4.2.1",
+ "eslint-plugin-standard": "4.1.0",
+ "expose-loader": "0.7.5",
+ "file-loader": "4.3.0",
+ "html-webpack-plugin": "4.5.0",
+ "imports-loader": "0.8.0",
+ "jsonlint": "1.6.3",
+ "less": "3.13.1",
+ "less-loader": "5.0.0",
+ "mini-css-extract-plugin": "0.12.0",
+ "mocha": "5.2.0",
+ "mock-require": "3.0.3",
+ "optimize-css-assets-webpack-plugin": "5.0.4",
+ "remark-cli": "8.0.1",
+ "remark-preset-lint-markdown-style-guide": "3.0.1",
+ "script-loader": "0.7.2",
+ "string-loader": "0.0.1",
+ "url-loader": "2.3.0",
+ "webpack": "4.44.2",
+ "webpack-cli": "3.3.12",
+ "webpack-merge": "4.2.2"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock
similarity index 70%
rename from third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.lock
rename to third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock
index 4647468367..9ff34ceead 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.lock
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock
@@ -8,9 +8,9 @@
integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA==
"@azure/ms-rest-js@^1.8.7":
- version "1.8.14"
- resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz#657fc145db20b6eb3d58d1a2055473aa72eb609d"
- integrity sha512-IrCPN22c8RbKWA06ZXuFwwEb15cSnr0zZ6J8Fspp9ns1SSNTERf7hv+gWvTIis1FlwHy42Mfk8hVu0/r3a0AWA==
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz#5eb6516cf20e972a2eb4c589d6b48c3151bc801b"
+ integrity sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==
dependencies:
"@types/tunnel" "0.0.0"
axios "^0.19.0"
@@ -31,19 +31,24 @@
adal-node "^0.1.28"
"@babel/code-frame@^7.0.0":
- version "7.8.3"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
- integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+ 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.8.3"
+ "@babel/highlight" "^7.10.4"
-"@babel/highlight@^7.8.3":
- version "7.8.3"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
- integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+"@babel/helper-validator-identifier@^7.10.4":
+ version "7.12.11"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+ integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/highlight@^7.10.4":
+ version "7.10.4"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+ integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
dependencies:
+ "@babel/helper-validator-identifier" "^7.10.4"
chalk "^2.0.0"
- esutils "^2.0.2"
js-tokens "^4.0.0"
"@braintree/sanitize-url@^3.1.0":
@@ -51,6 +56,43 @@
resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd"
integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==
+"@dabh/diagnostics@^2.0.2":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31"
+ integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==
+ dependencies:
+ colorspace "1.1.x"
+ enabled "2.0.x"
+ kuler "^2.0.0"
+
+"@nodelib/fs.scandir@2.1.3":
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+ integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+ dependencies:
+ "@nodelib/fs.stat" "2.0.3"
+ run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+ integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+ integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+ dependencies:
+ "@nodelib/fs.scandir" "2.1.3"
+ fastq "^1.6.0"
+
+"@npmcli/move-file@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
+ integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==
+ dependencies:
+ mkdirp "^1.0.4"
+
"@passport-next/passport-openid@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@passport-next/passport-openid/-/passport-openid-1.0.0.tgz#d3b5e067a9aa1388ed172ab7cc02c39b8634283d"
@@ -64,6 +106,11 @@
resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74"
integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w==
+"@types/anymatch@*":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+ integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
+
"@types/body-parser@*":
version "1.19.0"
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
@@ -79,26 +126,23 @@
dependencies:
"@types/node" "*"
-"@types/estree@0.0.39":
- version "0.0.39"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
- integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
"@types/express-serve-static-core@*":
- version "4.17.2"
- resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf"
- integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==
+ version "4.17.13"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084"
+ integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==
dependencies:
"@types/node" "*"
+ "@types/qs" "*"
"@types/range-parser" "*"
"@types/express@*":
- version "4.17.2"
- resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"
- integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==
+ version "4.17.9"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78"
+ integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==
dependencies:
"@types/body-parser" "*"
"@types/express-serve-static-core" "*"
+ "@types/qs" "*"
"@types/serve-static" "*"
"@types/geojson@^7946.0.7":
@@ -106,49 +150,69 @@
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
+"@types/html-minifier-terser@^5.0.0":
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
+ integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==
+
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+ integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+
+"@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/ldapjs@^1.0.0":
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz#2b078dff23dc068e12a8236b280d5fb4fd9db4db"
- integrity sha512-hrtMZjVfWNPxkwFkYhLAU0ITZ3/reDft4jDzLBvrGDSKCbEvW+GeZb4PgM3jlSwSsv0cXqnDeWcupFLIgW9E0Q==
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.9.tgz#1224192d14cc5ab5218fcea72ebb04489c52cb95"
+ integrity sha512-3PvY7Drp1zoLbcGlothCAkoc5o6Jp9KvUPwHadlHyKp3yPvyeIh7w2zQc9UXMzgDRkoeGXUEODtbEs5XCh9ZyA==
dependencies:
"@types/node" "*"
"@types/mime@*":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
- integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
+ integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==
-"@types/node@*", "@types/node@>=8.0.0":
- version "13.7.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz#238eb34a66431b71d2aaddeaa7db166f25971a0d"
- integrity sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==
-
-"@types/node@^10.12.12", "@types/node@^10.12.26":
- version "10.17.15"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7"
- integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==
+"@types/node@*":
+ version "14.14.7"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
+ integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
"@types/node@^12.12.17":
- version "12.12.27"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42"
- integrity sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A==
+ version "12.19.4"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz#cdfbb62e26c7435ed9aab9c941393cc3598e9b46"
+ integrity sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w==
+
+"@types/node@^14.14.7":
+ version "14.14.14"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
+ integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
"@types/node@^8.0.47":
- version "8.10.59"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04"
- integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==
+ version "8.10.66"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
+ integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==
"@types/passport@^1.0.0":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz#f085033e2b301b1f97d4b57bfa73d8e934650c63"
- integrity sha512-Pf39AYKf8q+YoONym3150cEwfUD66dtwHJWvbeOzKxnA0GZZ/vAXhNWv9vMhKyRQBQZiQyWQnhYBEBlKW6G8wg==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz#1b35c4e197560d3974fa5f71711b6e9cce0711f0"
+ integrity sha512-h5OfAbfBBYSzjeU0GTuuqYEk9McTgWeGQql9g3gUw2/NNCfD7VgExVRYJVVeU13Twn202Mvk9BT0bUrl30sEgA==
dependencies:
"@types/express" "*"
"@types/q@^1.5.1":
- version "1.5.2"
- resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
- integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
+ integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
+
+"@types/qs@*":
+ version "6.9.5"
+ resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"
+ integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==
"@types/range-parser@*":
version "1.2.3"
@@ -156,20 +220,30 @@
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
"@types/readable-stream@^2.3.5":
- version "2.3.5"
- resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz#99c215f9c78563ebdfeff400246a724fb36bae4a"
- integrity sha512-Mq2eLkGYamlcolW603FY2ROBvcl90jPF+3jLkjpBV6qS+2aVeJqlgRG0TVAa1oWbmPdb5yOWlOPVvQle76nUNw==
+ version "2.3.9"
+ resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9"
+ integrity sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw==
dependencies:
"@types/node" "*"
safe-buffer "*"
"@types/serve-static@*":
- version "1.13.3"
- resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
- integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
+ version "1.13.7"
+ resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz#e51b51a0becda910f9fd04c718044da69d6c492e"
+ integrity sha512-3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw==
dependencies:
- "@types/express-serve-static-core" "*"
"@types/mime" "*"
+ "@types/node" "*"
+
+"@types/source-list-map@*":
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+ integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
+"@types/tapable@*", "@types/tapable@^1.0.5":
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
+ integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
"@types/tunnel@0.0.0":
version "0.0.0"
@@ -178,150 +252,182 @@
dependencies:
"@types/node" "*"
-"@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==
+"@types/uglify-js@*":
+ version "3.11.1"
+ resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz#97ff30e61a0aa6876c270b5f538737e2d6ab8ceb"
+ integrity sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==
dependencies:
- "@webassemblyjs/helper-module-context" "1.8.5"
- "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
- "@webassemblyjs/wast-parser" "1.8.5"
+ source-map "^0.6.1"
-"@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==
+"@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/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==
+"@types/webpack-sources@*":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
+ integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==
dependencies:
- "@webassemblyjs/wast-printer" "1.8.5"
+ "@types/node" "*"
+ "@types/source-list-map" "*"
+ source-map "^0.7.3"
-"@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==
+"@types/webpack@^4.41.8":
+ version "4.41.25"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4"
+ integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==
dependencies:
- "@webassemblyjs/ast" "1.8.5"
- mamacro "^0.0.3"
+ "@types/anymatch" "*"
+ "@types/node" "*"
+ "@types/tapable" "*"
+ "@types/uglify-js" "*"
+ "@types/webpack-sources" "*"
+ source-map "^0.6.0"
-"@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==
+"@webassemblyjs/ast@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+ integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
dependencies:
- "@webassemblyjs/ast" "1.8.5"
- "@webassemblyjs/helper-buffer" "1.8.5"
- "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
- "@webassemblyjs/wasm-gen" "1.8.5"
+ "@webassemblyjs/helper-module-context" "1.9.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+ "@webassemblyjs/wast-parser" "1.9.0"
-"@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==
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+ integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+
+"@webassemblyjs/helper-api-error@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+ integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+ integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+ integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+ dependencies:
+ "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/helper-fsm@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+ integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+
+"@webassemblyjs/helper-module-context@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+ integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+ dependencies:
+ "@webassemblyjs/ast" "1.9.0"
+
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+ integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+ integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+ dependencies:
+ "@webassemblyjs/ast" "1.9.0"
+ "@webassemblyjs/helper-buffer" "1.9.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+ "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+ integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
dependencies:
"@xtuc/ieee754" "^1.2.0"
-"@webassemblyjs/leb128@1.8.5":
- version "1.8.5"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
- integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+ integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
dependencies:
"@xtuc/long" "4.2.2"
-"@webassemblyjs/utf8@1.8.5":
- version "1.8.5"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
- integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+"@webassemblyjs/utf8@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+ integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
-"@webassemblyjs/wasm-edit@1.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==
+"@webassemblyjs/wasm-edit@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+ integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
dependencies:
- "@webassemblyjs/ast" "1.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/ast" "1.9.0"
+ "@webassemblyjs/helper-buffer" "1.9.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+ "@webassemblyjs/helper-wasm-section" "1.9.0"
+ "@webassemblyjs/wasm-gen" "1.9.0"
+ "@webassemblyjs/wasm-opt" "1.9.0"
+ "@webassemblyjs/wasm-parser" "1.9.0"
+ "@webassemblyjs/wast-printer" "1.9.0"
-"@webassemblyjs/wasm-gen@1.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==
+"@webassemblyjs/wasm-gen@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+ integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
dependencies:
- "@webassemblyjs/ast" "1.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/ast" "1.9.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+ "@webassemblyjs/ieee754" "1.9.0"
+ "@webassemblyjs/leb128" "1.9.0"
+ "@webassemblyjs/utf8" "1.9.0"
-"@webassemblyjs/wasm-opt@1.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==
+"@webassemblyjs/wasm-opt@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+ integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
dependencies:
- "@webassemblyjs/ast" "1.8.5"
- "@webassemblyjs/helper-buffer" "1.8.5"
- "@webassemblyjs/wasm-gen" "1.8.5"
- "@webassemblyjs/wasm-parser" "1.8.5"
+ "@webassemblyjs/ast" "1.9.0"
+ "@webassemblyjs/helper-buffer" "1.9.0"
+ "@webassemblyjs/wasm-gen" "1.9.0"
+ "@webassemblyjs/wasm-parser" "1.9.0"
-"@webassemblyjs/wasm-parser@1.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==
+"@webassemblyjs/wasm-parser@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+ integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
dependencies:
- "@webassemblyjs/ast" "1.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/ast" "1.9.0"
+ "@webassemblyjs/helper-api-error" "1.9.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+ "@webassemblyjs/ieee754" "1.9.0"
+ "@webassemblyjs/leb128" "1.9.0"
+ "@webassemblyjs/utf8" "1.9.0"
-"@webassemblyjs/wast-parser@1.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==
+"@webassemblyjs/wast-parser@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+ integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
dependencies:
- "@webassemblyjs/ast" "1.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"
+ "@webassemblyjs/ast" "1.9.0"
+ "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+ "@webassemblyjs/helper-api-error" "1.9.0"
+ "@webassemblyjs/helper-code-frame" "1.9.0"
+ "@webassemblyjs/helper-fsm" "1.9.0"
"@xtuc/long" "4.2.2"
-"@webassemblyjs/wast-printer@1.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==
+"@webassemblyjs/wast-printer@1.9.0":
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+ integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
dependencies:
- "@webassemblyjs/ast" "1.8.5"
- "@webassemblyjs/wast-parser" "1.8.5"
+ "@webassemblyjs/ast" "1.9.0"
+ "@webassemblyjs/wast-parser" "1.9.0"
"@xtuc/long" "4.2.2"
"@xtuc/ieee754@^1.2.0":
@@ -344,9 +450,9 @@ JSV@^4.0.x:
integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
abab@^2.0.0:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
- integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+ integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
abbrev@1:
version "1.1.1"
@@ -361,11 +467,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
mime-types "~2.1.24"
negotiator "0.6.2"
-acorn-dynamic-import@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
- integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
acorn-globals@^4.1.0:
version "4.3.4"
resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -374,35 +475,25 @@ acorn-globals@^4.1.0:
acorn "^6.0.1"
acorn-walk "^6.0.1"
-acorn-jsx@^5.0.0, acorn-jsx@^5.0.1:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
- integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn-jsx@^5.0.0:
+ 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-walk@^6.0.1:
version "6.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
-acorn-walk@^7.0.0:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
- integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
-
acorn@^5.5.3:
- version "5.7.3"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
- integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+ version "5.7.4"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+ integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.1:
- version "6.4.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
- integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
-
-acorn@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
- integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.4.1:
+ version "6.4.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+ integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
adal-node@^0.1.28:
version "0.1.28"
@@ -424,45 +515,39 @@ after@0.8.2:
resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+aggregate-error@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+ integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+ dependencies:
+ clean-stack "^2.0.0"
+ indent-string "^4.0.0"
+
ajv-errors@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
- integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+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.2, ajv@^6.5.5, ajv@^6.9.1:
- version "6.11.0"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
- integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ 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"
-align-text@^0.1.1, align-text@^0.1.3:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
- integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
- dependencies:
- kind-of "^3.0.2"
- longest "^1.0.1"
- repeat-string "^1.5.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=
-ansi-colors@^3.0.0:
- version "3.2.4"
- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
- integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
ansi-escapes@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -483,6 +568,11 @@ ansi-regex@^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@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -495,16 +585,18 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+ansi-styles@^4.1.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+ integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+ dependencies:
+ color-convert "^2.0.1"
+
ansi-styles@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
-ansicolors@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
- integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
-
any-promise@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -526,36 +618,47 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
+anymatch@~3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+ integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+ dependencies:
+ normalize-path "^3.0.0"
+ picomatch "^2.0.4"
+
aproba@^1.0.3, aproba@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-archiver-utils@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
- integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=
+archiver-utils@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+ integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
dependencies:
- glob "^7.0.0"
- graceful-fs "^4.1.0"
+ glob "^7.1.4"
+ graceful-fs "^4.2.0"
lazystream "^1.0.0"
- lodash "^4.8.0"
- normalize-path "^2.0.0"
+ lodash.defaults "^4.2.0"
+ lodash.difference "^4.5.0"
+ lodash.flatten "^4.4.0"
+ lodash.isplainobject "^4.0.6"
+ lodash.union "^4.6.0"
+ normalize-path "^3.0.0"
readable-stream "^2.0.0"
-archiver@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
- integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=
+archiver@^5.0.2:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37"
+ integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA==
dependencies:
- archiver-utils "^1.3.0"
- async "^2.0.0"
+ archiver-utils "^2.1.0"
+ async "^3.2.0"
buffer-crc32 "^0.2.1"
- glob "^7.0.0"
- lodash "^4.8.0"
- readable-stream "^2.0.0"
- tar-stream "^1.5.0"
- zip-stream "^1.2.0"
+ readable-stream "^3.6.0"
+ readdir-glob "^1.0.0"
+ tar-stream "^2.1.4"
+ zip-stream "^4.0.4"
are-we-there-yet@~1.1.2:
version "1.1.5"
@@ -565,7 +668,7 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
-argparse@^1.0.10, argparse@^1.0.7:
+argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -604,7 +707,7 @@ array-flatten@1.1.1:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-array-includes@^3.0.3:
+array-includes@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
@@ -613,17 +716,10 @@ array-includes@^3.0.3:
es-abstract "^1.17.0"
is-string "^1.0.5"
-array-union@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
- integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
- dependencies:
- array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
- integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+ integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
array-unique@^0.2.1:
version "0.2.1"
@@ -635,7 +731,7 @@ array-unique@^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.1:
+array.prototype.flat@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
@@ -648,19 +744,20 @@ arraybuffer.slice@~0.0.7:
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0:
version "2.0.6"
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-asn1.js@^4.0.0:
- version "4.10.1"
- resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
- integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+asn1.js@^5.2.0:
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+ integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
dependencies:
bn.js "^4.0.0"
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
+ safer-buffer "^2.1.0"
asn1@0.2.3:
version "0.2.3"
@@ -712,17 +809,17 @@ async-limiter@~1.0.0:
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-async@>=0.6.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df"
- integrity sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==
+async@>=0.6.0, async@^3.1.0, async@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+ integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
async@^1.4.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-async@^2.0.0, async@^2.1.4, async@^2.6.1:
+async@^2.1.4:
version "2.6.3"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -739,19 +836,12 @@ atob@^2.1.2:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-autolinker@^3.11.0:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz#1184397c85828041975a3b3135032b7b931966c6"
- integrity sha512-iQAz75LAZ0dmlaMaIXX0Z+X4yuI6gxONZ14h0YTO0j/3d9DltyD+qkbINpocVZ8oCjMSJUdBeRfrXzGf/zvGZQ==
+aws-sdk@^2.521.0:
+ version "2.815.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.815.0.tgz#515ead6d0d242f603171faf30c49142fd53a53d9"
+ integrity sha512-BXL3Og97rOY9jE7OeYQdKftMAZ3SneFg/rBslyog+W0dTDKq3NBuM3fBWhc3POf26kHcFjsnLIWScM8bWhD4AA==
dependencies:
- tslib "^1.9.3"
-
-aws-sdk@^2.345.0:
- version "2.619.0"
- resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz#daacd97fb8d948c10278071129c12908039ab542"
- integrity sha512-qujQf27p3mrGZGCL+C+vXCEB08AMm6gS1572fgHrVLBXfy6SjhV4dzEYtt+ZptQm+8z0zuHsDqghJuBCcdpxqQ==
- dependencies:
- buffer "4.9.1"
+ buffer "4.9.2"
events "1.1.1"
ieee754 "1.1.13"
jmespath "0.15.0"
@@ -767,9 +857,9 @@ aws-sign2@~0.7.0:
integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
aws4@^1.8.0:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
- integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+ integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
axios@^0.19.0:
version "0.19.2"
@@ -795,7 +885,7 @@ azure-storage@^2.7.0:
xml2js "0.2.8"
xmlbuilder "^9.0.7"
-babel-cli@^6.26.0:
+babel-cli@6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
integrity sha1-UCq1SHTX24itALiHoGODzgPQAvE=
@@ -826,7 +916,7 @@ babel-code-frame@^6.26.0:
esutils "^2.0.2"
js-tokens "^3.0.2"
-babel-core@^6.26.0, babel-core@^6.26.3:
+babel-core@6.26.3, babel-core@^6.26.0:
version "6.26.3"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
@@ -978,7 +1068,7 @@ babel-helpers@^6.24.1:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
-babel-loader@^7.1.4:
+babel-loader@7.1.5:
version "7.1.5"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68"
integrity sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==
@@ -1231,7 +1321,7 @@ babel-plugin-transform-regenerator@^6.22.0:
dependencies:
regenerator-transform "^0.10.0"
-babel-plugin-transform-runtime@^6.23.0:
+babel-plugin-transform-runtime@6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=
@@ -1246,7 +1336,7 @@ babel-plugin-transform-strict-mode@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
-babel-polyfill@^6.26.0:
+babel-polyfill@6.26.0, babel-polyfill@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
@@ -1255,7 +1345,7 @@ babel-polyfill@^6.26.0:
core-js "^2.5.0"
regenerator-runtime "^0.10.5"
-babel-preset-env@^1.7.0:
+babel-preset-env@1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
@@ -1304,7 +1394,7 @@ babel-register@^6.26.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
+babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -1365,25 +1455,35 @@ backoff@^2.5.0:
dependencies:
precond "0.2"
+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.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+base64-arraybuffer@0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+ integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+
base64-arraybuffer@0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-base64-js@^1.0.2:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
- integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+base64-js@^1.0.2, base64-js@^1.3.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+ integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-base64id@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
- integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+base64id@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+ integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
base64url@3.x.x, base64url@^3.0.0:
version "3.0.1"
@@ -1403,7 +1503,7 @@ base@^0.11.1:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"
-basic-auth@~2.0.0:
+basic-auth@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
@@ -1439,6 +1539,11 @@ binary-extensions@^1.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+binary-extensions@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+ integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
+
bindings@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -1446,29 +1551,21 @@ bindings@^1.5.0:
dependencies:
file-uri-to-path "1.0.0"
-bl@^1.0.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
- integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
- dependencies:
- readable-stream "^2.3.5"
- safe-buffer "^5.1.1"
-
bl@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
- integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"
+ integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==
dependencies:
readable-stream "^3.0.1"
-blint@^1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz#9fcc8134296651099062f8d2ee359e83c7bff8ba"
- integrity sha512-XSNoVy5Hu6fE3xSL4M7EDrIL5UrxkMlSpOChF9rf3aEKyx1/hI/WIetmfS72JVcDUozbl7usaVt5hWx620Fjig==
+bl@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+ integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
dependencies:
- acorn "^7.0.0"
- acorn-walk "^7.0.0"
- nomnom "^1.8.1"
+ buffer "^5.5.0"
+ inherits "^2.0.4"
+ readable-stream "^3.4.0"
blob@0.0.5:
version "0.0.5"
@@ -1484,15 +1581,20 @@ block-stream2@^1.0.0:
inherits "^2.0.1"
readable-stream "^2.0.4"
-bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
- version "4.11.8"
- resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
- integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+ version "4.11.9"
+ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+ integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+ integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
body-parser@1.19.0, body-parser@^1.15.2:
version "1.19.0"
@@ -1525,7 +1627,7 @@ bootstrap@^3.4.0:
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
-bowser@^2.7.0:
+bowser@2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9"
integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA==
@@ -1563,15 +1665,22 @@ braces@^2.3.1, braces@^2.3.2:
split-string "^3.0.2"
to-regex "^3.0.1"
+braces@^3.0.1, braces@~3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+ dependencies:
+ fill-range "^7.0.1"
+
brorand@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-browser-process-hrtime@^0.1.2:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
- integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+browser-process-hrtime@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+ integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
browser-stdout@1.3.1:
version "1.3.1"
@@ -1614,26 +1723,28 @@ browserify-mime@~1.2.9:
resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=
-browserify-rsa@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
- integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+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 "^4.1.0"
+ bn.js "^5.0.0"
randombytes "^2.0.1"
browserify-sign@^4.0.0:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
- integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+ 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 "^4.1.1"
- browserify-rsa "^4.0.0"
- create-hash "^1.1.0"
- create-hmac "^1.1.2"
- elliptic "^6.0.0"
- inherits "^2.0.1"
- parse-asn1 "^5.0.0"
+ 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"
@@ -1651,42 +1762,17 @@ browserslist@^3.2.6:
electron-to-chromium "^1.3.47"
browserslist@^4.0.0:
- version "4.8.7"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
- integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
+ version "4.14.7"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
+ integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
dependencies:
- caniuse-lite "^1.0.30001027"
- electron-to-chromium "^1.3.349"
- node-releases "^1.1.49"
+ caniuse-lite "^1.0.30001157"
+ colorette "^1.2.1"
+ electron-to-chromium "^1.3.591"
+ escalade "^3.1.1"
+ node-releases "^1.1.66"
-buble@^0.19.8:
- version "0.19.8"
- resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d"
- integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA==
- dependencies:
- acorn "^6.1.1"
- acorn-dynamic-import "^4.0.0"
- acorn-jsx "^5.0.1"
- chalk "^2.4.2"
- magic-string "^0.25.3"
- minimist "^1.2.0"
- os-homedir "^2.0.0"
- regexpu-core "^4.5.4"
-
-buffer-alloc-unsafe@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
- integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
- integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
- dependencies:
- buffer-alloc-unsafe "^1.1.0"
- buffer-fill "^1.0.0"
-
-buffer-crc32@^0.2.1:
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
@@ -1696,11 +1782,6 @@ buffer-equal-constant-time@1.0.1:
resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
-buffer-fill@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
- integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -1716,16 +1797,7 @@ buffer-xor@^1.0.3:
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-buffer@4.9.1:
- version "4.9.1"
- resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
- integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
- dependencies:
- base64-js "^1.0.2"
- ieee754 "^1.1.4"
- isarray "^1.0.0"
-
-buffer@^4.3.0:
+buffer@4.9.2, buffer@^4.3.0:
version "4.9.2"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
@@ -1734,20 +1806,20 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
-buffer@^5.1.0:
- version "5.4.3"
- resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115"
- integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==
+buffer@^5.5.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+ integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
dependencies:
- base64-js "^1.0.2"
- ieee754 "^1.1.4"
+ base64-js "^1.3.1"
+ ieee754 "^1.1.13"
bufferutil@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.1.tgz#3a177e8e5819a1243fe16b63a199951a7ad8d4a7"
- integrity sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5"
+ integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==
dependencies:
- node-gyp-build "~3.7.0"
+ node-gyp-build "^4.2.0"
builtin-status-codes@^3.0.0:
version "3.0.0"
@@ -1755,12 +1827,12 @@ builtin-status-codes@^3.0.0:
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
bunyan@^1.8.3:
- version "1.8.12"
- resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
- integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=
+ version "1.8.14"
+ resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz#3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4"
+ integrity sha512-LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==
optionalDependencies:
dtrace-provider "~0.8"
- moment "^2.10.6"
+ moment "^2.19.3"
mv "~2"
safe-json-stringify "~1"
@@ -1774,10 +1846,10 @@ bytes@3.1.0:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-cacache@^12.0.2, cacache@^12.0.3:
- version "12.0.3"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
- integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
+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"
@@ -1795,6 +1867,29 @@ cacache@^12.0.2, cacache@^12.0.3:
unique-filename "^1.1.1"
y18n "^4.0.0"
+cacache@^15.0.5:
+ version "15.0.5"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+ integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
+ 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.0"
+ 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"
@@ -1810,6 +1905,14 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
+call-bind@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+ integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+ dependencies:
+ function-bind "^1.1.1"
+ get-intrinsic "^1.0.0"
+
caller-callsite@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -1847,10 +1950,13 @@ camel-case@^3.0.0:
no-case "^2.2.0"
upper-case "^1.1.1"
-camelcase@^1.0.2:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
- integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+camel-case@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
+ integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==
+ dependencies:
+ pascal-case "^3.1.1"
+ tslib "^1.10.0"
camelcase@^5.0.0, camelcase@^5.3.1:
version "5.3.1"
@@ -1872,40 +1978,20 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001027:
- version "1.0.30001027"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz#283e2ef17d94889cc216a22c6f85303d78ca852d"
- integrity sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==
-
-cardinal@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
- integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU=
- dependencies:
- ansicolors "~0.3.2"
- redeyed "~2.1.0"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001157:
+ version "1.0.30001157"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
+ integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
caseless@~0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-center-align@^0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
- integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
- dependencies:
- align-text "^0.1.3"
- lazy-cache "^1.0.3"
-
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.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"
+ccount@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
+ integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
chalk@^1.1.3:
version "1.1.3"
@@ -1918,6 +2004,23 @@ chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
+chalk@^2.0.0, chalk@^2.1.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@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+ integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
chalk@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -1928,9 +2031,29 @@ chalk@~0.4.0:
strip-ansi "~0.1.0"
chance@^1.0.4:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz#e99dde5ac16681af787b5ba94c8277c090d6cfe8"
+ integrity sha512-bua/2cZEfzS6qPm0vi3JEvGNbriDLcMj9lKxCQOjUcCJRcyjA7umP0zZm6bKWWlBN04vA0L99QGH/CZQawr0eg==
+
+character-entities-html4@^1.0.0:
version "1.1.4"
- resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz#d8743bf8e40bb05e024c305ca1ff441195eb23db"
- integrity sha512-pXPDSu3knKlb6H7ahQfpq//J9mSOxYK8SMtp8MV/nRJh8aLRDIl0ipLH8At8+nVogVwtvPZzyIzY/EbcY/cLuQ==
+ resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+ integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
+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==
chardet@^0.7.0:
version "0.7.0"
@@ -1959,7 +2082,7 @@ cheerio@^0.22.0:
lodash.reject "^4.4.0"
lodash.some "^4.4.0"
-chokidar@^1.6.1, chokidar@^1.7.0:
+chokidar@^1.6.1:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
@@ -1975,7 +2098,7 @@ chokidar@^1.6.1, chokidar@^1.7.0:
optionalDependencies:
fsevents "^1.0.0"
-chokidar@^2.0.2:
+chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -1994,11 +2117,31 @@ chokidar@^2.0.2:
optionalDependencies:
fsevents "^1.2.7"
+chokidar@^3.0.0, chokidar@^3.4.1:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
+ integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
+ 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.1.2"
+
chownr@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+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.2"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
@@ -2024,13 +2167,18 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
-clean-css@^4.1.6, clean-css@^4.2.1:
+clean-css@^4.1.6, clean-css@^4.2.1, clean-css@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
dependencies:
source-map "~0.6.0"
+clean-stack@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+ integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
cli-color@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f"
@@ -2051,28 +2199,19 @@ cli-cursor@^2.1.0:
restore-cursor "^2.0.0"
cli-width@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
- integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+ integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
clipboard@^2.0.0:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
- integrity sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
+ integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
dependencies:
good-listener "^1.2.2"
select "^1.1.2"
tiny-emitter "^2.0.0"
-cliui@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
- integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
- dependencies:
- center-align "^0.1.1"
- right-align "^0.1.1"
- wordwrap "0.0.2"
-
cliui@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -2082,7 +2221,7 @@ cliui@^5.0.0:
strip-ansi "^5.2.0"
wrap-ansi "^5.1.0"
-clone@^2.1.1, clone@^2.1.2:
+clone@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
@@ -2095,6 +2234,11 @@ cls-bluebird@^2.1.0:
is-bluebird "^1.0.2"
shimmer "^1.1.0"
+co@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
+ integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=
+
coa@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@@ -2109,17 +2253,14 @@ code-point-at@^1.0.0:
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-"codemirror@git+https://github.com/hackmdio/CodeMirror.git":
- version "5.49.3"
- resolved "git+https://github.com/hackmdio/CodeMirror.git#2ac9b9f25707606b0c09b99decaf9d08dd434570"
- dependencies:
- blint "^1"
- node-static "0.7.11"
- phantomjs-prebuilt "^2.1.12"
- rollup "^0.66.2"
- rollup-plugin-buble "^0.19.2"
- rollup-watch "^4.3.1"
- uglify-js "^2.8.15"
+"codemirror@git+https://github.com/hedgedoc/CodeMirror.git":
+ version "5.58.2"
+ resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1"
+
+collapse-white-space@^1.0.2:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+ integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
collection-visit@^1.0.0:
version "1.0.0"
@@ -2136,20 +2277,27 @@ color-convert@^1.9.0, color-convert@^1.9.1:
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.0.0, color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-color-string@^1.5.2:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
- integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+color-string@^1.5.2, color-string@^1.5.4:
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+ integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
dependencies:
color-name "^1.0.0"
simple-swizzle "^0.2.2"
@@ -2163,19 +2311,19 @@ color@3.0.x:
color-string "^1.5.2"
color@^3.0.0:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
- integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
+ 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.2"
+ color-string "^1.5.4"
-colornames@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
- integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
+colorette@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+ integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
-colors@>=0.6.0, colors@^1.2.1:
+colors@^1.2.1:
version "1.4.0"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -2195,7 +2343,7 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.20.0, commander@^2.9.0, commander@~2.20.3:
+commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2205,12 +2353,7 @@ commander@2.15.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-commander@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
- integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
-
-commander@^4.0.0:
+commander@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
@@ -2230,7 +2373,7 @@ component-emitter@1.2.1, component-emitter@~1.2.0:
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-component-emitter@^1.2.1:
+component-emitter@^1.2.1, component-emitter@~1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -2240,15 +2383,15 @@ component-inherit@0.0.3:
resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-compress-commons@^1.2.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
- integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
+compress-commons@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7"
+ integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==
dependencies:
- buffer-crc32 "^0.2.1"
- crc32-stream "^2.0.0"
- normalize-path "^2.0.0"
- readable-stream "^2.0.0"
+ buffer-crc32 "^0.2.13"
+ crc32-stream "^4.0.1"
+ normalize-path "^3.0.0"
+ readable-stream "^3.6.0"
compressible@~2.0.16:
version "2.0.18"
@@ -2275,7 +2418,7 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0:
+concat-stream@^1.4.8, concat-stream@^1.5.0:
version "1.6.2"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2285,6 +2428,16 @@ concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^
readable-stream "^2.2.2"
typedarray "^0.0.6"
+concat-stream@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+ integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+ dependencies:
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.0.2"
+ typedarray "^0.0.6"
+
config-chain@^1.1.12:
version "1.1.12"
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -2350,12 +2503,12 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1:
dependencies:
safe-buffer "~5.1.1"
-cookie-parser@1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz#0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"
- integrity sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=
+cookie-parser@^1.4.3:
+ version "1.4.5"
+ resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49"
+ integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==
dependencies:
- cookie "0.3.1"
+ cookie "0.4.0"
cookie-signature "1.0.6"
cookie-signature@1.0.6:
@@ -2373,11 +2526,23 @@ cookie@0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookie@^0.4.0:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+ integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
cookiejar@2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
integrity sha1-Cr81atANHFohnYjURRgEbdAmrP4=
+copy-anything@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.1.tgz#2afbce6da684bdfcbec93752fa762819cb480d9a"
+ integrity sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==
+ dependencies:
+ is-what "^3.7.1"
+
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2395,23 +2560,22 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-copy-webpack-plugin@^5.0.5:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
- integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
+copy-webpack-plugin@6.4.1:
+ version "6.4.1"
+ resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
+ integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
dependencies:
- cacache "^12.0.3"
- find-cache-dir "^2.1.0"
- glob-parent "^3.1.0"
- globby "^7.1.1"
- is-glob "^4.0.1"
- loader-utils "^1.2.3"
- minimatch "^3.0.4"
+ 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 "^2.2.1"
- schema-utils "^1.0.0"
- serialize-javascript "^2.1.2"
- webpack-log "^2.0.0"
+ p-limit "^3.0.2"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
core-js@^2.4.0, core-js@^2.5.0:
version "2.6.11"
@@ -2433,30 +2597,31 @@ cosmiconfig@^5.0.0:
js-yaml "^3.13.1"
parse-json "^4.0.0"
-crc32-stream@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
- integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
+crc-32@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+ integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
dependencies:
- crc "^3.4.4"
- readable-stream "^2.0.0"
+ exit-on-epipe "~1.0.1"
+ printj "~1.1.0"
-crc@^3.4.4:
- version "3.8.0"
- resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
- integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
+crc32-stream@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067"
+ integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw==
dependencies:
- buffer "^5.1.0"
+ crc-32 "^1.2.0"
+ readable-stream "^3.4.0"
create-ecdh@^4.0.0:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
- integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+ 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.0.0"
+ elliptic "^6.5.3"
-create-hash@^1.1.0, create-hash@^1.1.2:
+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==
@@ -2467,7 +2632,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
ripemd160 "^2.0.1"
sha.js "^2.4.0"
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+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==
@@ -2479,7 +2644,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+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==
@@ -2507,13 +2672,6 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
-crypto-random-string@^3.0.1:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz#0368382de82e914179ad2ca9c7a788e260184bae"
- integrity sha512-Tip3yGB+bA7B0W8E4K4mNf2rZhu5r2G5Tb89/utEl5tP1QuLjTF/S9a1b8ifDrR4ORc9Utf6tscpSEtBY3YcPQ==
- dependencies:
- type-fest "^0.8.1"
-
css-b64-images@~0.2.5:
version "0.2.5"
resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02"
@@ -2532,23 +2690,24 @@ css-declaration-sorter@^4.0.1:
postcss "^7.0.1"
timsort "^0.3.0"
-css-loader@^3.2.0:
- version "3.4.2"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202"
- integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==
+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.23"
+ postcss "^7.0.32"
postcss-modules-extract-imports "^2.0.0"
postcss-modules-local-by-default "^3.0.2"
- postcss-modules-scope "^2.1.1"
+ postcss-modules-scope "^2.2.0"
postcss-modules-values "^3.0.0"
- postcss-value-parser "^4.0.2"
- schema-utils "^2.6.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"
@@ -2583,10 +2742,13 @@ css-tree@1.0.0-alpha.37:
mdn-data "2.0.4"
source-map "^0.6.1"
-css-unit-converter@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
- integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
+css-tree@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d"
+ integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==
+ dependencies:
+ mdn-data "2.0.12"
+ source-map "^0.6.1"
css-what@2.1:
version "2.1.3"
@@ -2594,14 +2756,9 @@ css-what@2.1:
integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
css-what@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1"
- integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==
-
-cssesc@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
- integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+ 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"
@@ -2682,11 +2839,11 @@ cssnano@^4.1.10:
postcss "^7.0.0"
csso@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
- integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b"
+ integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==
dependencies:
- css-tree "1.0.0-alpha.37"
+ css-tree "^1.0.0"
cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
version "0.3.8"
@@ -2728,9 +2885,9 @@ d3-axis@1:
integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
d3-brush@1:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz#066b8e84d17b192986030446c97c0fba7e1bacdc"
- integrity sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A==
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
+ integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
dependencies:
d3-dispatch "1"
d3-drag "1"
@@ -2752,9 +2909,9 @@ d3-collection@1:
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
d3-color@1:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz#89c45a995ed773b13314f06460df26d60ba0ecaf"
- integrity sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
d3-contour@1:
version "1.3.2"
@@ -2786,14 +2943,14 @@ d3-dsv@1:
rw "1"
d3-ease@1:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz#ebdb6da22dfac0a22222f2d4da06f66c416a0ec0"
- integrity sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ==
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
+ integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
d3-fetch@1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz#957c8fbc6d4480599ba191b1b2518bf86b3e1be2"
- integrity sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
+ integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
dependencies:
d3-dsv "1"
@@ -2808,14 +2965,14 @@ d3-force@1:
d3-timer "1"
d3-format@1:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz#4e8eb4dff3fdcb891a8489ec6e698601c41b96f1"
- integrity sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ==
+ version "1.4.5"
+ resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
+ integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
d3-geo@1:
- version "1.11.9"
- resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz#77eaed14ba62fc2c0aef55cd2943849c866f7ae6"
- integrity sha512-9edcH6J3s/Aa3KJITWqFJbyB/8q3mMlA9Fi7z6yy+FAYMnRaxmC7jBhUnsINxVWD14GmqX3DK8uk7nV6/Ekt4A==
+ version "1.12.1"
+ resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
+ integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
dependencies:
d3-array "1"
@@ -2872,9 +3029,9 @@ d3-scale@2:
d3-time-format "2"
d3-selection@1, d3-selection@^1.1.0:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98"
- integrity sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA==
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
+ integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
d3-shape@1:
version "1.3.7"
@@ -2884,9 +3041,9 @@ d3-shape@1:
d3-path "1"
d3-time-format@2:
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb"
- integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
+ integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
dependencies:
d3-time "1"
@@ -2929,9 +3086,9 @@ d3-zoom@1:
d3-transition "1"
d3@^5.14, d3@^5.7.0:
- version "5.15.0"
- resolved "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz#ffd44958e6a3cb8a59a84429c45429b8bca5677a"
- integrity sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==
+ version "5.16.0"
+ resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
+ integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
dependencies:
d3-array "1"
d3-axis "1"
@@ -3017,13 +3174,6 @@ date-utils@*:
resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=
-debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
- integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
- dependencies:
- ms "^2.1.1"
-
debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3045,7 +3195,28 @@ debug@^3.1.0, debug@^3.2.6:
dependencies:
ms "^2.1.1"
-decamelize@^1.0.0, decamelize@^1.2.0:
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.1:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+ integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+ dependencies:
+ ms "2.1.2"
+
+debug@^4.1.0:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+ integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+ dependencies:
+ ms "2.1.2"
+
+debug@~4.1.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
+
+decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -3176,18 +3347,9 @@ detect-libc@^1.0.2:
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-diagnostics@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
- integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
- dependencies:
- colorspace "1.1.x"
- enabled "1.0.x"
- kuler "1.0.x"
-
"diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git":
version "1.1.1"
- resolved "git+https://github.com/hackmdio/diff-match-patch.git#5b73bb82454a81ecdbdb81afb4bea4c36132fbaa"
+ resolved "git+https://github.com/hackmdio/diff-match-patch.git#c2f8fb9d69aa9490b764850aa86ba442c93ccf78"
diff@3.5.0:
version "3.5.0"
@@ -3203,17 +3365,12 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
-dir-glob@^2.0.0:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
- integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+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 "^3.0.0"
-
-dns-prefetch-control@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz#73988161841f3dcc81f47686d539a2c702c88624"
- integrity sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==
+ path-type "^4.0.0"
doctrine@1.5.0:
version "1.5.0"
@@ -3264,9 +3421,9 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
domelementtype@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
- integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+ integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
domexception@^1.0.1:
version "1.0.1"
@@ -3303,10 +3460,18 @@ dont-sniff-mimetype@1.1.0:
resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2"
integrity sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==
+dot-case@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+ integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+ dependencies:
+ no-case "^3.0.3"
+ tslib "^1.10.0"
+
dot-prop@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
- integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+ 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"
@@ -3322,11 +3487,6 @@ dtrace-provider@~0.8:
dependencies:
nan "^2.14.0"
-duplexer@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
- integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
duplexify@^3.4.2, duplexify@^3.6.0:
version "3.7.1"
resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
@@ -3372,15 +3532,15 @@ ejs@^2.5.5:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
-electron-to-chromium@^1.3.349, electron-to-chromium@^1.3.47:
- version "1.3.352"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz#f0fc1e561104dbfba55cb3d45cad3626dc75d7e9"
- integrity sha512-dL/RyoueFG3UMhG0q3weAQvr+Tbqx/axAnOXYIIOsoYnV+2i+nRvX2S6msEo2+JARbBP8MFkkSYQ8AoY9Bh4Og==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.591:
+ version "1.3.596"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257"
+ integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==
-elliptic@^6.0.0:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
- integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+elliptic@^6.5.3:
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+ integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -3395,88 +3555,82 @@ emoji-regex@^7.0.1:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-emojify.js@~1.1.0:
+emoji-regex@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+ integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojify.js@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb"
integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s=
-emojis-list@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
- integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+emojis-list@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+ integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-enabled@1.0.x:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
- integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
- dependencies:
- env-variable "0.0.x"
+enabled@2.0.x:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
+ integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
dependencies:
once "^1.4.0"
-engine.io-client@~3.2.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
- integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+engine.io-client@~3.4.0:
+ version "3.4.4"
+ resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
+ integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==
dependencies:
- component-emitter "1.2.1"
+ component-emitter "~1.3.0"
component-inherit "0.0.3"
debug "~3.1.0"
- engine.io-parser "~2.1.1"
+ engine.io-parser "~2.2.0"
has-cors "1.1.0"
indexof "0.0.1"
- parseqs "0.0.5"
- parseuri "0.0.5"
- ws "~3.3.1"
+ parseqs "0.0.6"
+ parseuri "0.0.6"
+ ws "~6.1.0"
xmlhttprequest-ssl "~1.5.4"
yeast "0.1.2"
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
- integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
+engine.io-parser@~2.2.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+ integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
dependencies:
after "0.8.2"
arraybuffer.slice "~0.0.7"
- base64-arraybuffer "0.1.5"
+ base64-arraybuffer "0.1.4"
blob "0.0.5"
has-binary2 "~1.0.2"
-engine.io@~3.2.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
- integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
+engine.io@~3.4.0:
+ version "3.4.2"
+ resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"
+ integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==
dependencies:
accepts "~1.3.4"
- base64id "1.0.0"
+ base64id "2.0.0"
cookie "0.3.1"
- debug "~3.1.0"
- engine.io-parser "~2.1.0"
- ws "~3.3.1"
+ debug "~4.1.0"
+ engine.io-parser "~2.2.0"
+ ws "^7.1.2"
-enhanced-resolve@4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
- integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
- dependencies:
- graceful-fs "^4.1.2"
- memory-fs "^0.4.0"
- tapable "^1.0.0"
-
-enhanced-resolve@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
- integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+ integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.5.0"
@@ -3487,15 +3641,22 @@ entities@^1.1.1, entities@~1.1.1:
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-entities@^2.0.0, entities@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
- integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+entities@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+ integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-env-variable@0.0.x:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
- integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
+entities@~2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+ integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
+
+entity-decode@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz#e4f807e52c3294246e9347d1f2b02b07fd5f92e7"
+ integrity sha512-5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg==
+ dependencies:
+ he "^1.1.1"
errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
version "0.1.7"
@@ -3512,21 +3673,39 @@ error-ex@^1.2.0, error-ex@^1.3.1:
is-arrayish "^0.2.1"
es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
- version "1.17.4"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
- integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
+ version "1.17.7"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+ integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
dependencies:
es-to-primitive "^1.2.1"
function-bind "^1.1.1"
has "^1.0.3"
has-symbols "^1.0.1"
- is-callable "^1.1.5"
- is-regex "^1.0.5"
- object-inspect "^1.7.0"
+ is-callable "^1.2.2"
+ is-regex "^1.1.1"
+ object-inspect "^1.8.0"
object-keys "^1.1.1"
- object.assign "^4.1.0"
- string.prototype.trimleft "^2.1.1"
- string.prototype.trimright "^2.1.1"
+ object.assign "^4.1.1"
+ string.prototype.trimend "^1.0.1"
+ string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.1:
+ version "1.18.0-next.1"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+ integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+ dependencies:
+ es-to-primitive "^1.2.1"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+ has-symbols "^1.0.1"
+ is-callable "^1.2.2"
+ is-negative-zero "^2.0.0"
+ is-regex "^1.1.1"
+ object-inspect "^1.8.0"
+ object-keys "^1.1.1"
+ object.assign "^4.1.1"
+ string.prototype.trimend "^1.0.1"
+ string.prototype.trimstart "^1.0.1"
es-to-primitive@^1.2.1:
version "1.2.1"
@@ -3560,11 +3739,6 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es5-ext "^0.10.35"
es6-symbol "^3.1.1"
-es6-promise@^4.0.3:
- version "4.2.8"
- resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
- integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
es6-symbol@^3.1.1, es6-symbol@~3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
@@ -3583,6 +3757,11 @@ es6-weak-map@^2.0.2:
es6-iterator "^2.0.3"
es6-symbol "^3.1.1"
+escalade@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+ integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
escape-html@^1.0.3, escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3593,15 +3772,10 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-escaper@^2.5.3:
- version "2.5.3"
- resolved "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz#8b8fe90ba364054151ab7eff18b4ce43b1e13ab5"
- integrity sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==
-
escodegen@^1.9.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
- integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+ 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"
@@ -3610,23 +3784,23 @@ escodegen@^1.9.1:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-standard@^12.0.0:
+eslint-config-standard@12.0.0:
version "12.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9"
integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
-eslint-import-resolver-node@^0.3.2:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
- integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+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.4.1:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708"
- integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==
+eslint-module-utils@^2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+ integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
dependencies:
debug "^2.6.9"
pkg-dir "^2.0.0"
@@ -3639,25 +3813,26 @@ eslint-plugin-es@^1.3.1:
eslint-utils "^1.4.2"
regexpp "^2.0.1"
-eslint-plugin-import@^2.14.0:
- version "2.20.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
- integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
+eslint-plugin-import@2.22.1:
+ version "2.22.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+ integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
dependencies:
- array-includes "^3.0.3"
- array.prototype.flat "^1.2.1"
+ array-includes "^3.1.1"
+ array.prototype.flat "^1.2.3"
contains-path "^0.1.0"
debug "^2.6.9"
doctrine "1.5.0"
- eslint-import-resolver-node "^0.3.2"
- eslint-module-utils "^2.4.1"
+ eslint-import-resolver-node "^0.3.4"
+ eslint-module-utils "^2.6.0"
has "^1.0.3"
minimatch "^3.0.4"
- object.values "^1.1.0"
+ object.values "^1.1.1"
read-pkg-up "^2.0.0"
- resolve "^1.12.0"
+ resolve "^1.17.0"
+ tsconfig-paths "^3.9.0"
-eslint-plugin-node@^8.0.0:
+eslint-plugin-node@8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz#55ae3560022863d141fa7a11799532340a685964"
integrity sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w==
@@ -3669,15 +3844,15 @@ eslint-plugin-node@^8.0.0:
resolve "^1.8.1"
semver "^5.5.0"
-eslint-plugin-promise@^4.0.1:
+eslint-plugin-promise@4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
-eslint-plugin-standard@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"
- integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==
+eslint-plugin-standard@4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5"
+ integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==
eslint-scope@^4.0.3:
version "4.0.3"
@@ -3695,11 +3870,11 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.2:
eslint-visitor-keys "^1.1.0"
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
- integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+ 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@^5.9.0:
+eslint@5.16.0:
version "5.16.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
@@ -3750,34 +3925,34 @@ espree@^5.0.1:
acorn-jsx "^5.0.0"
eslint-visitor-keys "^1.0.0"
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
- integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+ integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
dependencies:
- estraverse "^4.0.0"
+ estraverse "^5.1.0"
esrecurse@^4.1.0:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
- integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+ 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 "^4.1.0"
+ estraverse "^5.2.0"
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.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==
-estree-walker@^0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
- integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+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"
@@ -3794,10 +3969,10 @@ eve-raphael@0.5.0:
resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30"
integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA=
-eve@~0.4.2:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/eve/-/eve-0.4.2.tgz#7eea0afc0e4efb7c9365615315a3576833ead2ae"
- integrity sha1-fuoK/A5O+3yTZWFTFaNXaDPq0q4=
+eve@~0.5.1:
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa"
+ integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o=
event-emitter@^0.3.5:
version "0.3.5"
@@ -3813,9 +3988,9 @@ events@1.1.1:
integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
events@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
- integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+ integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
version "1.0.3"
@@ -3825,18 +4000,10 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
md5.js "^1.3.4"
safe-buffer "^5.1.1"
-execa@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
- integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
- dependencies:
- cross-spawn "^6.0.0"
- get-stream "^4.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
+exit-on-epipe@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+ integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
expand-brackets@^0.1.4:
version "0.1.5"
@@ -3872,20 +4039,15 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
dependencies:
homedir-polyfill "^1.0.1"
-expect-ct@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz#3a54741b6ed34cc7a93305c605f63cd268a54a62"
- integrity sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==
-
-expose-loader@^0.7.5:
+expose-loader@0.7.5:
version "0.7.5"
resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f"
integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==
express-session@^1.14.2:
- version "1.17.0"
- resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz#9b50dbb5e8a03c3537368138f072736150b7f9b3"
- integrity sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg==
+ version "1.17.1"
+ resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357"
+ integrity sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==
dependencies:
cookie "0.4.0"
cookie-signature "1.0.6"
@@ -3959,7 +4121,7 @@ extend@3.0.0:
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
integrity sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=
-extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -3994,16 +4156,6 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
-extract-zip@^1.6.5:
- version "1.6.7"
- resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
- integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
- dependencies:
- concat-stream "1.6.2"
- debug "2.6.9"
- mkdirp "0.5.1"
- yauzl "2.4.1"
-
extsprintf@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.2.0.tgz#5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"
@@ -4020,9 +4172,21 @@ extsprintf@^1.2.0:
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
fast-deep-equal@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
- integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+ integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.1.1, fast-glob@^3.2.4:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+ integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+ 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"
@@ -4039,27 +4203,34 @@ fast-safe-stringify@^2.0.4:
resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
-fd-slicer@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
- integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+fastq@^1.6.0:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
+ integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
dependencies:
- pend "~1.2.0"
+ reusify "^1.0.4"
+
+fault@^1.0.0, fault@^1.0.2:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
+ integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
+ dependencies:
+ format "^0.2.0"
feature-policy@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/feature-policy/-/feature-policy-0.3.0.tgz#7430e8e54a40da01156ca30aaec1a381ce536069"
integrity sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==
-fecha@^2.3.3:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
- integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
+fecha@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41"
+ integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==
figgy-pudding@^3.5.1:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
- integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+ integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
figures@^2.0.0:
version "2.0.0"
@@ -4068,6 +4239,13 @@ figures@^2.0.0:
dependencies:
escape-string-regexp "^1.0.5"
+figures@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+ integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+ dependencies:
+ escape-string-regexp "^1.0.5"
+
file-entry-cache@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -4075,7 +4253,7 @@ file-entry-cache@^5.0.1:
dependencies:
flat-cache "^2.0.1"
-file-loader@^4.3.0:
+file-loader@4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af"
integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==
@@ -4119,6 +4297,13 @@ fill-range@^4.0.0:
repeat-string "^1.6.1"
to-regex-range "^2.1.0"
+fill-range@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+ integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+ dependencies:
+ to-regex-range "^5.0.1"
+
finalhandler@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -4150,6 +4335,15 @@ find-cache-dir@^2.1.0:
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"
@@ -4164,7 +4358,15 @@ find-up@^3.0.0:
dependencies:
locate-path "^3.0.0"
-findup-sync@3.0.0:
+find-up@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+ integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+ dependencies:
+ locate-path "^5.0.0"
+ path-exists "^4.0.0"
+
+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==
@@ -4184,14 +4386,14 @@ flat-cache@^2.0.1:
write "1.0.3"
flatted@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
- integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+ integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
flowchart.js@^1.6.4:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz#fd966270bd310ddefb168d6826c792c5f345372f"
- integrity sha512-kr+XrH9WSE40ufAec/hs8kbAvSxFx4Fgyf/mjkJwTxWea5USuQAjZt0j9cZJO4ZayWkin9OkWxH4ovLF/5KZFA==
+ version "1.15.0"
+ resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f"
+ integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ==
dependencies:
raphael "2.3.0"
@@ -4203,6 +4405,11 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"
+fn.name@1.x.x:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
+ integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
+
follow-redirects@1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
@@ -4259,10 +4466,15 @@ form-data@~2.3.2:
combined-stream "^1.0.6"
mime-types "^2.1.12"
+format@^0.2.0:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+ integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+
formidable@^1.0.17:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
- integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
+ integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
formidable@~1.0.14:
version "1.0.17"
@@ -4281,11 +4493,6 @@ fragment-cache@^0.2.1:
dependencies:
map-cache "^0.2.2"
-frameguard@3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/frameguard/-/frameguard-3.1.0.tgz#bd1442cca1d67dc346a6751559b6d04502103a22"
- integrity sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g==
-
fresh@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -4304,15 +4511,6 @@ fs-constants@^1.0.0:
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-fs-extra@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
- integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^2.1.0"
- klaw "^1.0.0"
-
fs-extra@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -4329,6 +4527,13 @@ fs-minipass@^1.2.5:
dependencies:
minipass "^2.6.0"
+fs-minipass@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+ integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+ dependencies:
+ minipass "^3.0.0"
+
fs-readdir-recursive@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -4350,13 +4555,18 @@ fs.realpath@^1.0.0:
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
fsevents@^1.0.0, fsevents@^1.2.7:
- version "1.2.11"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
- integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
+ 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.1.2:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+ integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4398,12 +4608,14 @@ get-caller-file@^2.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-stream@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
- integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+get-intrinsic@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+ integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
dependencies:
- pump "^3.0.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+ has-symbols "^1.0.1"
get-value@^2.0.3, get-value@^2.0.6:
version "2.0.6"
@@ -4417,7 +4629,7 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
-gist-embed@~2.6.0:
+gist-embed@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab"
integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas=
@@ -4445,6 +4657,13 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"
+glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+ integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+ dependencies:
+ is-glob "^4.0.1"
+
glob@7.1.2:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4468,7 +4687,7 @@ glob@^6.0.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -4480,13 +4699,6 @@ glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-modules@2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
- integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
- dependencies:
- global-prefix "^3.0.0"
-
global-modules@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -4496,6 +4708,13 @@ global-modules@^1.0.0:
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"
@@ -4526,17 +4745,17 @@ globals@^9.18.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-globby@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
- integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+globby@^11.0.1:
+ version "11.0.1"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+ integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
dependencies:
- array-union "^1.0.1"
- dir-glob "^2.0.0"
- glob "^7.1.2"
- ignore "^3.3.5"
- pify "^3.0.0"
- slash "^1.0.0"
+ 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"
good-listener@^1.2.2:
version "1.2.2"
@@ -4545,10 +4764,10 @@ good-listener@^1.2.2:
dependencies:
delegate "^3.1.2"
-graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
- integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
graphlib@^2.1.7, graphlib@^2.1.8:
version "2.1.8"
@@ -4563,13 +4782,14 @@ growl@1.10.5:
integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
handlebars@^4.5.2:
- version "4.7.3"
- resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
- integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==
+ version "4.7.6"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+ integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
dependencies:
+ minimist "^1.2.5"
neo-async "^2.6.0"
- optimist "^0.6.1"
source-map "^0.6.1"
+ wordwrap "^1.0.0"
optionalDependencies:
uglify-js "^3.1.4"
@@ -4579,11 +4799,11 @@ har-schema@^2.0.0:
integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
har-validator@~5.1.3:
- version "5.1.3"
- resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
- integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+ version "5.1.5"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+ integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
dependencies:
- ajv "^6.5.5"
+ ajv "^6.12.3"
har-schema "^2.0.0"
has-ansi@^2.0.0:
@@ -4615,7 +4835,12 @@ has-flag@^3.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+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:
version "1.0.1"
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -4664,12 +4889,13 @@ has@^1.0.0, has@^1.0.3:
function-bind "^1.1.1"
hash-base@^3.0.0:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
- integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+ 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.1"
- safe-buffer "^5.0.1"
+ 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"
@@ -4679,20 +4905,12 @@ hash.js@^1.0.0, hash.js@^1.0.3:
inherits "^2.0.3"
minimalistic-assert "^1.0.1"
-hasha@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
- integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=
- dependencies:
- is-stream "^1.0.1"
- pinkie-promise "^2.0.0"
-
he@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-he@^1.2.0:
+he@^1.1.1, he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -4702,33 +4920,29 @@ helmet-crossdomain@0.4.0:
resolved "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz#5f1fe5a836d0325f1da0a78eaa5fd8429078894e"
integrity sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==
-helmet-csp@2.9.4:
- version "2.9.4"
- resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz#801382bac98f2f88706dc5c89d95c7e31af3a4a9"
- integrity sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==
+helmet-csp@2.10.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.10.0.tgz#685dde1747bc16c5e28ad9d91e229a69f0a85e84"
+ integrity sha512-Rz953ZNEFk8sT2XvewXkYN0Ho4GEZdjAZy4stjiEQV3eN7GDxg1QKmYggH7otDyIA7uGA6XnUMVSgeJwbR5X+w==
dependencies:
- bowser "^2.7.0"
+ bowser "2.9.0"
camelize "1.0.0"
content-security-policy-builder "2.1.0"
dasherize "2.0.0"
helmet@^3.21.1:
- version "3.21.2"
- resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz#7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f"
- integrity sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==
+ version "3.23.3"
+ resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.23.3.tgz#5ba30209c5f73ded4ab65746a3a11bedd4579ab7"
+ integrity sha512-U3MeYdzPJQhtvqAVBPntVgAvNSOJyagwZwyKsFdyRa8TV3pOKVFljalPOCxbw5Wwf2kncGhmP0qHjyazIdNdSA==
dependencies:
depd "2.0.0"
- dns-prefetch-control "0.2.0"
dont-sniff-mimetype "1.1.0"
- expect-ct "0.2.0"
feature-policy "0.3.0"
- frameguard "3.1.0"
helmet-crossdomain "0.4.0"
- helmet-csp "2.9.4"
+ helmet-csp "2.10.0"
hide-powered-by "1.1.0"
hpkp "2.0.0"
hsts "2.2.0"
- ienoopen "1.1.0"
nocache "2.1.0"
referrer-policy "1.2.0"
x-xss-protection "1.3.0"
@@ -4743,15 +4957,10 @@ hide-powered-by@1.1.0:
resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a"
integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==
-highlight.js@^9.15.9:
- version "9.18.1"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
- integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
-
-highlight.js@~9.12.0:
- version "9.12.0"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
- integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
+highlight.js@^9.12.0:
+ version "9.18.5"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
+ integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -4778,9 +4987,9 @@ homedir-polyfill@^1.0.1:
parse-passwd "^1.0.0"
hosted-git-info@^2.1.4:
- version "2.8.5"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
- integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+ integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
hpkp@2.0.0:
version "2.0.0"
@@ -4817,17 +5026,17 @@ html-encoding-sniffer@^1.0.2:
whatwg-encoding "^1.0.1"
html-minifier-terser@^5.0.1:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz#b33549b57be7f0357be0d0b892995aaed1ed90f8"
- integrity sha512-It4No3H1V3Dhd/O0MePFdo0oX/M6u6YZTMw4My/010mT6vxdbqge7+0RoxGAmeSbKok6gjYZoP0p4rpZ2+J2yw==
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+ integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
dependencies:
- camel-case "^3.0.0"
- clean-css "^4.2.1"
- commander "^4.0.0"
+ camel-case "^4.1.1"
+ clean-css "^4.2.3"
+ commander "^4.1.1"
he "^1.2.0"
- param-case "^2.1.1"
+ param-case "^3.0.3"
relateurl "^0.2.7"
- terser "^4.3.9"
+ terser "^4.6.3"
html-minifier@^4.0.0:
version "4.0.0"
@@ -4842,11 +5051,14 @@ html-minifier@^4.0.0:
relateurl "^0.2.7"
uglify-js "^3.5.1"
-html-webpack-plugin@^4.0.0-beta.11:
- version "4.0.0-beta.11"
- resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715"
- integrity sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==
+html-webpack-plugin@4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
+ integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==
dependencies:
+ "@types/html-minifier-terser" "^5.0.0"
+ "@types/tapable" "^1.0.5"
+ "@types/webpack" "^4.41.8"
html-minifier-terser "^5.0.1"
loader-utils "^1.2.3"
lodash "^4.17.15"
@@ -4902,16 +5114,16 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-i18n@^0.8.3:
- version "0.8.5"
- resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz#3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec"
- integrity sha512-6UgLbhJGgn4XFeuZc/dDdrrri0ij24EK4hxv4Pbi5hloYAZ1B2+0eQchEryBFezLKYOHhVGV/5+H4i0oxng94w==
+i18n@^0.13.0:
+ version "0.13.2"
+ resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz#3886678fe7cbbed45bac2ce53b8144c788a1c1b5"
+ integrity sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw==
dependencies:
- debug "*"
- make-plural "^6.0.1"
+ debug "^4.1.1"
+ make-plural "^6.2.2"
math-interval-parser "^2.0.1"
messageformat "^2.3.0"
- mustache "*"
+ mustache "^4.0.1"
sprintf-js "^1.1.2"
iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
@@ -4921,13 +5133,20 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
dependencies:
safer-buffer ">= 2.1.2 < 3"
-iconv-lite@^0.5.0, iconv-lite@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
- integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+iconv-lite@^0.5.0:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8"
+ integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==
dependencies:
safer-buffer ">= 2.1.2 < 3"
+iconv-lite@^0.6.2:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+ integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3.0.0"
+
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"
@@ -4935,15 +5154,15 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
dependencies:
postcss "^7.0.14"
-ieee754@1.1.13, ieee754@^1.1.4:
+ieee754@1.1.13:
version "1.1.13"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
-ienoopen@1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz#411e5d530c982287dbdc3bb31e7a9c9e32630974"
- integrity sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ==
+ieee754@^1.1.13, 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"
@@ -4957,20 +5176,15 @@ ignore-walk@^3.0.1:
dependencies:
minimatch "^3.0.4"
-ignore@^3.3.5:
- version "3.3.10"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
- integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.0.2:
- version "5.1.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
- integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+ignore@^5.0.0, ignore@^5.0.2, ignore@^5.1.4:
+ version "5.1.8"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+ integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
image-size@~0.5.0:
version "0.5.5"
@@ -4978,8 +5192,8 @@ image-size@~0.5.0:
integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
"imgur@git+https://github.com/hackmdio/node-imgur.git":
- version "0.3.1"
- resolved "git+https://github.com/hackmdio/node-imgur.git#4fe9cfa3893505c34c49067483d85d3ad4376cd6"
+ version "0.5.0"
+ resolved "git+https://github.com/hackmdio/node-imgur.git#de0a7a1f1eb2cb6628385fedb990ad396a190573"
dependencies:
commander "^2.13.0"
glob "^7.1.2"
@@ -4995,14 +5209,14 @@ import-fresh@^2.0.0:
resolve-from "^3.0.0"
import-fresh@^3.0.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
- integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+ integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
dependencies:
parent-module "^1.0.0"
resolve-from "^4.0.0"
-import-local@2.0.0:
+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==
@@ -5010,7 +5224,7 @@ import-local@2.0.0:
pkg-dir "^3.0.0"
resolve-cwd "^2.0.0"
-imports-loader@^0.8.0:
+imports-loader@0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69"
integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==
@@ -5023,6 +5237,11 @@ imurmurhash@^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"
@@ -5033,7 +5252,7 @@ indexof@0.0.1:
resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-infer-owner@^1.0.3:
+infer-owner@^1.0.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==
@@ -5051,7 +5270,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, 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==
@@ -5090,10 +5309,10 @@ inquirer@^6.2.2:
strip-ansi "^5.1.0"
through "^2.3.6"
-interpret@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
- integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+interpret@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+ integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
invariant@^2.2.2:
version "2.2.4"
@@ -5102,20 +5321,15 @@ invariant@^2.2.2:
dependencies:
loose-envify "^1.0.0"
-invert-kv@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
- integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ionicons@~2.0.1:
+ionicons@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e"
integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4=
-ipaddr.js@1.9.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
- integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+ipaddr.js@1.9.1:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+ integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
is-absolute-url@^2.0.0:
version "2.1.0"
@@ -5136,6 +5350,24 @@ is-accessor-descriptor@^1.0.0:
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-alphanumeric@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
+ integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
+
+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-arguments@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
@@ -5158,6 +5390,13 @@ is-binary-path@^1.0.0:
dependencies:
binary-extensions "^1.0.0"
+is-binary-path@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+ integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+ dependencies:
+ binary-extensions "^2.0.0"
+
is-bluebird@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
@@ -5168,10 +5407,15 @@ is-buffer@^1.1.5:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-callable@^1.1.4, is-callable@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
- integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+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.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+ integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
is-color-stop@^1.0.0:
version "1.1.0"
@@ -5185,6 +5429,13 @@ is-color-stop@^1.0.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"
+is-core-module@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+ integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+ 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"
@@ -5204,6 +5455,11 @@ is-date-object@^1.0.1:
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+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"
@@ -5232,6 +5488,11 @@ is-dotfile@^1.0.0:
resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+is-empty@^1.0.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz#de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b"
+ integrity sha1-3pu1snhzigWgsJpX4ftNSjQan2s=
+
is-equal-shallow@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
@@ -5278,6 +5539,11 @@ is-fullwidth-code-point@^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@^2.0.0, is-glob@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -5292,13 +5558,23 @@ is-glob@^3.1.0:
dependencies:
is-extglob "^2.1.0"
-is-glob@^4.0.0, is-glob@^4.0.1:
+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.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+ integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+
is-number@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -5318,6 +5594,11 @@ is-number@^4.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+is-number@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+ integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
is-obj@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
@@ -5328,6 +5609,11 @@ is-plain-obj@^1.0.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"
@@ -5345,37 +5631,32 @@ is-primitive@^2.0.0:
resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-is-promise@^2.1, is-promise@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
- integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+is-promise@^2.1:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+ integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
is-property@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-is-regex@^1.0.4, is-regex@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
- integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+is-regex@^1.0.4, is-regex@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+ integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
dependencies:
- has "^1.0.3"
-
-is-regexp@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
- integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+ has-symbols "^1.0.1"
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-stream@^1.0.1, is-stream@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
- integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+is-stream@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+ integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
is-string@^1.0.5:
version "1.0.5"
@@ -5401,11 +5682,26 @@ is-typedarray@~1.0.0:
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+is-what@^3.7.1:
+ version "3.12.0"
+ resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55"
+ integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==
+
+is-whitespace-character@^1.0.0:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+ integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
+
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-word-character@^1.0.0:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+ integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
+
is-wsl@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -5463,35 +5759,35 @@ jquery-ui@^1.12.1:
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
-jquery@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
- integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@^3.5.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+ integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
js-beautify@^1.8.8:
- version "1.10.3"
- resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz#c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"
- integrity sha512-wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz#a056d5d3acfd4918549aae3ab039f9f3c51eebb2"
+ integrity sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==
dependencies:
config-chain "^1.1.12"
editorconfig "^0.15.3"
glob "^7.1.3"
- mkdirp "~0.5.1"
- nopt "~4.0.1"
+ mkdirp "^1.0.4"
+ nopt "^5.0.0"
js-cookie@^2.1.3:
version "2.2.1"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
-"js-sequence-diagrams@git+https://github.com/codimd/js-sequence-diagrams.git":
+"js-sequence-diagrams@git+https://github.com/hedgedoc/js-sequence-diagrams.git":
version "2.0.1"
- resolved "git+https://github.com/codimd/js-sequence-diagrams.git#b9afa038521e5dadf9b97624a3c7db21890be669"
+ resolved "git+https://github.com/hedgedoc/js-sequence-diagrams.git#bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39"
dependencies:
lodash "4.17.x"
- raphael "2.2.x"
- snapsvg "0.4.x"
- underscore "1.8.x"
+ raphael "2.3.x"
+ snapsvg "0.5.x"
+ underscore "1.11.x"
webfontloader "~1.6.x"
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
@@ -5504,18 +5800,26 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1:
- version "3.13.1"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
- integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^3.13.0, js-yaml@^3.6.1:
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+ integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
+js-yaml@^3.13.1, js-yaml@~3.14.0:
+ 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"
jsbi@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz#8ea18b3e08d102c6cc09acaa9a099921d775f4fa"
- integrity sha512-+HQESPaV0mRiH614z4JPVPAftcRC2p53x92lySPzUzFwJbJTMpzHz8OYUkcXPN3fOcHUe0NdVcHnCtX/1+eCrA==
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0"
+ integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg==
jsbn@~0.1.0:
version "0.1.1"
@@ -5588,6 +5892,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^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"
@@ -5625,12 +5934,12 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-jsonfile@^2.1.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
- integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
- optionalDependencies:
- graceful-fs "^4.1.6"
+json5@^2.0.0, json5@^2.1.2:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+ integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+ dependencies:
+ minimist "^1.2.5"
jsonfile@^4.0.0:
version "4.0.0"
@@ -5639,7 +5948,7 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
-jsonlint@^1.6.2:
+jsonlint@1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988"
integrity sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==
@@ -5679,16 +5988,16 @@ jws@3.x.x:
jwa "^1.4.1"
safe-buffer "^5.0.1"
-kew@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
- integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=
-
keymaster@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb"
integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus=
+khroma@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz#cc17723eb719c5245ea66d23dd577d5695452db5"
+ integrity sha512-aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A==
+
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"
@@ -5713,19 +6022,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-klaw@^1.0.0:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
- integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
- optionalDependencies:
- graceful-fs "^4.1.9"
-
-kuler@1.0.x:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6"
- integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==
- dependencies:
- colornames "^1.1.1"
+kuler@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
+ integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
last-call-webpack-plugin@^3.0.0:
version "3.0.0"
@@ -5735,11 +6035,6 @@ last-call-webpack-plugin@^3.0.0:
lodash "^4.17.5"
webpack-sources "^1.1.0"
-lazy-cache@^1.0.3:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
- integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-
lazystream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
@@ -5747,13 +6042,6 @@ lazystream@^1.0.0:
dependencies:
readable-stream "^2.0.5"
-lcid@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
- integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
- dependencies:
- invert-kv "^2.0.0"
-
ldap-filter@0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.2.2.tgz#f2b842be0b86da3352798505b31ebcae590d77d0"
@@ -5761,13 +6049,13 @@ ldap-filter@0.2.2:
dependencies:
assert-plus "0.1.5"
-ldapauth-fork@^4.2.0:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz#500c04f339257ac0e189af8752ec5df43982ceac"
- integrity sha512-IJUnkEDQg6D45jUKW3FFfMWZhUjZoGkN97WaMXF1cBod0gJq74d+iwRavPqiE3o/KNRgqwFesrdE4Ym4Fc1GIQ==
+ldapauth-fork@^4.3.2:
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.3.tgz#d62c8f18a5035fd47a572f2ac7aa8c8227b3f4c2"
+ integrity sha512-x76VpQ5ZqkwAJmqwcD6KIwDiNEbgIGIPGwC/eA17e1dxWhlTx36w0DlLOFwjTuZ2iuaLTsZsUprlVqvSlwc/1Q==
dependencies:
"@types/ldapjs" "^1.0.0"
- "@types/node" "^10.12.12"
+ "@types/node" "*"
bcryptjs "^2.4.0"
ldapjs "^1.0.2"
lru-cache "^5.1.1"
@@ -5794,7 +6082,7 @@ left-pad@^1.3.0:
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
-less-loader@^5.0.0:
+less-loader@5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
@@ -5803,21 +6091,20 @@ less-loader@^5.0.0:
loader-utils "^1.1.0"
pify "^4.0.1"
-less@^3.10.3:
- version "3.11.1"
- resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2"
- integrity sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==
+less@3.13.1:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
+ integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
dependencies:
- clone "^2.1.2"
+ copy-anything "^2.0.1"
tslib "^1.10.0"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
image-size "~0.5.0"
+ make-dir "^2.1.0"
mime "^1.4.1"
- mkdirp "^0.5.0"
- promise "^7.1.1"
- request "^2.83.0"
+ native-request "^1.0.5"
source-map "~0.6.0"
levn@^0.3.0, levn@~0.3.0:
@@ -5828,6 +6115,20 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
+libnpmconfig@^1.0.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"
+ integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==
+ dependencies:
+ figgy-pudding "^3.5.1"
+ find-up "^3.0.0"
+ ini "^1.3.5"
+
+lines-and-columns@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+ integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
linkify-it@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
@@ -5852,20 +6153,37 @@ load-json-file@^2.0.0:
pify "^2.0.0"
strip-bom "^3.0.0"
+load-plugin@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz#8f3ce57cf4e5111639911012487bc1c2ba3d0e6c"
+ integrity sha512-od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ==
+ dependencies:
+ libnpmconfig "^1.0.0"
+ resolve-from "^5.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.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
- integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+loader-utils@^1.0.2, 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 "^2.0.0"
+ 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"
@@ -5882,6 +6200,13 @@ locate-path@^3.0.0:
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.assignin@^4.0.9:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
@@ -5892,17 +6217,22 @@ lodash.bind@^4.1.4:
resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
-lodash.defaults@^4.0.1:
+lodash.defaults@^4.0.1, lodash.defaults@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+lodash.difference@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+ integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
lodash.filter@^4.4.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
-lodash.flatten@^4.2.0:
+lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
@@ -5912,6 +6242,11 @@ lodash.foreach@^4.3.0:
resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+lodash.isplainobject@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+ integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
lodash.map@^4.4.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -5952,24 +6287,29 @@ lodash.sortby@^4.7.0:
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+lodash.union@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+ integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
+
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0:
- version "4.17.15"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
- integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5:
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-logform@^2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360"
- integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==
+logform@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2"
+ integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==
dependencies:
colors "^1.2.1"
fast-safe-stringify "^2.0.4"
- fecha "^2.3.3"
+ fecha "^4.2.0"
ms "^2.1.1"
triple-beam "^1.3.0"
@@ -5978,10 +6318,10 @@ long@^4.0.0:
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
-longest@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
- integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+longest-streak@^2.0.1:
+ 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.0.0:
version "1.4.0"
@@ -5995,6 +6335,13 @@ lower-case@^1.1.1:
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lower-case@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+ integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+ dependencies:
+ tslib "^1.10.0"
+
lru-cache@^4.1.3, lru-cache@^4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -6010,6 +6357,13 @@ lru-cache@^5.1.1:
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"
+
lru-queue@0.1:
version "0.1.0"
resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -6018,9 +6372,9 @@ lru-queue@0.1:
es5-ext "~0.10.2"
lutim@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/lutim/-/lutim-1.0.2.tgz#0b1e5a83c0c8d45900beb4eaf551e34f34f8a3e8"
- integrity sha512-eIeHBtFIxyef4mW+zgxoUyW59NN/lCRGoK7pDfnmY97asflEwA04met3SqFPEgPgeWgm4iRAMAJWZ3MDQ39ucw==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/lutim/-/lutim-1.0.3.tgz#3a29d0f2731eed7097f2d7367defeaa2ae45d820"
+ integrity sha512-niTn8F4/SyxjXG2a1lXAS/t5Yox9DCOPfVff6Y5tfrBPkK/bnzp2bRIkSNF+X2PRxjfvev0jFmi9J6IX1IkC7A==
dependencies:
q "^1.5.1"
request "^2.88.0"
@@ -6029,13 +6383,6 @@ lutim@^1.0.2:
version "1.4.4"
resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022"
-magic-string@^0.25.3:
- version "0.25.6"
- resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz#5586387d1242f919c6d223579cc938bf1420795e"
- integrity sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==
- dependencies:
- sourcemap-codec "^1.4.4"
-
make-dir@^1.0.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -6043,7 +6390,7 @@ make-dir@^1.0.0:
dependencies:
pify "^3.0.0"
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -6051,6 +6398,13 @@ make-dir@^2.0.0:
pify "^4.0.1"
semver "^5.6.0"
+make-dir@^3.0.2:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+ integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+ dependencies:
+ semver "^6.0.0"
+
make-plural@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"
@@ -6058,22 +6412,10 @@ make-plural@^4.3.0:
optionalDependencies:
minimist "^1.2.0"
-make-plural@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz#ed3839fac3f469ebbe505751d48fe3319769edfc"
- integrity sha512-h0uBNi4tpDkiWUyYKrJNj8Kif6q3Ba5zp/8jnfPy3pQE+4XcTj6h3eZM5SYVUyDNX9Zk69Isr/dx0I+78aJUaQ==
-
-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-age-cleaner@^0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
- integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
- dependencies:
- p-defer "^1.0.0"
+make-plural@^6.2.2:
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.2.2.tgz#beb5fd751355e72660eeb2218bb98eec92853c6c"
+ integrity sha512-8iTuFioatnTTmb/YJjywkVIHLjcwkFD9Ms0JpxjEm9Mo8eQYkh1z+55dwv4yc1jQ8ftVBxWQbihvZL1DfzGGWA==
map-cache@^0.2.2:
version "0.2.2"
@@ -6088,16 +6430,27 @@ map-visit@^1.0.0:
object-visit "^1.0.0"
mariadb@^2.1.2:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz#077e8c44ded718f2ecebef321c3703fe8d524504"
- integrity sha512-YXPF11u4NVgm3FLetJoAbq9Fb0a/RSwNrDHdmAqpqgYErWAOes/IVbOfvWPWZQ0hI88j/81f15AGJZAVuR3bGg==
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.2.tgz#0046331541589a9c0405507d91d79bcc972b3f5e"
+ integrity sha512-SfaBl5/LiX2qJNNr7wCQvizVjtWxVm1CUWYKe+y4OMeyYMM6g0GhwX7/BbGtv/O3WthnGrM+Kj1imFnlescO0w==
dependencies:
"@types/geojson" "^7946.0.7"
- "@types/node" ">=8.0.0"
+ "@types/node" "^14.14.7"
denque "^1.4.1"
- iconv-lite "^0.5.1"
+ iconv-lite "^0.6.2"
long "^4.0.0"
- moment-timezone "^0.5.27"
+ moment-timezone "^0.5.32"
+ please-upgrade-node "^3.2.0"
+
+markdown-escapes@^1.0.0:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+ integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+
+markdown-extensions@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3"
+ integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==
markdown-it-abbr@^1.0.4:
version "1.0.4"
@@ -6110,9 +6463,9 @@ markdown-it-container@^2.0.0:
integrity sha1-ABm0P9Au7+zi8ZYKKJX7qBpARpU=
markdown-it-deflist@^2.0.1:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz#5727db04184d3cb2bc6ee4a9641e3a1091d5fd6f"
- integrity sha512-/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz#50d7a56b9544cd81252f7623bd785e28a8dcef5c"
+ integrity sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg==
markdown-it-emoji@^1.3.0:
version "1.4.0"
@@ -6170,25 +6523,17 @@ markdown-it@^10.0.0:
mdurl "^1.0.1"
uc.micro "^1.0.5"
-markdown-pdf@^10.0.0:
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz#0cf7a32740c2966aa79392a35742749d6ed2a491"
- integrity sha512-o3lFfAOTpCgCXEXpNN86RaCVGE1YlxjWuAJ79XevAPoTyCBsl06BWhnFogYedg+JZxPjB3LWsA8JxZiCjsPPLA==
+markdown-table@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
+ integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
dependencies:
- commander "^3.0.0"
- duplexer "^0.1.1"
- extend "^3.0.2"
- highlight.js "^9.15.9"
- phantomjs-prebuilt "^2.1.3"
- remarkable "^2.0.0"
- stream-from-to "^1.4.2"
- through2 "^3.0.1"
- tmp "^0.1.0"
+ repeat-string "^1.0.0"
-marked@~0.8.0:
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz#ec5c0c9b93878dc52dd54be8d0e524097bd81a99"
- integrity sha512-MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==
+marked@~1.2.0:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb"
+ integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==
math-interval-parser@^2.0.1:
version "2.0.1"
@@ -6200,10 +6545,10 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-mathjax@~2.7.6:
- version "2.7.7"
- resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz#22ff89550a7b1f5f06a037d13da5ff3c33e11ec4"
- integrity sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ==
+mathjax@^2.7.6:
+ version "2.7.9"
+ resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d"
+ integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ==
mattermost@^3.4.0:
version "3.4.0"
@@ -6229,6 +6574,33 @@ md5.js@^1.3.4:
inherits "^2.0.1"
safe-buffer "^5.1.2"
+mdast-comment-marker@^1.0.0:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz#5ad2e42cfcc41b92a10c1421a98c288d7b447a6d"
+ integrity sha512-vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ==
+
+mdast-util-compact@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz#cabc69a2f43103628326f35b1acf735d55c99490"
+ integrity sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==
+ dependencies:
+ unist-util-visit "^2.0.0"
+
+mdast-util-heading-style@^1.0.2:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz#6410418926fd5673d40f519406b35d17da10e3c5"
+ integrity sha512-8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw==
+
+mdast-util-to-string@^1.0.2:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
+ integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
+
+mdn-data@2.0.12:
+ version "2.0.12"
+ resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844"
+ integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==
+
mdn-data@2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
@@ -6244,15 +6616,6 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-mem@^4.0.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
- integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
- dependencies:
- map-age-cleaner "^0.1.1"
- mimic-fn "^2.0.0"
- p-is-promise "^2.0.0"
-
memoizee@^0.4.14:
version "0.4.14"
resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57"
@@ -6267,7 +6630,7 @@ memoizee@^0.4.14:
next-tick "1"
timers-ext "^0.1.5"
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+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=
@@ -6288,22 +6651,27 @@ merge-descriptors@1.0.1:
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-mermaid@~8.4.6:
- version "8.4.7"
- resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz#1af8f6bece99f022a514471c42b80cabf7706501"
- integrity sha512-mj4mefncBd8y921auvsXMN5MbVqzkrXyCUPz1AbVdQ+W6XKO27Oyqnor4ZO2hlqlosJc+Dl273V+SJBmX5PTNw==
+merge2@^1.3.0:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+ integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+mermaid@^8.5.1:
+ version "8.8.4"
+ resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.8.4.tgz#5ea699bcfa1ef848d78b2ce8efb1e0118f30d9f7"
+ integrity sha512-YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA==
dependencies:
"@braintree/sanitize-url" "^3.1.0"
- crypto-random-string "^3.0.1"
d3 "^5.7.0"
dagre "^0.8.4"
dagre-d3 "^0.6.4"
+ entity-decode "^2.0.2"
graphlib "^2.1.7"
he "^1.2.0"
- lodash "^4.17.11"
+ khroma "^1.1.0"
minify "^4.1.1"
moment-mini "^2.22.1"
- scope-css "^1.2.1"
+ stylis "^3.5.2"
messageformat-formatters@^2.0.1:
version "2.0.1"
@@ -6311,9 +6679,9 @@ messageformat-formatters@^2.0.1:
integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==
messageformat-parser@^4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz#fd34ec39912a14868a1595eaeb742485ab8ab372"
- integrity sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA==
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz#b824787f57fcda7d50769f5b63e8d4fda68f5b9e"
+ integrity sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==
messageformat@^2.3.0:
version "2.3.0"
@@ -6324,12 +6692,12 @@ messageformat@^2.3.0:
messageformat-formatters "^2.0.1"
messageformat-parser "^4.1.2"
-"meta-marked@git+https://github.com/codimd/meta-marked#semver:^0.4.5":
+"meta-marked@git+https://github.com/hedgedoc/meta-marked":
version "0.4.5"
- resolved "git+https://github.com/codimd/meta-marked#a7b45a287465f79656134ff7142d1d74c8fcacfd"
+ resolved "git+https://github.com/hedgedoc/meta-marked#4fb5cb5a204969cc91e66eee92c0211188e69a2b"
dependencies:
- js-yaml "~3.13.1"
- marked "~0.8.0"
+ js-yaml "~3.14.0"
+ marked "~1.2.0"
method-override@^2.3.7:
version "2.3.10"
@@ -6384,6 +6752,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"
+micromatch@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+ integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+ dependencies:
+ braces "^3.0.1"
+ picomatch "^2.0.5"
+
miller-rabin@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -6392,47 +6768,47 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.43.0, "mime-db@>= 1.43.0 < 2":
- version "1.43.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
- integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+mime-db@1.44.0:
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+ integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+"mime-db@>= 1.43.0 < 2":
+ version "1.45.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+ integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24:
- version "2.1.26"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
- integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+ version "2.1.27"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+ integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
dependencies:
- mime-db "1.43.0"
+ mime-db "1.44.0"
mime@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
integrity sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=
-mime@1.6.0, mime@^1.2.9, mime@^1.4.1:
+mime@1.6.0, mime@^1.4.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mime@^2.4.4:
- version "2.4.4"
- resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
- integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+ version "2.4.6"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+ integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-mimic-fn@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
- integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mini-css-extract-plugin@^0.8.0:
- 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==
+mini-css-extract-plugin@0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz#ddeb74fd6304ca9f99c1db74acc7d5b507705454"
+ integrity sha512-z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw==
dependencies:
loader-utils "^1.1.0"
normalize-url "1.9.1"
@@ -6474,15 +6850,10 @@ minimist@0.0.8:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-minimist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@~0.0.1:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
- integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+minimist@^1.2.0, minimist@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
minio@^6.0.0:
version "6.0.0"
@@ -6504,6 +6875,27 @@ minio@^6.0.0:
xml "^1.0.0"
xml2js "^0.4.15"
+minipass-collect@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+ integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-flush@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+ integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+ integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+ dependencies:
+ minipass "^3.0.0"
+
minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -6512,6 +6904,13 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
safe-buffer "^5.1.2"
yallist "^3.0.0"
+minipass@^3.0.0, minipass@^3.1.1:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+ integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ dependencies:
+ yallist "^4.0.0"
+
minizlib@^1.2.1:
version "1.3.3"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -6519,6 +6918,14 @@ minizlib@^1.2.1:
dependencies:
minipass "^2.9.0"
+minizlib@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+ integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+ dependencies:
+ minipass "^3.0.0"
+ yallist "^4.0.0"
+
mississippi@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6543,14 +6950,26 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
dependencies:
minimist "0.0.8"
-mocha@^5.2.0:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, 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==
+
+mocha@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
@@ -6567,7 +6986,7 @@ mocha@^5.2.0:
mkdirp "0.5.1"
supports-color "5.4.0"
-mock-require@^3.0.3:
+mock-require@3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
@@ -6580,28 +6999,28 @@ moment-mini@^2.22.1:
resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18"
integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==
-moment-timezone@^0.5.21, moment-timezone@^0.5.27:
- version "0.5.27"
- resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877"
- integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==
+moment-timezone@^0.5.21, moment-timezone@^0.5.32:
+ version "0.5.32"
+ resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz#db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"
+ integrity sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==
dependencies:
moment ">= 2.9.0"
-"moment@>= 2.9.0", moment@^2.10.6, moment@^2.17.1, moment@^2.24.0:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
- integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+"moment@>= 2.9.0", moment@^2.17.1, moment@^2.19.3, moment@^2.24.0:
+ version "2.29.1"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+ integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
morgan@^1.7.0:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
- integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+ integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
dependencies:
- basic-auth "~2.0.0"
+ basic-auth "~2.0.1"
debug "2.6.9"
- depd "~1.1.2"
+ depd "~2.0.0"
on-finished "~2.3.0"
- on-headers "~1.0.1"
+ on-headers "~1.0.2"
move-concurrently@^1.0.1:
version "1.0.1"
@@ -6625,15 +7044,15 @@ ms@2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-mustache@*:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31"
- integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==
+mustache@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2"
+ integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==
mute-stream@0.0.7:
version "0.0.7"
@@ -6650,19 +7069,18 @@ mv@~2:
rimraf "~2.4.0"
mysql2@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz#55ecfd4353114c148cc4c253192dbbfd000e6642"
- integrity sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A==
+ version "2.2.5"
+ resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz#72624ffb4816f80f96b9c97fedd8c00935f9f340"
+ integrity sha512-XRqPNxcZTpmFdXbJqb+/CtYVLCx14x1RTeNMD4954L331APu75IC74GDqnZMEt1kwaXy6TySo55rF2F3YJS78g==
dependencies:
- cardinal "^2.1.1"
denque "^1.4.1"
generate-function "^2.3.1"
- iconv-lite "^0.5.0"
+ iconv-lite "^0.6.2"
long "^4.0.0"
- lru-cache "^5.1.1"
+ lru-cache "^6.0.0"
named-placeholders "^1.1.2"
seq-queue "^0.0.5"
- sqlstring "^2.3.1"
+ sqlstring "^2.3.2"
named-placeholders@^1.1.2:
version "1.1.2"
@@ -6672,9 +7090,14 @@ named-placeholders@^1.1.2:
lru-cache "^4.1.3"
nan@^2.12.1, nan@^2.14.0:
- version "2.14.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
- integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+ version "2.14.2"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+ integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
+nanoid@^2.1.0:
+ version "2.1.11"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
+ integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
nanomatch@^1.2.9:
version "1.2.13"
@@ -6698,6 +7121,11 @@ native-duplexpair@^1.0.0:
resolved "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz#7899078e64bf3c8a3d732601b3d40ff05db58fa0"
integrity sha1-eJkHjmS/PIo9cyYBs9QP8F21j6A=
+native-request@^1.0.5:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
+ integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
+
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -6709,9 +7137,9 @@ ncp@~2.0.0:
integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
needle@^2.2.1:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
- integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a"
+ integrity sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==
dependencies:
debug "^3.2.6"
iconv-lite "^0.4.4"
@@ -6723,9 +7151,9 @@ negotiator@0.6.2:
integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
- integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+ integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
next-tick@1:
version "1.1.0"
@@ -6749,20 +7177,28 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
+no-case@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+ integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+ dependencies:
+ lower-case "^2.0.1"
+ tslib "^1.10.0"
+
nocache@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f"
integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==
-node-forge@^0.7.0:
- version "0.7.6"
- resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
- integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
+node-forge@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+ integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-node-gyp-build@~3.7.0:
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz#daa77a4f547b9aed3e2aac779eaf151afd60ec8d"
- integrity sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==
+node-gyp-build@^4.2.0:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
+ integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
node-libs-browser@^2.2.1:
version "2.2.1"
@@ -6793,22 +7229,6 @@ node-libs-browser@^2.2.1:
util "^0.11.0"
vm-browserify "^1.0.1"
-node-pre-gyp@*:
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
- integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4.4.2"
-
node-pre-gyp@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
@@ -6825,23 +7245,12 @@ node-pre-gyp@^0.11.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.49:
- version "1.1.49"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e"
- integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==
- dependencies:
- semver "^6.3.0"
+node-releases@^1.1.66:
+ version "1.1.66"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
+ integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
-node-static@0.7.11:
- version "0.7.11"
- resolved "https://registry.yarnpkg.com/node-static/-/node-static-0.7.11.tgz#60120d349f3cef533e4e820670057eb631882e7f"
- integrity sha512-zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==
- dependencies:
- colors ">=0.6.0"
- mime "^1.2.9"
- optimist ">=0.3.4"
-
-nomnom@^1.5.x, nomnom@^1.8.1:
+nomnom@^1.5.x:
version "1.8.1"
resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
@@ -6849,14 +7258,21 @@ nomnom@^1.5.x, nomnom@^1.8.1:
chalk "~0.4.0"
underscore "~1.6.0"
-nopt@^4.0.1, nopt@~4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
- integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+nopt@^4.0.1:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+ integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
dependencies:
abbrev "1"
osenv "^0.1.4"
+nopt@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+ integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+ dependencies:
+ abbrev "1"
+
normalize-package-data@^2.3.2:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6874,7 +7290,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
dependencies:
remove-trailing-separator "^1.0.1"
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -6915,13 +7331,6 @@ npm-packlist@^1.1.6:
npm-bundled "^1.0.1"
npm-normalize-package-bin "^1.0.1"
-npm-run-path@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
- integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
- dependencies:
- path-key "^2.0.0"
-
npmlog@^4.0.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -6983,17 +7392,20 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
- integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+object-inspect@^1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+ integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
object-is@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
- integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
+ integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.18.0-next.1"
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -7005,15 +7417,15 @@ object-visit@^1.0.0:
dependencies:
isobject "^3.0.0"
-object.assign@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
- integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.1.1:
+ 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:
- define-properties "^1.1.2"
- function-bind "^1.1.1"
- has-symbols "^1.0.0"
- object-keys "^1.0.11"
+ call-bind "^1.0.0"
+ define-properties "^1.1.3"
+ has-symbols "^1.0.1"
+ object-keys "^1.1.1"
object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
version "2.1.0"
@@ -7038,7 +7450,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0:
+object.values@^1.1.0, object.values@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
@@ -7055,7 +7467,7 @@ on-finished@~2.3.0:
dependencies:
ee-first "1.1.1"
-on-headers@~1.0.1, on-headers@~1.0.2:
+on-headers@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
@@ -7067,10 +7479,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"
-one-time@0.0.4:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
- integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
+one-time@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
+ integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
+ dependencies:
+ fn.name "1.x.x"
onetime@^2.0.0:
version "2.0.1"
@@ -7080,24 +7494,16 @@ onetime@^2.0.0:
mimic-fn "^1.0.0"
openid@2.x.x:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz#707375e59ab9f73025899727679b20328171c9aa"
- integrity sha1-cHN15Zq59zAliZcnZ5sgMoFxyao=
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.7.tgz#37bf50af2aa692623364c004de35d41fd399c6e4"
+ integrity sha512-xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw==
dependencies:
- request "^2.61.0"
+ request "^2.88.2"
-optimist@>=0.3.4, optimist@^0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
- integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
- dependencies:
- minimist "~0.0.1"
- wordwrap "~0.0.2"
-
-optimize-css-assets-webpack-plugin@^5.0.3:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572"
- integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==
+optimize-css-assets-webpack-plugin@5.0.4:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90"
+ integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==
dependencies:
cssnano "^4.1.10"
last-call-webpack-plugin "^3.0.0"
@@ -7124,20 +7530,6 @@ os-homedir@^1.0.0:
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-os-homedir@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c"
- integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q==
-
-os-locale@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
- integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
- dependencies:
- execa "^1.0.0"
- lcid "^2.0.0"
- mem "^4.0.0"
-
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -7160,21 +7552,6 @@ output-file-sync@^1.1.2:
mkdirp "^0.5.1"
object-assign "^4.1.0"
-p-defer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
- integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
- integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
- integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
p-limit@^1.1.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -7182,10 +7559,17 @@ p-limit@^1.1.0:
dependencies:
p-try "^1.0.0"
-p-limit@^2.0.0, p-limit@^2.2.1:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
- integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+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.0.2"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+ integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
dependencies:
p-try "^2.0.0"
@@ -7203,6 +7587,20 @@ p-locate@^3.0.0:
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"
@@ -7239,6 +7637,14 @@ param-case@^2.1.1:
dependencies:
no-case "^2.2.0"
+param-case@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
+ integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
+ dependencies:
+ dot-case "^3.0.3"
+ tslib "^1.10.0"
+
parent-module@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -7246,18 +7652,29 @@ parent-module@^1.0.0:
dependencies:
callsites "^3.0.0"
-parse-asn1@^5.0.0:
- version "5.1.5"
- resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
- integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+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 "^4.0.0"
+ asn1.js "^5.2.0"
browserify-aes "^1.0.0"
- create-hash "^1.1.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-glob@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -7283,6 +7700,16 @@ parse-json@^4.0.0:
error-ex "^1.3.1"
json-parse-better-errors "^1.0.1"
+parse-json@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+ integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+ 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"
@@ -7300,6 +7727,11 @@ parseqs@0.0.5:
dependencies:
better-assert "~1.0.0"
+parseqs@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+ integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
parseuri@0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
@@ -7307,11 +7739,24 @@ parseuri@0.0.5:
dependencies:
better-assert "~1.0.0"
+parseuri@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+ integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+
parseurl@~1.3.2, parseurl@~1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+pascal-case@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
+ integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
+ dependencies:
+ no-case "^3.0.3"
+ tslib "^1.10.0"
+
pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -7354,13 +7799,13 @@ passport-google-oauth20@^1.0.0:
passport-oauth2 "1.x.x"
passport-ldapauth@^2.0.0:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz#833530c31c1e2f8d2ab7a1ff97339291074dc6f6"
- integrity sha512-23n425UTasN6XhcXG0qQ0h0YrS/zfo8kNIEhSLfPsNpglhYhhQFfB1pmDc5RrH+Kiz5fKLkki5BpvkKHCwkixg==
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.4.tgz#2259e4e5d2d9c2b3d50a04f6640a941effda8da9"
+ integrity sha512-VeVL69ZK+cpJe0DKMSGuwcf7k+V4dr0U0Y7ZhXL785pcRb5gRA6qYZfIH+XTsAzwqTK9l0Dn3Ds4weOZ1jKkLQ==
dependencies:
- "@types/node" "^10.12.26"
+ "@types/node" "*"
"@types/passport" "^1.0.0"
- ldapauth-fork "^4.2.0"
+ ldapauth-fork "^4.3.2"
passport-strategy "^1.0.0"
passport-local@^1.0.0:
@@ -7399,15 +7844,14 @@ passport-oauth@^1.0.0:
passport-oauth2 "1.x.x"
passport-saml@^1.0.0:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz#6cd7e747d7fd0283877d9f48b84c55908ab4182b"
- integrity sha512-oRtv1lF0AeOVGPD/UJMJnOO7AIc/Wgw7qfMxgejm2bjBo85a26LQfP+XnOD5gW7fxRdYKXDAIOvqPhFeGJmyBw==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.5.0.tgz#4f22526b577987fb2304219c29e05d2172fca5cf"
+ integrity sha512-6f4bfnu/X2KNbuqshOryPap0g8BvhOrlt1qDtJdA44qzQXZ5QUMwaTmexAHIf96LTqPqQ91MzPvi5MGsOgTYTw==
dependencies:
debug "^3.1.0"
passport-strategy "*"
- q "^1.5.0"
- xml-crypto "^1.4.0"
- xml-encryption "^1.0.0"
+ xml-crypto "^2.0.0"
+ xml-encryption "1.2.1"
xml2js "0.4.x"
xmlbuilder "^11.0.0"
xmldom "0.1.x"
@@ -7455,6 +7899,11 @@ path-exists@^3.0.0:
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+path-exists@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+ integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -7465,7 +7914,7 @@ path-is-inside@^1.0.2:
resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-path-key@^2.0.0, path-key@^2.0.1:
+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=
@@ -7487,12 +7936,10 @@ path-type@^2.0.0:
dependencies:
pify "^2.0.0"
-path-type@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
- integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
- dependencies:
- pify "^3.0.0"
+path-type@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+ integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
pause@0.0.1:
version "0.0.1"
@@ -7500,9 +7947,9 @@ pause@0.0.1:
integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10=
pbkdf2@^3.0.3:
- version "3.0.17"
- resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
- integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+ integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
dependencies:
create-hash "^1.1.2"
create-hmac "^1.1.4"
@@ -7511,24 +7958,19 @@ pbkdf2@^3.0.3:
sha.js "^2.4.8"
pdfobject@^2.0.201604172:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.1.1.tgz#2949d4d218d130d16b6149c7f7226f0a73400d4a"
- integrity sha512-QFktTHyjs4q/WhGFfV2RdAbscPdNkyQb/JfFz18cwILvs9ocDiYVFAEh/jgkKGv6my+r4nlbLjwj7BHFKAupHQ==
-
-pend@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
- integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz#ccb3c191129298a471e9ccb59c88a3ee0b7c7530"
+ integrity sha512-r6Rw9CQWsrY6uqmKvlgFNoupmuRbSt9EsG0sZhSAy3cIk4WgOXyAVmebFSlLhqj6gA5NIEXL3lSEbwOOYfdUvw==
performance-now@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-pg-connection-string@0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
- integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
+pg-connection-string@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10"
+ integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==
pg-hstore@^2.3.3:
version "2.3.3"
@@ -7542,15 +7984,15 @@ pg-int8@1.0.1:
resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-pg-packet-stream@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914"
- integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==
+pg-pool@^3.2.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz#a560e433443ed4ad946b84d774b3f22452694dff"
+ integrity sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==
-pg-pool@^2.0.10:
- version "2.0.10"
- resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a"
- integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==
+pg-protocol@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz#43a71a92f6fe3ac559952555aa3335c8cb4908be"
+ integrity sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==
pg-types@^2.1.0:
version "2.2.0"
@@ -7563,41 +8005,30 @@ pg-types@^2.1.0:
postgres-date "~1.0.4"
postgres-interval "^1.1.0"
-pg@^7.12.1:
- version "7.18.1"
- resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz#67f59c47a99456fcb34f9fe53662b79d4a992f6d"
- integrity sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw==
+pg@^8.2.1:
+ version "8.5.1"
+ resolved "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120"
+ integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==
dependencies:
buffer-writer "2.0.0"
packet-reader "1.0.0"
- pg-connection-string "0.1.3"
- pg-packet-stream "^1.1.0"
- pg-pool "^2.0.10"
+ pg-connection-string "^2.4.0"
+ pg-pool "^3.2.2"
+ pg-protocol "^1.4.0"
pg-types "^2.1.0"
pgpass "1.x"
- semver "4.3.2"
pgpass@1.x:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
- integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c"
+ integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==
dependencies:
- split "^1.0.0"
+ split2 "^3.1.1"
-phantomjs-prebuilt@^2.1.12, phantomjs-prebuilt@^2.1.3:
- version "2.1.16"
- resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef"
- integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=
- dependencies:
- es6-promise "^4.0.3"
- extract-zip "^1.6.5"
- fs-extra "^1.0.0"
- hasha "^2.2.0"
- kew "^0.7.0"
- progress "^1.1.8"
- request "^2.81.0"
- request-progress "^2.0.1"
- which "^1.2.10"
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+ integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
pify@^2.0.0:
version "2.3.0"
@@ -7614,18 +8045,6 @@ pify@^4.0.1:
resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-pinkie-promise@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
- integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
- dependencies:
- pinkie "^2.0.0"
-
-pinkie@^2.0.0:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
- integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
pkg-dir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -7640,11 +8059,30 @@ pkg-dir@^3.0.0:
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"
+
pkginfo@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8"
integrity sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg=
+please-upgrade-node@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+ integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+ dependencies:
+ semver-compare "^1.0.0"
+
+pluralize@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+ integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
+
pn@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -7661,14 +8099,13 @@ posix-character-classes@^0.1.0:
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
postcss-calc@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
- integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
+ 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:
- css-unit-converter "^1.1.1"
- postcss "^7.0.5"
- postcss-selector-parser "^5.0.0-rc.4"
- postcss-value-parser "^3.3.1"
+ 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"
@@ -7787,19 +8224,19 @@ postcss-modules-extract-imports@^2.0.0:
postcss "^7.0.5"
postcss-modules-local-by-default@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
- integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+ 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.16"
+ postcss "^7.0.32"
postcss-selector-parser "^6.0.2"
- postcss-value-parser "^4.0.0"
+ postcss-value-parser "^4.1.0"
-postcss-modules-scope@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba"
- integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==
+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"
@@ -7931,23 +8368,15 @@ postcss-selector-parser@^3.0.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-selector-parser@^5.0.0-rc.4:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
- integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
- dependencies:
- cssesc "^2.0.0"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
-
postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
- integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+ version "6.0.4"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+ integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
dependencies:
cssesc "^3.0.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
+ util-deprecate "^1.0.2"
postcss-svgo@^4.0.2:
version "4.0.2"
@@ -7968,20 +8397,20 @@ postcss-unique-selectors@^4.0.1:
postcss "^7.0.0"
uniqs "^2.0.0"
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.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.0, postcss-value-parser@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
- integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+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@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6:
- version "7.0.26"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
- integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, 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"
@@ -7998,9 +8427,9 @@ postgres-bytea@~1.0.0:
integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
postgres-date@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728"
- integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
+ integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
postgres-interval@^1.1.0:
version "1.2.0"
@@ -8030,17 +8459,22 @@ preserve@^0.2.0:
integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
pretty-error@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
- integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
+ integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
dependencies:
- renderkid "^2.0.1"
- utila "~0.4"
+ lodash "^4.17.20"
+ renderkid "^2.0.4"
-prismjs@^1.6.0:
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc"
- integrity sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw==
+printj@~1.1.0:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+ integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
+prismjs@^1.21.0:
+ version "1.22.0"
+ resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz#73c3400afc58a823dd7eed023f8e1ce9fd8977fa"
+ integrity sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==
optionalDependencies:
clipboard "^2.0.0"
@@ -8064,11 +8498,6 @@ process@^0.11.10:
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-progress@^1.1.8:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
- integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
progress@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -8079,25 +8508,18 @@ promise-inflight@^1.0.1:
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-promise@^7.1.1:
- version "7.3.1"
- resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
- integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
- dependencies:
- asap "~2.0.3"
-
proto-list@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
proxy-addr@~2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
- integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+ integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
dependencies:
forwarded "~0.1.2"
- ipaddr.js "1.9.0"
+ ipaddr.js "1.9.1"
prr@~1.0.1:
version "1.0.1"
@@ -8109,10 +8531,10 @@ pseudomap@^1.0.2:
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-psl@^1.1.24:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
- integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+psl@^1.1.28:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+ integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
public-encrypt@^4.0.0:
version "4.0.3"
@@ -8156,17 +8578,17 @@ punycode@1.3.2:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-q@^1.1.2, q@^1.5.0, q@^1.5.1:
+q@^1.1.2, q@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -8227,17 +8649,17 @@ randomatic@^3.0.0:
kind-of "^6.0.0"
math-random "^1.0.1"
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
dependencies:
safe-buffer "^5.1.0"
-randomcolor@^0.5.3:
- version "0.5.4"
- resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.5.4.tgz#df615b13f25b89ea58c5f8f72647f0a6f07adcc3"
- integrity sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA==
+randomcolor@^0.6.0:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.6.2.tgz#7a57362ae1a1278439aeed2c15e5deb8ea33f56d"
+ integrity sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A==
randomfill@^1.0.3:
version "1.0.4"
@@ -8252,26 +8674,13 @@ range-parser@~1.2.1:
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-raphael@2.2.x:
- version "2.2.8"
- resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.8.tgz#4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3"
- integrity sha512-0kWKcGn4lXTw4eUiOhjspYiG+v0m6zSmTmlO62E0hl2CYKUvCuHER9YKqXYvOn2nj24mYp8jzHOLeBuj/Gn28Q==
- dependencies:
- eve-raphael "0.5.0"
-
-raphael@2.3.0:
+raphael@2.3.0, raphael@2.3.x, raphael@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89"
integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ==
dependencies:
eve-raphael "0.5.0"
-"raphael@git+https://github.com/dmitrybaranovskiy/raphael":
- version "2.3.0"
- resolved "git+https://github.com/dmitrybaranovskiy/raphael#d8fbe4be81d362837f95e33886b80fb41de443b4"
- dependencies:
- eve-raphael "0.5.0"
-
raw-body@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
@@ -8314,7 +8723,7 @@ read-pkg@^2.0.0:
normalize-package-data "^2.3.2"
path-type "^2.0.0"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -8337,15 +8746,6 @@ readable-stream@1.0.27-1:
isarray "0.0.1"
string_decoder "~0.10.x"
-"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0:
- version "3.6.0"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
- integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
- dependencies:
- inherits "^2.0.3"
- string_decoder "^1.1.1"
- util-deprecate "^1.0.1"
-
"readable-stream@>=1.0.33-1 <1.1.0-0":
version "1.0.34"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -8356,6 +8756,15 @@ readable-stream@1.0.27-1:
isarray "0.0.1"
string_decoder "~0.10.x"
+readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+ dependencies:
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
+
readable-stream@~2.0.0:
version "2.0.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -8368,6 +8777,13 @@ readable-stream@~2.0.0:
string_decoder "~0.10.x"
util-deprecate "~1.0.1"
+readdir-glob@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
+ integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==
+ dependencies:
+ minimatch "^3.0.4"
+
readdirp@^2.0.0, readdirp@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -8377,18 +8793,18 @@ readdirp@^2.0.0, readdirp@^2.2.1:
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"
+
readline-sync@^1.4.7:
version "1.4.10"
resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
-redeyed@~2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
- integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=
- dependencies:
- esprima "~4.0.0"
-
reduce-component@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/reduce-component/-/reduce-component-1.0.1.tgz#e0c93542c574521bea13df0f9488ed82ab77c5da"
@@ -8399,17 +8815,10 @@ referrer-policy@1.2.0:
resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
integrity sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA==
-regenerate-unicode-properties@^8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
- integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
- dependencies:
- regenerate "^1.4.0"
-
-regenerate@^1.2.1, regenerate@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
- integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+regenerate@^1.2.1:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+ integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
regenerator-runtime@^0.10.5:
version "0.10.5"
@@ -8467,28 +8876,11 @@ regexpu-core@^2.0.0:
regjsgen "^0.2.0"
regjsparser "^0.1.4"
-regexpu-core@^4.5.4:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
- integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.1.0"
- regjsgen "^0.5.0"
- regjsparser "^0.6.0"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.1.0"
-
regjsgen@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
-regjsgen@^0.5.0:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
- integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
-
regjsparser@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
@@ -8496,48 +8888,588 @@ regjsparser@^0.1.4:
dependencies:
jsesc "~0.5.0"
-regjsparser@^0.6.0:
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"
- integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==
- dependencies:
- jsesc "~0.5.0"
-
relateurl@^0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-remarkable@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz#795f965bede8300362ce51a716edc322d9e7a4ca"
- integrity sha512-3gvKFAgL4xmmVRKAMNm6UzDo/rO2gPVkZrWagp6AXEA4JvCcMcRx9aapYbb7AJAmLLvi/u06+EhzqoS7ha9qOg==
+remark-cli@8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-8.0.1.tgz#093e9f27c1d56a591f4c44c017de5749d4e79a08"
+ integrity sha512-UaYeFI5qUAzkthUd8/MLBQD5OKM6jLN8GRvF6v+KF7xO/i1jQ+X2VqUSQAxWFYxZ8R25gM56GVjeoKOZ0EIr8A==
dependencies:
- argparse "^1.0.10"
- autolinker "^3.11.0"
+ markdown-extensions "^1.1.0"
+ remark "^12.0.0"
+ unified-args "^8.0.0"
+
+remark-lint-blockquote-indentation@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz#27347959acf42a6c3e401488d8210e973576b254"
+ integrity sha512-uJ9az/Ms9AapnkWpLSCJfawBfnBI2Tn1yUsPNqIFv6YM98ymetItUMyP6ng9NFPqDvTQBbiarulkgoEo0wcafQ==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ pluralize "^8.0.0"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-code-block-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz#448b0f2660acfcdfff2138d125ff5b1c1279c0cb"
+ integrity sha512-eRhmnColmSxJhO61GHZkvO67SpHDshVxs2j3+Zoc5Y1a4zQT2133ZAij04XKaBFfsVLjhbY/+YOWxgvtjx2nmA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-definition-case@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz#10340eb2f87acff41140d52ad7e5b40b47e6690a"
+ integrity sha512-M+XlThtQwEJLQnQb5Gi6xZdkw92rGp7m2ux58WMw/Qlcg02WgHR/O0OcHPe5VO5hMJrtI+cGG5T0svsCgRZd3w==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-definition-spacing@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz#97f01bf9bf77a7bdf8013b124b7157dd90b07c64"
+ integrity sha512-xK9DOQO5MudITD189VyUiMHBIKltW1oc55L7Fti3i9DedXoBG7Phm+V9Mm7IdWzCVkquZVgVk63xQdqzSQRrSQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-emphasis-marker@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz#1d5ca2070d4798d16c23120726158157796dc317"
+ integrity sha512-7mpbAUrSnHiWRyGkbXRL5kfSKY9Cs8cdob7Fw+Z02/pufXMF4yRWaegJ5NTUu1RE+SKlF44wtWWjvcIoyY6/aw==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-fenced-code-flag@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz#2cb3ddb1157082c45760c7d01ca08e13376aaf62"
+ integrity sha512-+COnWHlS/h02FMxoZWxNlZW3Y8M0cQQpmx3aNCbG7xkyMyCKsMLg9EmRvYHHIbxQCuF3JT0WWx5AySqlc7d+NA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-fenced-code-marker@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz#7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf"
+ integrity sha512-lujpjm04enn3ma6lITlttadld6eQ1OWAEcT3qZzvFHp+zPraC0yr0eXlvtDN/0UH8mrln/QmGiZp3i8IdbucZg==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-file-extension@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz#7e2feec02919aa3db5c71fda19d726a9e24a4c6c"
+ integrity sha512-oVQdf5vEomwHkfQ7R/mgmsWW2H/t9kSvnrxtVoNOHr+qnOEafKKDn+AFhioN2kqtjCZBAjSSrePs6xGKmXKDTw==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-final-definition@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz#b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb"
+ integrity sha512-83K7n2icOHPfBzbR5Mr1o7cu8gOjD8FwJkFx/ly+rW+8SHfjCj4D3WOFGQ1xVdmHjfomBDXXDSNo2oiacADVXQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-hard-break-spaces@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz#2149b55cda17604562d040c525a2a0d26aeb0f0f"
+ integrity sha512-Qfn/BMQFamHhtbfLrL8Co/dbYJFLRL4PGVXZ5wumkUO5f9FkZC2RsV+MD9lisvGTkJK0ZEJrVVeaPbUIFM0OAw==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-heading-increment@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz#b578f251508a05d79bc2d1ae941e0620e23bf1d3"
+ integrity sha512-bYDRmv/lk3nuWXs2VSD1B4FneGT6v7a74FuVmb305hyEMmFSnneJvVgnOJxyKlbNlz12pq1IQ6MhlJBda/SFtQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-heading-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz#8216fca67d97bbbeec8a19b6c71bfefc16549f72"
+ integrity sha512-IrFLNs0M5Vbn9qg51AYhGUfzgLAcDOjh2hFGMz3mx664dV6zLcNZOPSdJBBJq3JQR4gKpoXcNwN1+FFaIATj+A==
+ dependencies:
+ mdast-util-heading-style "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-link-title-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz#51a595c69fcfa73a245a030dfaa3504938a1173a"
+ integrity sha512-+Q7Ew8qpOQzjqbDF6sUHmn9mKgje+m2Ho8Xz7cEnGIRaKJgtJzkn/dZqQM/az0gn3zaN6rOuwTwqw4EsT5EsIg==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+ vfile-location "^3.0.0"
+
+remark-lint-list-item-content-indent@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz#96387459440dcd61e522ab02bff138b32bfaa63a"
+ integrity sha512-OzUMqavxyptAdG7vWvBSMc9mLW9ZlTjbW4XGayzczd3KIr6Uwp3NEFXKx6MLtYIM/vwBqMrPQUrObOC7A2uBpQ==
+ dependencies:
+ pluralize "^8.0.0"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-list-item-indent@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz#c6472514e17bc02136ca87936260407ada90bf8d"
+ integrity sha512-4IKbA9GA14Q9PzKSQI6KEHU/UGO36CSQEjaDIhmb9UOhyhuzz4vWhnSIsxyI73n9nl9GGRAMNUSGzr4pQUFwTA==
+ dependencies:
+ pluralize "^8.0.0"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-list-item-spacing@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-2.0.1.tgz#864ddda464d5cd11f725c83f00bb240538661d50"
+ integrity sha512-T/aRHRNxiLC0v8gsb5ljFpjm/j/nHvlbCcmE5q7+LCiKLWsv7JoERrmMyx89KaBudLRPhaFHqt6u+dfWYmj6LA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-maximum-heading-length@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz#56f240707a75b59bce3384ccc9da94548affa98f"
+ integrity sha512-1CjJ71YDqEpoOjUnc4wrwZV8ZGXWUIYRYeGoarAy3QKHepJL9M+zkdbOxZDfhc3tjVoDW/LWcgsW+DEpczgiMA==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-maximum-line-length@^2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz#d0d15410637d61b031a83d7c78022ec46d6c858a"
+ integrity sha512-zyWHBFh1oPAy+gkaVFXiTHYP2WwriIeBtaarDqkweytw0+qmuikjVMJTWbQ3+XfYBreD7KKDM9SI79nkp0/IZQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-auto-link-without-protocol@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz#f75e5c24adb42385593e0d75ca39987edb70b6c4"
+ integrity sha512-TFcXxzucsfBb/5uMqGF1rQA+WJJqm1ZlYQXyvJEXigEZ8EAxsxZGPb/gOQARHl/y0vymAuYxMTaChavPKaBqpQ==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-blockquote-without-marker@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-3.0.1.tgz#fb1d5a87ee6f21b731bb2ee52df55632c519a5eb"
+ integrity sha512-sM953+u0zN90SGd2V5hWcFbacbpaROUslS5Q5F7/aa66/2rAwh6zVnrXc4pf7fFOpj7I9Xa8Aw+uB+3RJWwdrQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+ vfile-location "^3.0.0"
+
+remark-lint-no-consecutive-blank-lines@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-2.0.1.tgz#4163fa21619fe69325333f83eed8a933ed32e7ec"
+ integrity sha512-CP34b9AOaK1iD8FDplWvF9cJ318izoOaPXb2nb7smf/NdVHBI7joDzXcD4ojHOb3DTZuQcZ2bVv36vTPi/mv0Q==
+ dependencies:
+ pluralize "^8.0.0"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-duplicate-headings@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz#4a4b70e029155ebcfc03d8b2358c427b69a87576"
+ integrity sha512-F6AP0FJcHIlkmq0pHX0J5EGvLA9LfhuYTvnNO8y3kvflHeRjFkDyt2foz/taXR8OcLQR51n/jIJiwrrSMbiauw==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-stringify-position "^2.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-emphasis-as-heading@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz#fcc064133fe00745943c334080fed822f72711ea"
+ integrity sha512-z86+yWtVivtuGIxIC4g9RuATbgZgOgyLcnaleonJ7/HdGTYssjJNyqCJweaWSLoaI0akBQdDwmtJahW5iuX3/g==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-file-name-articles@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz#4ca3425f6613f94feaef6941028583299727c339"
+ integrity sha512-AQk5eTb3s3TAPPjiglZgqlQj4ycao+gPs8/XkdN1VCPUtewW0GgwoQe7YEuBKayJ6ioN8dGP37Kg/P/PlKaRQA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-no-file-name-consecutive-dashes@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz#e9a6f2aeab948aa249c8a8356359e3d8843a4c5c"
+ integrity sha512-Mg2IDsi790/dSdAzwnBnsMYdZm3qC2QgGwqOWcr0TPABJhhjC3p8r5fX4MNMTXI5It7B7bW9+ImmCeLOZiXkLg==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-no-file-name-irregular-characters@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz#6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6"
+ integrity sha512-Oe5i99qNUKc2bxmiH421o5B/kqlf1dfjAxpHNLhi2X2dXE91zRGavrlRM/4f4oR0N9Bqb3qB9JZPyMPWrzu9XA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-no-file-name-mixed-case@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz#3e37bfef74bbdd4b07aa9ef9dd452758f8b46731"
+ integrity sha512-ilrUCbHZin/ENwr8c3SC2chgkFsizXjBQIB/oZ7gnm1IkCkZPiMyXZAHdpwC/DjbrpGxfMYh9JmIHao4giS5+A==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-no-file-name-outer-dashes@^1.0.0:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz#4e0e4d42a63f0fdfb856bb5d8d8112725656e700"
+ integrity sha512-rT8CmcIlenegS0Yst4maYXdZfqIjBOiRUY8j/KJkORF5tKH+3O1/S07025qPGmcRihzK3w4yO0K8rgkKQw0b9w==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+
+remark-lint-no-heading-punctuation@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz#face59f9a95c8aa278a8ee0c728bc44cd53ea9ed"
+ integrity sha512-lY/eF6GbMeGu4cSuxfGHyvaQQBIq/6T/o+HvAR5UfxSTxmxZFwbZneAI2lbeR1zPcqOU87NsZ5ZZzWVwdLpPBw==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-inline-padding@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-2.0.1.tgz#630b546566d34bde87943da318a80fc7ff856f1f"
+ integrity sha512-a36UlPvRrLCgxjjG3YZA9VCDvLBcoBtGNyM04VeCPz+d9hHe+5Fs1C/jL+DRLCH7nff90jJ5C/9b8/LTwhjaWA==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-literal-urls@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz#731908f9866c1880e6024dcee1269fb0f40335d6"
+ integrity sha512-IDdKtWOMuKVQIlb1CnsgBoyoTcXU3LppelDFAIZePbRPySVHklTtuK57kacgU5grc7gPM04bZV96eliGrRU7Iw==
+ dependencies:
+ mdast-util-to-string "^1.0.2"
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-multiple-toplevel-headings@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz#3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635"
+ integrity sha512-VKSItR6c+u3OsE5pUiSmNusERNyQS9Nnji26ezoQ1uvy06k3RypIjmzQqJ/hCkSiF+hoyC3ibtrrGT8gorzCmQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-stringify-position "^2.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-shell-dollars@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz#b2c6c3ed95e5615f8e5f031c7d271a18dc17618e"
+ integrity sha512-zhkHZOuyaD3r/TUUkkVqW0OxsR9fnSrAnHIF63nfJoAAUezPOu8D1NBsni6rX8H2DqGbPYkoeWrNsTwiKP0yow==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-shortcut-reference-image@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz#d174d12a57e8307caf6232f61a795bc1d64afeaa"
+ integrity sha512-2jcZBdnN6ecP7u87gkOVFrvICLXIU5OsdWbo160FvS/2v3qqqwF2e/n/e7D9Jd+KTq1mR1gEVVuTqkWWuh3cig==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-shortcut-reference-link@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz#8f963f81036e45cfb7061b3639e9c6952308bc94"
+ integrity sha512-pTZbslG412rrwwGQkIboA8wpBvcjmGFmvugIA+UQR+GfFysKtJ5OZMPGJ98/9CYWjw9Z5m0/EktplZ5TjFjqwA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-no-table-indentation@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-2.0.1.tgz#67ef344389fa40be9c6017835cf58ca417c417d0"
+ integrity sha512-PnqIyg5qf+QbaIfolxXpakk/MR1RxZ0EdhKgVqsaEwv8+fka1LZYu7QO+ZFmrT82gVzvjRqHJkmxTskC/VP30w==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-ordered-list-marker-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz#183c31967e6f2ae8ef00effad03633f7fd00ffaa"
+ integrity sha512-Cnpw1Dn9CHn+wBjlyf4qhPciiJroFOEGmyfX008sQ8uGoPZsoBVIJx76usnHklojSONbpjEDcJCjnOvfAcWW1A==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-ordered-list-marker-value@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz#0de343de2efb41f01eae9f0f7e7d30fe43db5595"
+ integrity sha512-blt9rS7OKxZ2NW8tqojELeyNEwPhhTJGVa+YpUkdEH+KnrdcD7Nzhnj6zfLWOx6jFNZk3jpq5nvLFAPteHaNKg==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-rule-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz#f59bd82e75d3eaabd0eee1c8c0f5513372eb553c"
+ integrity sha512-hz4Ff9UdlYmtO6Czz99WJavCjqCer7Cav4VopXt+yVIikObw96G5bAuLYcVS7hvMUGqC9ZuM02/Y/iq9n8pkAg==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-strong-marker@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz#1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4"
+ integrity sha512-8X2IsW1jZ5FmW9PLfQjkL0OVy/J3xdXLcZrG1GTeQKQ91BrPFyEZqUM2oM6Y4S6LGtxWer+neZkPZNroZoRPBQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-table-cell-padding@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-2.0.1.tgz#b1e557ec44e1a33beb45578e97bf9441149379f6"
+ integrity sha512-vytUq4O1cg9UBXyeduANqpVqlbZpEtpXe/hYdvAObWgp1Jr7l74Zcvm+pn/ouaCuAsrxDVWeTa5Mg3V4OByw4g==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-table-pipe-alignment@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz#12b7e4c54473d69c9866cb33439c718d09cffcc5"
+ integrity sha512-O89U7bp0ja6uQkT2uQrNB76GaPvFabrHiUGhqEUnld21yEdyj7rgS57kn84lZNSuuvN1Oor6bDyCwWQGzzpoOQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-table-pipes@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-2.0.1.tgz#b8594394f65053a030e8a51baa8504e388139a19"
+ integrity sha512-ZdR9rj1BZYXHPXFk3Gnb4agwL+CtO/SojhHua4iRBx1WCQElCeZS3M9naRrE41+2QSNkKnytgGZJzyAlm2nFGQ==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint-unordered-list-marker-style@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz#e64692aa9594dbe7e945ae76ab2218949cd92477"
+ integrity sha512-8KIDJNDtgbymEvl3LkrXgdxPMTOndcux3BHhNGB2lU4UnxSpYeHsxcDgirbgU6dqCAfQfvMjPvfYk19QTF9WZA==
+ dependencies:
+ unified-lint-rule "^1.0.0"
+ unist-util-generated "^1.1.0"
+ unist-util-position "^3.0.0"
+ unist-util-visit "^2.0.0"
+
+remark-lint@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-7.0.1.tgz#665a5cbea9f7c95e64593f69bb6816ee8343ffdf"
+ integrity sha512-caZXo3qhuBxzvq9JSJFVQ/ERDq/6TJVgWn0KDwKOIJCGOuLXfQhby5XttUq+Rn7kLbNMtvwfWHJlte14LpaeXQ==
+ dependencies:
+ remark-message-control "^6.0.0"
+
+remark-message-control@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz#955b054b38c197c9f2e35b1d88a4912949db7fc5"
+ integrity sha512-k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA==
+ dependencies:
+ mdast-comment-marker "^1.0.0"
+ unified-message-control "^3.0.0"
+
+remark-parse@^8.0.0:
+ version "8.0.3"
+ resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
+ integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
+ dependencies:
+ ccount "^1.0.0"
+ collapse-white-space "^1.0.2"
+ is-alphabetical "^1.0.0"
+ is-decimal "^1.0.0"
+ is-whitespace-character "^1.0.0"
+ is-word-character "^1.0.0"
+ markdown-escapes "^1.0.0"
+ parse-entities "^2.0.0"
+ repeat-string "^1.5.4"
+ state-toggle "^1.0.0"
+ trim "0.0.1"
+ trim-trailing-lines "^1.0.0"
+ unherit "^1.0.4"
+ unist-util-remove-position "^2.0.0"
+ vfile-location "^3.0.0"
+ xtend "^4.0.1"
+
+remark-preset-lint-markdown-style-guide@3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-3.0.1.tgz#7f160e2ded777bfb14d544e9f72c6873bdfb6da3"
+ integrity sha512-1C4s6TtYCPueZIkxXK8aJ6qz84WqsxA7vA11i1PBIwJuL9a254X+QlbzhhEVKp0GwV4M/YTAVcfbGWVuiNEynw==
+ dependencies:
+ remark-lint "^7.0.0"
+ remark-lint-blockquote-indentation "^2.0.0"
+ remark-lint-code-block-style "^2.0.0"
+ remark-lint-definition-case "^2.0.0"
+ remark-lint-definition-spacing "^2.0.0"
+ remark-lint-emphasis-marker "^2.0.0"
+ remark-lint-fenced-code-flag "^2.0.0"
+ remark-lint-fenced-code-marker "^2.0.0"
+ remark-lint-file-extension "^1.0.0"
+ remark-lint-final-definition "^2.0.0"
+ remark-lint-hard-break-spaces "^2.0.0"
+ remark-lint-heading-increment "^2.0.0"
+ remark-lint-heading-style "^2.0.0"
+ remark-lint-link-title-style "^2.0.0"
+ remark-lint-list-item-content-indent "^2.0.0"
+ remark-lint-list-item-indent "^2.0.0"
+ remark-lint-list-item-spacing "^2.0.0"
+ remark-lint-maximum-heading-length "^2.0.0"
+ remark-lint-maximum-line-length "^2.0.0"
+ remark-lint-no-auto-link-without-protocol "^2.0.0"
+ remark-lint-no-blockquote-without-marker "^3.0.0"
+ remark-lint-no-consecutive-blank-lines "^2.0.0"
+ remark-lint-no-duplicate-headings "^2.0.0"
+ remark-lint-no-emphasis-as-heading "^2.0.0"
+ remark-lint-no-file-name-articles "^1.0.0"
+ remark-lint-no-file-name-consecutive-dashes "^1.0.0"
+ remark-lint-no-file-name-irregular-characters "^1.0.0"
+ remark-lint-no-file-name-mixed-case "^1.0.0"
+ remark-lint-no-file-name-outer-dashes "^1.0.0"
+ remark-lint-no-heading-punctuation "^2.0.0"
+ remark-lint-no-inline-padding "^2.0.0"
+ remark-lint-no-literal-urls "^2.0.0"
+ remark-lint-no-multiple-toplevel-headings "^2.0.0"
+ remark-lint-no-shell-dollars "^2.0.0"
+ remark-lint-no-shortcut-reference-image "^2.0.0"
+ remark-lint-no-shortcut-reference-link "^2.0.0"
+ remark-lint-no-table-indentation "^2.0.0"
+ remark-lint-ordered-list-marker-style "^2.0.0"
+ remark-lint-ordered-list-marker-value "^2.0.0"
+ remark-lint-rule-style "^2.0.0"
+ remark-lint-strong-marker "^2.0.0"
+ remark-lint-table-cell-padding "^2.0.0"
+ remark-lint-table-pipe-alignment "^2.0.0"
+ remark-lint-table-pipes "^2.0.0"
+ remark-lint-unordered-list-marker-style "^2.0.0"
+
+remark-stringify@^8.0.0:
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz#e2a9dc7a7bf44e46a155ec78996db896780d8ce5"
+ integrity sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==
+ dependencies:
+ ccount "^1.0.0"
+ is-alphanumeric "^1.0.0"
+ is-decimal "^1.0.0"
+ is-whitespace-character "^1.0.0"
+ longest-streak "^2.0.1"
+ markdown-escapes "^1.0.0"
+ markdown-table "^2.0.0"
+ mdast-util-compact "^2.0.0"
+ parse-entities "^2.0.0"
+ repeat-string "^1.5.4"
+ state-toggle "^1.0.0"
+ stringify-entities "^3.0.0"
+ unherit "^1.0.4"
+ xtend "^4.0.1"
+
+remark@^12.0.0:
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz#f1ddf68db7be71ca2bad0a33cd3678b86b9c709f"
+ integrity sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==
+ dependencies:
+ remark-parse "^8.0.0"
+ remark-stringify "^8.0.0"
+ unified "^9.0.0"
remove-trailing-separator@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-renderkid@^2.0.1:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
- integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
+renderkid@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz#d325e532afb28d3f8796ffee306be8ffd6fc864c"
+ integrity sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==
dependencies:
css-select "^1.1.0"
dom-converter "^0.2"
htmlparser2 "^3.3.0"
+ lodash "^4.17.20"
strip-ansi "^3.0.0"
- utila "^0.4.0"
repeat-element@^1.1.2:
version "1.1.3"
resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.0, repeat-string@^1.5.2, repeat-string@^1.5.4, 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=
@@ -8549,30 +9481,28 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
-request-progress@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
- integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=
- dependencies:
- throttleit "^1.0.0"
+replace-ext@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+ integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-request-promise-core@1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
- integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+request-promise-core@1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+ integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
dependencies:
- lodash "^4.17.15"
+ lodash "^4.17.19"
request-promise-native@^1.0.5:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
- integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+ integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
dependencies:
- request-promise-core "1.1.3"
+ request-promise-core "1.1.4"
stealthy-require "^1.1.1"
tough-cookie "^2.3.3"
-request@2.x, "request@>= 2.52.0", request@^2.61.0, request@^2.81.0, request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0:
+request@2.x, "request@>= 2.52.0", request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8594,7 +9524,7 @@ request@2.x, "request@>= 2.52.0", request@^2.61.0, request@^2.81.0, request@^2.8
performance-now "^2.1.0"
qs "~6.5.2"
safe-buffer "^5.1.2"
- tough-cookie "^2.4.3"
+ tough-cookie "~2.5.0"
tunnel-agent "^0.6.0"
uuid "^3.3.2"
@@ -8608,11 +9538,6 @@ require-main-filename@^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==
-require-relative@0.8.7:
- version "0.8.7"
- resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
- integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
-
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -8638,16 +9563,22 @@ resolve-from@^4.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+resolve-from@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+ integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.5.0, resolve@^1.8.1:
- version "1.15.1"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
- integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.5.0, resolve@^1.8.1:
+ version "1.19.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+ integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
dependencies:
+ is-core-module "^2.1.0"
path-parse "^1.0.6"
restore-cursor@^2.0.0:
@@ -8670,7 +9601,12 @@ retry-as-promised@^3.2.0:
dependencies:
any-promise "^1.3.0"
-reveal.js@~3.9.2:
+reusify@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+ integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+reveal.js@^3.9.2:
version "3.9.2"
resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358"
integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA==
@@ -8685,13 +9621,6 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
-right-align@^0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
- integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
- dependencies:
- align-text "^0.1.1"
-
rimraf@2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -8706,6 +9635,13 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
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"
+
rimraf@~2.4.0:
version "2.4.5"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
@@ -8721,44 +9657,15 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
-rollup-plugin-buble@^0.19.2:
- version "0.19.8"
- resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz#f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a"
- integrity sha512-8J4zPk2DQdk3rxeZvxgzhHh/rm5nJkjwgcsUYisCQg1QbT5yagW+hehYEW7ZNns/NVbDCTv4JQ7h4fC8qKGOKw==
- dependencies:
- buble "^0.19.8"
- rollup-pluginutils "^2.3.3"
-
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3:
- version "2.8.2"
- resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
- integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
- dependencies:
- estree-walker "^0.6.1"
-
-rollup-watch@^4.3.1:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz#5aa1eaeab787addf368905d102b39d6fc5ce4a8b"
- integrity sha512-6yjnIwfjpSrqA8IafyIu7fsEyeImNR4aDjA1bQ7KWeVuiA+Clfsx8+PGQkyABWIQzmauQ//tIJ5wAxLXsXs8qQ==
- dependencies:
- chokidar "^1.7.0"
- require-relative "0.8.7"
- rollup-pluginutils "^2.0.1"
-
-rollup@^0.66.2:
- version "0.66.6"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
- integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw==
- dependencies:
- "@types/estree" "0.0.39"
- "@types/node" "*"
-
run-async@^2.2.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
- integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
- dependencies:
- is-promise "^2.1.0"
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+ integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+ version "1.1.10"
+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+ integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
run-queue@^1.0.0, run-queue@^1.0.3:
version "1.0.3"
@@ -8773,22 +9680,27 @@ rw@1:
integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
rxjs@^6.4.0:
- version "6.5.4"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
- integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+ version "6.6.3"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+ integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
dependencies:
tslib "^1.9.0"
-safe-buffer@*, safe-buffer@5.2.0, 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:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
- integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@*, 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.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+safe-buffer@5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+ integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
safe-json-stringify@~1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
@@ -8801,7 +9713,7 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -8830,24 +9742,25 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
-schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.4:
- version "2.6.4"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
- integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+schema-utils@^2.5.0, 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:
- ajv "^6.10.2"
- ajv-keywords "^3.4.1"
+ "@types/json-schema" "^7.0.5"
+ ajv "^6.12.4"
+ ajv-keywords "^3.5.2"
-scope-css@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz#c35768bc900cad030a3e0d663a818c0f6a57f40e"
- integrity sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==
+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:
- escaper "^2.5.3"
- slugify "^1.3.1"
- strip-css-comments "^3.0.0"
+ "@types/json-schema" "^7.0.6"
+ ajv "^6.12.5"
+ ajv-keywords "^3.5.2"
-script-loader@^0.7.2:
+script-loader@0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7"
integrity sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==
@@ -8874,17 +9787,17 @@ select@^1.1.2:
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
+semver-compare@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+ integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, 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@4.3.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
- integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
-
-semver@^6.3.0:
+semver@^6.0.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8933,9 +9846,9 @@ sequelize-pool@^2.3.0:
integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA==
sequelize@^5.21.1:
- version "5.21.4"
- resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz#a49597dbd7862e4e1fb8ec819de04705d06d9d17"
- integrity sha512-Ap1pZpvKb0o3H1HuBygMi9LfCJnwYLkXNBoISqkMJ17X6MbXuOB0Pz+XazawodU1uaMl9osCSrP+Uklkc6pgQg==
+ version "5.22.3"
+ resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.22.3.tgz#7e7a92ddd355d883c9eb11cdb106d874d0d2636f"
+ integrity sha512-+nxf4TzdrB+PRmoWhR05TP9ukLAurK7qtKcIFv5Vhxm5Z9v+d2PcTT6Ea3YAoIQVkZ47QlT9XWAIUevMT/3l8Q==
dependencies:
bluebird "^3.5.0"
cls-bluebird "^2.1.0"
@@ -8953,15 +9866,19 @@ sequelize@^5.21.1:
validator "^10.11.0"
wkx "^0.4.8"
-serialize-javascript@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
- integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+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"
-series-stream@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/series-stream/-/series-stream-1.0.1.tgz#311a09c5c1d5a091440832e1a480a47400f1005d"
- integrity sha1-MRoJxcHVoJFECDLhpICkdADxAF0=
+serialize-javascript@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+ integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+ dependencies:
+ randombytes "^2.1.0"
serve-static@1.14.1:
version "1.14.1"
@@ -9023,10 +9940,12 @@ shimmer@^1.1.0:
resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-shortid@2.2.8:
- version "2.2.8"
- resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131"
- integrity sha1-AzsRfWoul1gE9vCWnb59PQs1UTE=
+shortid@2.2.16:
+ version "2.2.16"
+ resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
+ integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
+ dependencies:
+ nanoid "^2.1.0"
sigmund@^1.0.1:
version "1.0.1"
@@ -9034,9 +9953,9 @@ sigmund@^1.0.1:
integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
- integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+ 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"
@@ -9050,6 +9969,11 @@ slash@^1.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+slash@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+ integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
slice-ansi@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -9059,10 +9983,10 @@ slice-ansi@^2.1.0:
astral-regex "^1.0.0"
is-fullwidth-code-point "^2.0.0"
-slugify@^1.3.1:
- version "1.3.6"
- resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz#ba5fd6159b570fe4811d02ea9b1f4906677638c3"
- integrity sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ==
+sliced@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
+ integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=
snapdragon-node@^2.0.1:
version "2.1.1"
@@ -9094,58 +10018,84 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0"
use "^3.1.0"
-snapsvg@0.4.x:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.4.0.tgz#e0767014167825957de7e125c29b0fa89796ea03"
- integrity sha1-4HZwFBZ4JZV95+ElwpsPqJeW6gM=
+snapsvg@0.5.x:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3"
+ integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M=
dependencies:
- eve "~0.4.2"
+ eve "~0.5.1"
socket.io-adapter@~1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-socket.io-client@2.1.1, socket.io-client@~2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
- integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
+socket.io-client@2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
+ integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
dependencies:
backo2 "1.0.2"
base64-arraybuffer "0.1.5"
component-bind "1.0.0"
component-emitter "1.2.1"
- debug "~3.1.0"
- engine.io-client "~3.2.0"
+ debug "~4.1.0"
+ engine.io-client "~3.4.0"
has-binary2 "~1.0.2"
has-cors "1.1.0"
indexof "0.0.1"
object-component "0.0.3"
parseqs "0.0.5"
parseuri "0.0.5"
- socket.io-parser "~3.2.0"
+ socket.io-parser "~3.3.0"
to-array "0.1.4"
-socket.io-parser@~3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
- integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+socket.io-client@^2.1.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff"
+ integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ==
dependencies:
- component-emitter "1.2.1"
+ backo2 "1.0.2"
+ component-bind "1.0.0"
+ component-emitter "~1.3.0"
+ debug "~3.1.0"
+ engine.io-client "~3.4.0"
+ has-binary2 "~1.0.2"
+ indexof "0.0.1"
+ parseqs "0.0.6"
+ parseuri "0.0.6"
+ socket.io-parser "~3.3.0"
+ to-array "0.1.4"
+
+socket.io-parser@~3.3.0:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199"
+ integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==
+ dependencies:
+ component-emitter "~1.3.0"
debug "~3.1.0"
isarray "2.0.1"
-socket.io@~2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
- integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
+socket.io-parser@~3.4.0:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+ integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
dependencies:
- debug "~3.1.0"
- engine.io "~3.2.0"
+ component-emitter "1.2.1"
+ debug "~4.1.0"
+ isarray "2.0.1"
+
+socket.io@^2.1.1:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
+ integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+ dependencies:
+ debug "~4.1.0"
+ engine.io "~3.4.0"
has-binary2 "~1.0.2"
socket.io-adapter "~1.1.0"
- socket.io-client "2.1.1"
- socket.io-parser "~3.2.0"
+ socket.io-client "2.3.0"
+ socket.io-parser "~3.4.0"
sort-keys@^1.0.0:
version "1.1.2"
@@ -9178,9 +10128,9 @@ source-map-support@^0.4.12, source-map-support@^0.4.15:
source-map "^0.5.6"
source-map-support@~0.5.12:
- version "0.5.16"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
- integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+ 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"
@@ -9190,7 +10140,7 @@ source-map-url@^0.4.0:
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.6, source-map@^0.5.7:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -9200,36 +10150,36 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-sourcemap-codec@^1.4.4:
- version "1.4.8"
- resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
- integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+source-map@^0.7.3:
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+ integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
spdx-correct@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
- integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+ 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.2.0"
- resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
- integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+ 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.0"
- resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
- integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+ 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.5"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
- integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+ integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
spin.js@^2.3.2:
version "2.3.2"
@@ -9243,12 +10193,12 @@ split-string@^3.0.1, split-string@^3.0.2:
dependencies:
extend-shallow "^3.0.0"
-split@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
- integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
+split2@^3.1.1:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+ integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
dependencies:
- through "2"
+ readable-stream "^3.0.0"
sprintf-js@^1.1.2:
version "1.1.2"
@@ -9261,18 +10211,17 @@ sprintf-js@~1.0.2:
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
sqlite3@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz#539a42e476640796578e22d589b3283c28055242"
- integrity sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.2.0.tgz#49026d665e9fc4f922e56fb9711ba5b4c85c4901"
+ integrity sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==
dependencies:
nan "^2.12.1"
node-pre-gyp "^0.11.0"
- request "^2.87.0"
-sqlstring@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40"
- integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=
+sqlstring@^2.3.2:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz#cdae7169389a1375b18e885f2e60b3e460809514"
+ integrity sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==
sshpk@^1.7.0:
version "1.16.1"
@@ -9296,6 +10245,13 @@ ssri@^6.0.1:
dependencies:
figgy-pudding "^3.5.1"
+ssri@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
+ integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==
+ 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"
@@ -9306,6 +10262,11 @@ stack-trace@0.0.x:
resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+state-toggle@^1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+ integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
+
static-extend@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -9345,16 +10306,6 @@ stream-each@^1.1.0:
end-of-stream "^1.1.0"
stream-shift "^1.0.0"
-stream-from-to@^1.4.2:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/stream-from-to/-/stream-from-to-1.4.3.tgz#b270473ebc514e73615727c5d2f76b229941df94"
- integrity sha1-snBHPrxRTnNhVyfF0vdrIplB35Q=
- dependencies:
- async "^1.5.2"
- concat-stream "^1.4.7"
- mkdirp "^0.5.0"
- series-stream "^1.0.1"
-
stream-http@^2.7.2:
version "2.8.3"
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
@@ -9376,7 +10327,7 @@ strict-uri-encode@^1.0.0:
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-string-loader@^0.0.1:
+string-loader@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/string-loader/-/string-loader-0.0.1.tgz#496f3cccc990213e0dd5411499f9ac6a6a6f2ff8"
integrity sha1-SW88zMmQIT4N1UEUmfmsampvL/g=
@@ -9412,21 +10363,30 @@ string-width@^3.0.0, string-width@^3.1.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
-string.prototype.trimleft@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
- integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+string-width@^4.0.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+ integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
dependencies:
- define-properties "^1.1.3"
- function-bind "^1.1.1"
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.0"
-string.prototype.trimright@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
- integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+string.prototype.trimend@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
+ integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
dependencies:
define-properties "^1.1.3"
- function-bind "^1.1.1"
+ es-abstract "^1.18.0-next.1"
+
+string.prototype.trimstart@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
+ integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.18.0-next.1"
string@^3.3.3:
version "3.3.3"
@@ -9452,6 +10412,15 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
+stringify-entities@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903"
+ integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==
+ dependencies:
+ character-entities-html4 "^1.0.0"
+ character-entities-legacy "^1.0.0"
+ xtend "^4.0.0"
+
strip-ansi@^3.0.0, strip-ansi@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -9473,6 +10442,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
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-ansi@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
@@ -9483,31 +10459,11 @@ strip-bom@^3.0.0:
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-strip-css-comments@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89"
- integrity sha1-elYl7/iisibPiUehElTaluE9rok=
- dependencies:
- is-regexp "^1.0.0"
-
-strip-eof@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
- integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-style-loader@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200"
- integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==
- dependencies:
- loader-utils "^1.2.3"
- schema-utils "^2.6.4"
-
stylehacks@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -9517,6 +10473,11 @@ stylehacks@^4.0.0:
postcss "^7.0.0"
postcss-selector-parser "^3.0.0"
+stylis@^3.5.2:
+ version "3.5.4"
+ resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
+ integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
+
superagent@1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/superagent/-/superagent-1.8.3.tgz#2b7d70fcc870eda4f2a61e619dd54009b86547c3"
@@ -9541,13 +10502,6 @@ supports-color@5.4.0:
dependencies:
has-flag "^3.0.0"
-supports-color@6.1.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@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -9560,6 +10514,20 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"
+supports-color@^6.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.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"
+
svgo@^1.0.0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -9599,20 +10567,18 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-tar-stream@^1.5.0:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
- integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+tar-stream@^2.1.4:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
+ integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
dependencies:
- bl "^1.0.0"
- buffer-alloc "^1.2.0"
- end-of-stream "^1.0.0"
+ bl "^4.0.3"
+ end-of-stream "^1.4.1"
fs-constants "^1.0.0"
- readable-stream "^2.3.0"
- to-buffer "^1.1.1"
- xtend "^4.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.1.1"
-tar@^4, tar@^4.4.2:
+tar@^4:
version "4.4.13"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -9625,6 +10591,18 @@ tar@^4, tar@^4.4.2:
safe-buffer "^5.1.2"
yallist "^3.0.3"
+tar@^6.0.2:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
+ integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
+ dependencies:
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ minipass "^3.0.0"
+ minizlib "^2.1.1"
+ mkdirp "^1.0.3"
+ yallist "^4.0.0"
+
tedious@^6.6.0:
version "6.7.0"
resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca"
@@ -9643,24 +10621,24 @@ tedious@^6.6.0:
sprintf-js "^1.1.2"
terser-webpack-plugin@^1.4.3:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
- integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+ 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 "^2.1.2"
+ serialize-javascript "^4.0.0"
source-map "^0.6.1"
terser "^4.1.2"
webpack-sources "^1.4.0"
worker-farm "^1.7.0"
-terser@^4.0.0, terser@^4.1.2, terser@^4.3.9:
- version "4.6.3"
- resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
- integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
+terser@^4.0.0, terser@^4.1.2, terser@^4.6.3:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
@@ -9676,11 +10654,6 @@ text-table@^0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-throttleit@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
- integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
-
through2@^0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -9697,22 +10670,15 @@ through2@^2.0.0:
readable-stream "~2.3.6"
xtend "~4.0.1"
-through2@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
- integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
- dependencies:
- readable-stream "2 || 3"
-
-through@2, through@^2.3.6:
+through@^2.3.6:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
timers-browserify@^2.0.4:
- version "2.0.11"
- resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
- integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+ 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"
@@ -9741,13 +10707,6 @@ tmp@^0.0.33:
dependencies:
os-tmpdir "~1.0.2"
-tmp@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
- integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
- dependencies:
- rimraf "^2.6.3"
-
to-array@0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -9758,11 +10717,6 @@ to-arraybuffer@^1.0.0:
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-to-buffer@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
- integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
-
to-fast-properties@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -9783,6 +10737,13 @@ to-regex-range@^2.1.0:
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"
@@ -9793,6 +10754,14 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"
+to-vfile@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz#5f7a3f65813c2c4e34ee1f7643a5646344627699"
+ integrity sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw==
+ dependencies:
+ is-buffer "^2.0.0"
+ vfile "^4.0.0"
+
toidentifier@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -9808,13 +10777,13 @@ toposort-class@^1.0.1:
resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
-tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.4.0:
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
- integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
dependencies:
- psl "^1.1.24"
- punycode "^1.4.1"
+ psl "^1.1.28"
+ punycode "^2.1.1"
tr46@^1.0.1:
version "1.0.1"
@@ -9828,11 +10797,26 @@ trim-right@^1.0.1:
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+trim-trailing-lines@^1.0.0:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
+ integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
+
+trim@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+ integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+
triple-beam@^1.2.0, triple-beam@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
+trough@^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==
+
try-catch@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz#a35d354187c422f291a0bcfd9eb77e3a4f90c1e5"
@@ -9843,10 +10827,20 @@ try-to-catch@^1.0.2:
resolved "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz#770162dd13b9a0e55da04db5b7f888956072038a"
integrity sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA==
-tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2, tslib@^1.9.3:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
- integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+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"
+
+tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+ integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tty-browserify@0.0.0:
version "0.0.0"
@@ -9884,11 +10878,6 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
-type-fest@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
- integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
type-is@~1.6.17, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -9903,9 +10892,9 @@ type@^1.0.1:
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
type@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
- integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+ integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
typedarray@^0.0.6:
version "0.0.6"
@@ -9917,28 +10906,15 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-uglify-js@^2.8.15:
- version "2.8.29"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
- integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
- dependencies:
- source-map "~0.5.1"
- yargs "~3.10.0"
- optionalDependencies:
- uglify-to-browserify "~1.0.0"
+uglify-js@^3.1.4:
+ version "3.11.6"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz#144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c"
+ integrity sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==
-uglify-js@^3.1.4, uglify-js@^3.5.1:
- version "3.7.7"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz#21e52c7dccda80a53bf7cde69628a7e511aec9c9"
- integrity sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==
- dependencies:
- commander "~2.20.3"
- source-map "~0.6.1"
-
-uglify-to-browserify@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
- integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+uglify-js@^3.5.1:
+ version "3.12.2"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz#c7ae89da0ed1bb58999c7fce07190b347fdbdaba"
+ integrity sha512-rWYleAvfJPjduYCt+ELvzybNah/zIkRteGXIBO8X0lteRZPGladF61hFi8tU7qKTsF7u6DUQCtT9k00VlFOgkg==
uid-safe@~2.1.5:
version "2.1.5"
@@ -9952,56 +10928,99 @@ uid2@0.0.x:
resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I=
-ultron@~1.1.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
- integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
umzug@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e"
- integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184"
+ integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==
dependencies:
- babel-runtime "^6.23.0"
- bluebird "^3.5.3"
+ bluebird "^3.7.2"
-underscore@1.8.x, underscore@~1.8.3:
- version "1.8.3"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
- integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
-
-"underscore@>= 1.3.1", underscore@^1.7.0:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"
- integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==
+underscore@1.11.x, "underscore@>= 1.3.1", underscore@^1.7.0:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e"
+ integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw==
underscore@~1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
-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==
+underscore@~1.8.3:
+ version "1.8.3"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+ integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
-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==
+unherit@^1.0.4:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+ integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ inherits "^2.0.0"
+ xtend "^4.0.0"
-unicode-match-property-value-ecmascript@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
- integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unified-args@^8.0.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz#a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5"
+ integrity sha512-t1HPS1cQPsVvt/6EtyWIbQGurza5684WGRigNghZRvzIdHm3LPgMdXPyGx0npORKzdiy5+urkF0rF5SXM8lBuQ==
+ dependencies:
+ camelcase "^5.0.0"
+ chalk "^3.0.0"
+ chokidar "^3.0.0"
+ fault "^1.0.2"
+ json5 "^2.0.0"
+ minimist "^1.2.0"
+ text-table "^0.2.0"
+ unified-engine "^8.0.0"
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
- integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+unified-engine@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.0.0.tgz#e3996ff6eaecc6ca3408af92b70e25691192d17d"
+ integrity sha512-vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA==
+ dependencies:
+ concat-stream "^2.0.0"
+ debug "^4.0.0"
+ fault "^1.0.0"
+ figures "^3.0.0"
+ glob "^7.0.3"
+ ignore "^5.0.0"
+ is-buffer "^2.0.0"
+ is-empty "^1.0.0"
+ is-plain-obj "^2.0.0"
+ js-yaml "^3.6.1"
+ load-plugin "^3.0.0"
+ parse-json "^5.0.0"
+ to-vfile "^6.0.0"
+ trough "^1.0.0"
+ unist-util-inspect "^5.0.0"
+ vfile-reporter "^6.0.0"
+ vfile-statistics "^1.1.0"
+
+unified-lint-rule@^1.0.0:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz#b4ab801ff93c251faa917a8d1c10241af030de84"
+ integrity sha512-YPK15YBFwnsVorDFG/u0cVVQN5G2a3V8zv5/N6KN3TCG+ajKtaALcy7u14DCSrJI+gZeyYquFL9cioJXOGXSvg==
+ dependencies:
+ wrapped "^1.0.1"
+
+unified-message-control@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz#7018855daea9af96082cbea35970d48c9c4dbbf2"
+ integrity sha512-K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg==
+ dependencies:
+ unist-util-visit "^2.0.0"
+ vfile-location "^3.0.0"
+
+unified@^9.0.0:
+ version "9.2.0"
+ resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
+ integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
+ 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"
@@ -10037,6 +11056,59 @@ unique-slug@^2.0.0:
dependencies:
imurmurhash "^0.1.4"
+unist-util-generated@^1.1.0:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
+ integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
+
+unist-util-inspect@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz#168c8770a99902318ca268f8c391e294bcf44540"
+ integrity sha512-fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw==
+ dependencies:
+ is-empty "^1.0.0"
+
+unist-util-is@^4.0.0:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d"
+ integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==
+
+unist-util-position@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
+ integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
+
+unist-util-remove-position@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
+ integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==
+ dependencies:
+ unist-util-visit "^2.0.0"
+
+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"
+
+unist-util-visit-parents@^3.0.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
+ integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==
+ dependencies:
+ "@types/unist" "^2.0.0"
+ unist-util-is "^4.0.0"
+
+unist-util-visit@^2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
+ integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
+ dependencies:
+ "@types/unist" "^2.0.0"
+ unist-util-is "^4.0.0"
+ unist-util-visit-parents "^3.0.0"
+
universalify@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10071,9 +11143,9 @@ upper-case@^1.1.1:
integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
uri-js@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
- integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+ integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
dependencies:
punycode "^2.1.0"
@@ -10082,7 +11154,7 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-url-loader@^2.3.0:
+url-loader@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"
integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==
@@ -10118,13 +11190,13 @@ user-home@^1.1.1:
integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
utf-8-validate@^5.0.1:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.2.tgz#63cfbccd85dc1f2b66cf7a1d0eebc08ed056bfb3"
- integrity sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27"
+ integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==
dependencies:
- node-gyp-build "~3.7.0"
+ node-gyp-build "^4.2.0"
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+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=
@@ -10161,7 +11233,7 @@ util@^0.11.0:
dependencies:
inherits "2.0.3"
-utila@^0.4.0, utila@~0.4:
+utila@~0.4:
version "0.4.0"
resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
@@ -10181,10 +11253,10 @@ uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-v8-compile-cache@2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
- integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+v8-compile-cache@^2.1.1:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+ integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
v8flags@^2.1.1:
version "2.1.1"
@@ -10249,6 +11321,52 @@ verror@1.6.0:
dependencies:
extsprintf "1.2.0"
+vfile-location@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
+ integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
+
+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-reporter@^6.0.0:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz#45d4dc11df2e312196ea2ceb95e42a67fc8ce814"
+ integrity sha512-0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g==
+ dependencies:
+ repeat-string "^1.5.0"
+ string-width "^4.0.0"
+ supports-color "^6.0.0"
+ unist-util-stringify-position "^2.0.0"
+ vfile-sort "^2.1.2"
+ vfile-statistics "^1.1.0"
+
+vfile-sort@^2.1.2:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz#720fe067ce156aba0b411a01bb0dc65596aa1190"
+ integrity sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==
+
+vfile-statistics@^1.1.0:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz#b99fd15ecf0f44ba088cc973425d666cb7a9f245"
+ integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==
+
+vfile@^4.0.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
+ integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==
+ dependencies:
+ "@types/unist" "^2.0.0"
+ is-buffer "^2.0.0"
+ replace-ext "1.0.0"
+ unist-util-stringify-position "^2.0.0"
+ vfile-message "^2.0.0"
+
visibilityjs@^1.2.4:
version "1.2.8"
resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.8.tgz#4ccdcebdaef0b34fb89219ab8e10e39c3a7cbfd8"
@@ -10265,20 +11383,29 @@ vm-browserify@^1.0.1:
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
w3c-hr-time@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
- integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+ integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
dependencies:
- browser-process-hrtime "^0.1.2"
+ browser-process-hrtime "^1.0.0"
-watchpack@^1.6.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
- integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+watchpack-chokidar2@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+ integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
+ dependencies:
+ chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+ version "1.7.5"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+ integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
dependencies:
- chokidar "^2.0.2"
graceful-fs "^4.1.2"
neo-async "^2.5.0"
+ optionalDependencies:
+ chokidar "^3.4.1"
+ watchpack-chokidar2 "^2.0.1"
weak-map@^1.0.5:
version "1.0.5"
@@ -10295,39 +11422,31 @@ webidl-conversions@^4.0.2:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-webpack-cli@^3.3.10:
- version "3.3.11"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
- integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
+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.0"
- findup-sync "3.0.0"
- global-modules "2.0.0"
- import-local "2.0.0"
- interpret "1.2.0"
- loader-utils "1.2.3"
- supports-color "6.1.0"
- v8-compile-cache "2.0.3"
- yargs "13.2.4"
+ 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-log@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
- integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
- dependencies:
- ansi-colors "^3.0.0"
- uuid "^3.3.2"
-
-webpack-merge@^4.2.2:
+webpack-merge@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
dependencies:
lodash "^4.17.15"
-webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+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==
@@ -10335,33 +11454,33 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.41.2:
- version "4.41.6"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1"
- integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==
+webpack@4.44.2:
+ version "4.44.2"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+ integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
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"
+ "@webassemblyjs/ast" "1.9.0"
+ "@webassemblyjs/helper-module-context" "1.9.0"
+ "@webassemblyjs/wasm-edit" "1.9.0"
+ "@webassemblyjs/wasm-parser" "1.9.0"
+ acorn "^6.4.1"
ajv "^6.10.2"
ajv-keywords "^3.4.1"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^4.1.0"
+ enhanced-resolve "^4.3.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"
+ mkdirp "^0.5.3"
neo-async "^2.6.1"
node-libs-browser "^2.2.1"
schema-utils "^1.0.0"
tapable "^1.1.3"
terser-webpack-plugin "^1.4.3"
- watchpack "^1.6.0"
+ watchpack "^1.7.4"
webpack-sources "^1.4.1"
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
@@ -10399,7 +11518,7 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+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==
@@ -10413,33 +11532,28 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
-window-size@0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
- integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
-winston-transport@^4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66"
- integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==
+winston-transport@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59"
+ integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==
dependencies:
- readable-stream "^2.3.6"
+ readable-stream "^2.3.7"
triple-beam "^1.2.0"
winston@^3.1.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07"
- integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170"
+ integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==
dependencies:
- async "^2.6.1"
- diagnostics "^1.1.1"
- is-stream "^1.1.0"
- logform "^2.1.1"
- one-time "0.0.4"
- readable-stream "^3.1.1"
+ "@dabh/diagnostics" "^2.0.2"
+ async "^3.1.0"
+ is-stream "^2.0.0"
+ logform "^2.2.0"
+ one-time "^1.0.0"
+ readable-stream "^3.4.0"
stack-trace "0.0.x"
triple-beam "^1.3.0"
- winston-transport "^4.3.0"
+ winston-transport "^4.4.0"
wkx@^0.4.8:
version "0.4.8"
@@ -10453,15 +11567,10 @@ word-wrap@~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.2"
- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
- integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
-
-wordwrap@~0.0.2:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
- integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+wordwrap@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
worker-farm@^1.7.0:
version "1.7.0"
@@ -10479,6 +11588,14 @@ wrap-ansi@^5.1.0:
string-width "^3.0.0"
strip-ansi "^5.0.0"
+wrapped@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz#c783d9d807b273e9b01e851680a938c87c907242"
+ integrity sha1-x4PZ2Aeyc+mwHoUWgKk4yHyQckI=
+ dependencies:
+ co "3.1.0"
+ sliced "^1.0.1"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -10505,14 +11622,17 @@ ws@^6.0.0:
dependencies:
async-limiter "~1.0.0"
-ws@~3.3.1:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
- integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+ws@^7.1.2:
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
+ integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
+
+ws@~6.1.0:
+ version "6.1.4"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+ integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
dependencies:
async-limiter "~1.0.0"
- safe-buffer "~5.1.0"
- ultron "~1.1.0"
wurl@^2.5.3:
version "2.5.4"
@@ -10524,21 +11644,21 @@ x-xss-protection@1.3.0:
resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz#3e3a8dd638da80421b0e9fff11a2dbe168f6d52c"
integrity sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg==
-xml-crypto@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-1.4.0.tgz#de1cec8cd31cbd689cd90d3d6e8a27d4ae807de7"
- integrity sha512-K8FRdRxICVulK4WhiTUcJrRyAIJFPVOqxfurA3x/JlmXBTxy+SkEENF6GeRt7p/rB6WSOUS9g0gXNQw5n+407g==
+xml-crypto@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.0.0.tgz#54cd268ad9d31930afcf7092cbb664258ca9e826"
+ integrity sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==
dependencies:
xmldom "0.1.27"
xpath "0.0.27"
-xml-encryption@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz#fe50d3bbbe2ae06876d6aa95aa3bf958284e1612"
- integrity sha512-xTqcgKPN3XOswvDPXrhtyvWZ96IFcO9Azv3vS060kOpBsK5T7OxbQDxb59bPLl4b4c2IgmSZC3kJB0n5WPr2Mw==
+xml-encryption@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.1.tgz#e6d18817c4309fd07ca7793cca93c3fd06745baa"
+ integrity sha512-hn5w3l5p2+nGjlmM0CAhMChDzVGhW+M37jH35Z+GJIipXbn9PUlAIRZ6I5Wm7ynlqZjFrMAr83d/CIp9VZJMTA==
dependencies:
escape-html "^1.0.3"
- node-forge "^0.7.0"
+ node-forge "^0.10.0"
xmldom "~0.1.15"
xpath "0.0.27"
@@ -10596,9 +11716,9 @@ xmldom@0.1.x, xmldom@~0.1.15:
integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
"xmldom@>= 0.1.x":
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz#cac9465066f161e1c3302793ea4dbe59c518274f"
- integrity sha512-kXXiYvmblIgEemGeB75y97FyaZavx6SQhGppLw5TKWAD2Wd0KAly0g23eVLh17YcpxZpnFym1Qk/eaRjy1APPg==
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
+ integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
xmlhttprequest-ssl@~1.5.4:
version "1.5.5"
@@ -10621,14 +11741,14 @@ xpath@0.0.27:
integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==
xss@^1.0.3:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz#eaf11e9fc476e3ae289944a1009efddd8a124b51"
- integrity sha512-6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A==
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535"
+ integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==
dependencies:
- commander "^2.9.0"
+ commander "^2.20.3"
cssfilter "0.0.10"
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, 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==
@@ -10655,35 +11775,23 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-yargs-parser@^13.1.0, yargs-parser@^13.1.1:
- version "13.1.1"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
- integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+yallist@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+ integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^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@13.2.4:
- version "13.2.4"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
- integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
- dependencies:
- cliui "^5.0.0"
- find-up "^3.0.0"
- get-caller-file "^2.0.1"
- os-locale "^3.1.0"
- 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.0"
-
-yargs@^13.1.0:
- version "13.3.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
- integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+yargs@^13.1.0, 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"
@@ -10694,36 +11802,18 @@ yargs@^13.1.0:
string-width "^3.0.0"
which-module "^2.0.0"
y18n "^4.0.0"
- yargs-parser "^13.1.1"
-
-yargs@~3.10.0:
- version "3.10.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
- integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
- dependencies:
- camelcase "^1.0.2"
- cliui "^2.1.0"
- decamelize "^1.0.0"
- window-size "0.1.0"
-
-yauzl@2.4.1:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
- integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
- dependencies:
- fd-slicer "~1.0.1"
+ yargs-parser "^13.1.2"
yeast@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-zip-stream@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
- integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=
+zip-stream@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a"
+ integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==
dependencies:
- archiver-utils "^1.3.0"
- compress-commons "^1.2.0"
- lodash "^4.8.0"
- readable-stream "^2.0.0"
+ archiver-utils "^2.1.0"
+ compress-commons "^4.0.2"
+ readable-stream "^3.6.0"
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix
similarity index 75%
rename from third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.nix
rename to third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix
index d97950dd7a..01ca86f3b1 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/yarn.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix
@@ -10,11 +10,11 @@
};
}
{
- name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz";
+ name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz";
path = fetchurl {
- name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz";
- url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz";
- sha1 = "657fc145db20b6eb3d58d1a2055473aa72eb609d";
+ name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz";
+ sha1 = "5eb6516cf20e972a2eb4c589d6b48c3151bc801b";
};
}
{
@@ -26,19 +26,27 @@
};
}
{
- name = "_babel_code_frame___code_frame_7.8.3.tgz";
+ name = "_babel_code_frame___code_frame_7.12.11.tgz";
path = fetchurl {
- name = "_babel_code_frame___code_frame_7.8.3.tgz";
- url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz";
- sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e";
+ 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_highlight___highlight_7.8.3.tgz";
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz";
path = fetchurl {
- name = "_babel_highlight___highlight_7.8.3.tgz";
- url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz";
- sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797";
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+ sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed";
+ };
+ }
+ {
+ name = "_babel_highlight___highlight_7.10.4.tgz";
+ path = fetchurl {
+ name = "_babel_highlight___highlight_7.10.4.tgz";
+ url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz";
+ sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143";
};
}
{
@@ -49,6 +57,46 @@
sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd";
};
}
+ {
+ name = "_dabh_diagnostics___diagnostics_2.0.2.tgz";
+ path = fetchurl {
+ name = "_dabh_diagnostics___diagnostics_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz";
+ sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31";
+ };
+ }
+ {
+ name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz";
+ path = fetchurl {
+ name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz";
+ url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+ sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b";
+ };
+ }
+ {
+ name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz";
+ path = fetchurl {
+ name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+ sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3";
+ };
+ }
+ {
+ name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz";
+ path = fetchurl {
+ name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz";
+ url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+ sha1 = "011b9202a70a6366e436ca5c065844528ab04976";
+ };
+ }
+ {
+ name = "_npmcli_move_file___move_file_1.0.1.tgz";
+ path = fetchurl {
+ name = "_npmcli_move_file___move_file_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz";
+ sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464";
+ };
+ }
{
name = "_passport_next_passport_openid___passport_openid_1.0.0.tgz";
path = fetchurl {
@@ -65,6 +113,14 @@
sha1 = "4c0df069e2ec9262791b9ef1e23320c1d73bdb74";
};
}
+ {
+ name = "_types_anymatch___anymatch_1.3.1.tgz";
+ path = fetchurl {
+ name = "_types_anymatch___anymatch_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz";
+ sha1 = "336badc1beecb9dacc38bea2cf32adf627a8421a";
+ };
+ }
{
name = "_types_body_parser___body_parser_1.19.0.tgz";
path = fetchurl {
@@ -82,27 +138,19 @@
};
}
{
- name = "_types_estree___estree_0.0.39.tgz";
+ name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz";
path = fetchurl {
- name = "_types_estree___estree_0.0.39.tgz";
- url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz";
- sha1 = "e177e699ee1b8c22d23174caaa7422644389509f";
+ name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz";
+ url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz";
+ sha1 = "d9af025e925fc8b089be37423b8d1eac781be084";
};
}
{
- name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz";
+ name = "_types_express___express_4.17.9.tgz";
path = fetchurl {
- name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz";
- url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
- sha1 = "f6f41fa35d42e79dbf6610eccbb2637e6008a0cf";
- };
- }
- {
- name = "_types_express___express_4.17.2.tgz";
- path = fetchurl {
- name = "_types_express___express_4.17.2.tgz";
- url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz";
- sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c";
+ name = "_types_express___express_4.17.9.tgz";
+ url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz";
+ sha1 = "f5f2df6add703ff28428add52bdec8a1091b0a78";
};
}
{
@@ -114,67 +162,99 @@
};
}
{
- name = "_types_ldapjs___ldapjs_1.0.5.tgz";
+ name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz";
path = fetchurl {
- name = "_types_ldapjs___ldapjs_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz";
- sha1 = "2b078dff23dc068e12a8236b280d5fb4fd9db4db";
+ name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha1 = "3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50";
};
}
{
- name = "_types_mime___mime_2.0.1.tgz";
+ name = "_types_json_schema___json_schema_7.0.6.tgz";
path = fetchurl {
- name = "_types_mime___mime_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz";
- sha1 = "dc488842312a7f075149312905b5e3c0b054c79d";
+ name = "_types_json_schema___json_schema_7.0.6.tgz";
+ url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz";
+ sha1 = "f4c7ec43e81b319a9815115031709f26987891f0";
};
}
{
- name = "_types_node___node_13.7.1.tgz";
+ name = "_types_json5___json5_0.0.29.tgz";
path = fetchurl {
- name = "_types_node___node_13.7.1.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz";
- sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d";
+ name = "_types_json5___json5_0.0.29.tgz";
+ url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
+ sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
};
}
{
- name = "_types_node___node_10.17.15.tgz";
+ name = "_types_ldapjs___ldapjs_1.0.9.tgz";
path = fetchurl {
- name = "_types_node___node_10.17.15.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz";
- sha1 = "bfff4e23e9e70be6eec450419d51e18de1daf8e7";
+ name = "_types_ldapjs___ldapjs_1.0.9.tgz";
+ url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.9.tgz";
+ sha1 = "1224192d14cc5ab5218fcea72ebb04489c52cb95";
};
}
{
- name = "_types_node___node_12.12.27.tgz";
+ name = "_types_mime___mime_2.0.3.tgz";
path = fetchurl {
- name = "_types_node___node_12.12.27.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz";
- sha1 = "d7506f73160ad30fcebbcf5b8b7d2d976e649e42";
+ name = "_types_mime___mime_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz";
+ sha1 = "c893b73721db73699943bfc3653b1deb7faa4a3a";
};
}
{
- name = "_types_node___node_8.10.59.tgz";
+ name = "_types_node___node_14.14.7.tgz";
path = fetchurl {
- name = "_types_node___node_8.10.59.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz";
- sha1 = "9e34261f30183f9777017a13d185dfac6b899e04";
+ name = "_types_node___node_14.14.7.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz";
+ sha1 = "8ea1e8f8eae2430cf440564b98c6dfce1ec5945d";
};
}
{
- name = "_types_passport___passport_1.0.2.tgz";
+ name = "_types_node___node_12.19.4.tgz";
path = fetchurl {
- name = "_types_passport___passport_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz";
- sha1 = "f085033e2b301b1f97d4b57bfa73d8e934650c63";
+ name = "_types_node___node_12.19.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz";
+ sha1 = "cdfbb62e26c7435ed9aab9c941393cc3598e9b46";
};
}
{
- name = "_types_q___q_1.5.2.tgz";
+ name = "_types_node___node_14.14.14.tgz";
path = fetchurl {
- name = "_types_q___q_1.5.2.tgz";
- url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz";
- sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8";
+ name = "_types_node___node_14.14.14.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz";
+ sha1 = "f7fd5f3cc8521301119f63910f0fb965c7d761ae";
+ };
+ }
+ {
+ name = "_types_node___node_8.10.66.tgz";
+ path = fetchurl {
+ name = "_types_node___node_8.10.66.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz";
+ sha1 = "dd035d409df322acc83dff62a602f12a5783bbb3";
+ };
+ }
+ {
+ name = "_types_passport___passport_1.0.4.tgz";
+ path = fetchurl {
+ name = "_types_passport___passport_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz";
+ sha1 = "1b35c4e197560d3974fa5f71711b6e9cce0711f0";
+ };
+ }
+ {
+ 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_qs___qs_6.9.5.tgz";
+ path = fetchurl {
+ name = "_types_qs___qs_6.9.5.tgz";
+ url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz";
+ sha1 = "434711bdd49eb5ee69d90c1d67c354a9a8ecb18b";
};
}
{
@@ -186,19 +266,35 @@
};
}
{
- name = "_types_readable_stream___readable_stream_2.3.5.tgz";
+ name = "_types_readable_stream___readable_stream_2.3.9.tgz";
path = fetchurl {
- name = "_types_readable_stream___readable_stream_2.3.5.tgz";
- url = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz";
- sha1 = "99c215f9c78563ebdfeff400246a724fb36bae4a";
+ name = "_types_readable_stream___readable_stream_2.3.9.tgz";
+ url = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz";
+ sha1 = "40a8349e6ace3afd2dd1b6d8e9b02945de4566a9";
};
}
{
- name = "_types_serve_static___serve_static_1.13.3.tgz";
+ name = "_types_serve_static___serve_static_1.13.7.tgz";
path = fetchurl {
- name = "_types_serve_static___serve_static_1.13.3.tgz";
- url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz";
- sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1";
+ name = "_types_serve_static___serve_static_1.13.7.tgz";
+ url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz";
+ sha1 = "e51b51a0becda910f9fd04c718044da69d6c492e";
+ };
+ }
+ {
+ name = "_types_source_list_map___source_list_map_0.1.2.tgz";
+ path = fetchurl {
+ name = "_types_source_list_map___source_list_map_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz";
+ sha1 = "0078836063ffaf17412349bba364087e0ac02ec9";
+ };
+ }
+ {
+ name = "_types_tapable___tapable_1.0.6.tgz";
+ path = fetchurl {
+ name = "_types_tapable___tapable_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz";
+ sha1 = "a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74";
};
}
{
@@ -210,147 +306,179 @@
};
}
{
- name = "_webassemblyjs_ast___ast_1.8.5.tgz";
+ name = "_types_uglify_js___uglify_js_3.11.1.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 = "_types_uglify_js___uglify_js_3.11.1.tgz";
+ url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz";
+ sha1 = "97ff30e61a0aa6876c270b5f538737e2d6ab8ceb";
};
}
{
- name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz";
+ name = "_types_unist___unist_2.0.3.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 = "_types_unist___unist_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz";
+ sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e";
};
}
{
- name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz";
+ name = "_types_webpack_sources___webpack_sources_2.0.0.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 = "_types_webpack_sources___webpack_sources_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz";
+ sha1 = "08216ab9be2be2e1499beaebc4d469cec81e82a7";
};
}
{
- name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz";
+ name = "_types_webpack___webpack_4.41.25.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 = "_types_webpack___webpack_4.41.25.tgz";
+ url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz";
+ sha1 = "4d3b5aecc4e44117b376280fbfd2dc36697968c4";
};
}
{
- name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz";
+ name = "_webassemblyjs_ast___ast_1.9.0.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_ast___ast_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz";
+ sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964";
};
}
{
- name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz";
+ name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.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_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
+ sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4";
};
}
{
- name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz";
+ name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.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_api_error___helper_api_error_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
+ sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2";
};
}
{
- name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz";
+ name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.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_buffer___helper_buffer_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+ sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00";
};
}
{
- name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz";
+ name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.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_helper_code_frame___helper_code_frame_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
+ sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27";
};
}
{
- name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz";
+ name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.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_helper_fsm___helper_fsm_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
+ sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8";
};
}
{
- name = "_webassemblyjs_leb128___leb128_1.8.5.tgz";
+ name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.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_helper_module_context___helper_module_context_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
+ sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07";
};
}
{
- name = "_webassemblyjs_utf8___utf8_1.8.5.tgz";
+ name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.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_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
+ sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790";
};
}
{
- name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz";
+ name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.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_helper_wasm_section___helper_wasm_section_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+ sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346";
};
}
{
- name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz";
+ name = "_webassemblyjs_ieee754___ieee754_1.9.0.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_ieee754___ieee754_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
+ sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4";
};
}
{
- name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz";
+ name = "_webassemblyjs_leb128___leb128_1.9.0.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_leb128___leb128_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
+ sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95";
};
}
{
- name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz";
+ name = "_webassemblyjs_utf8___utf8_1.9.0.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_utf8___utf8_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
+ sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab";
};
}
{
- name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.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_wasm_edit___wasm_edit_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+ sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf";
};
}
{
- name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz";
+ name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.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 = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+ sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c";
+ };
+ }
+ {
+ name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz";
+ path = fetchurl {
+ name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+ sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61";
+ };
+ }
+ {
+ name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz";
+ path = fetchurl {
+ name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
+ sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e";
+ };
+ }
+ {
+ name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz";
+ path = fetchurl {
+ name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
+ sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914";
+ };
+ }
+ {
+ name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz";
+ path = fetchurl {
+ name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
+ sha1 = "4935d54c85fef637b00ce9f52377451d00d47899";
};
}
{
@@ -394,11 +522,11 @@
};
}
{
- name = "abab___abab_2.0.3.tgz";
+ name = "abab___abab_2.0.5.tgz";
path = fetchurl {
- name = "abab___abab_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
- sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
+ name = "abab___abab_2.0.5.tgz";
+ url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz";
+ sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a";
};
}
{
@@ -417,14 +545,6 @@
sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd";
};
}
- {
- name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz";
- path = fetchurl {
- name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz";
- url = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
- sha1 = "482210140582a36b83c3e342e1cfebcaa9240948";
- };
- }
{
name = "acorn_globals___acorn_globals_4.3.4.tgz";
path = fetchurl {
@@ -434,11 +554,11 @@
};
}
{
- name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
path = fetchurl {
- name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz";
- sha1 = "294adb71b57398b0680015f0a38c563ee1db5384";
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+ sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
};
}
{
@@ -450,35 +570,19 @@
};
}
{
- name = "acorn_walk___acorn_walk_7.1.1.tgz";
+ name = "acorn___acorn_5.7.4.tgz";
path = fetchurl {
- name = "acorn_walk___acorn_walk_7.1.1.tgz";
- url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz";
- sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e";
+ name = "acorn___acorn_5.7.4.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz";
+ sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e";
};
}
{
- name = "acorn___acorn_5.7.3.tgz";
+ name = "acorn___acorn_6.4.2.tgz";
path = fetchurl {
- name = "acorn___acorn_5.7.3.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz";
- sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279";
- };
- }
- {
- name = "acorn___acorn_6.4.0.tgz";
- path = fetchurl {
- name = "acorn___acorn_6.4.0.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz";
- sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784";
- };
- }
- {
- name = "acorn___acorn_7.1.0.tgz";
- path = fetchurl {
- name = "acorn___acorn_7.1.0.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz";
- sha1 = "949d36f2c292535da602283586c2477c57eb2d6c";
+ name = "acorn___acorn_6.4.2.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz";
+ sha1 = "35866fd710528e92de10cf06016498e47e39e1e6";
};
}
{
@@ -497,6 +601,14 @@
sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
};
}
+ {
+ 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 {
@@ -506,27 +618,19 @@
};
}
{
- name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
+ name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
path = fetchurl {
- name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
- sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da";
+ 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.11.0.tgz";
+ name = "ajv___ajv_6.12.6.tgz";
path = fetchurl {
- name = "ajv___ajv_6.11.0.tgz";
- url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz";
- sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9";
- };
- }
- {
- name = "align_text___align_text_0.1.4.tgz";
- path = fetchurl {
- name = "align_text___align_text_0.1.4.tgz";
- url = "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz";
- sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+ name = "ajv___ajv_6.12.6.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
+ sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4";
};
}
{
@@ -537,14 +641,6 @@
sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3";
};
}
- {
- name = "ansi_colors___ansi_colors_3.2.4.tgz";
- path = fetchurl {
- name = "ansi_colors___ansi_colors_3.2.4.tgz";
- url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz";
- sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf";
- };
- }
{
name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
path = fetchurl {
@@ -577,6 +673,14 @@
sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997";
};
}
+ {
+ name = "ansi_regex___ansi_regex_5.0.0.tgz";
+ path = fetchurl {
+ name = "ansi_regex___ansi_regex_5.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz";
+ sha1 = "388539f55179bf39339c81af30a654d69f87cb75";
+ };
+ }
{
name = "ansi_styles___ansi_styles_2.2.1.tgz";
path = fetchurl {
@@ -593,6 +697,14 @@
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 = "ansi_styles___ansi_styles_1.0.0.tgz";
path = fetchurl {
@@ -601,14 +713,6 @@
sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
};
}
- {
- name = "ansicolors___ansicolors_0.3.2.tgz";
- path = fetchurl {
- name = "ansicolors___ansicolors_0.3.2.tgz";
- url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz";
- sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
- };
- }
{
name = "any_promise___any_promise_1.3.0.tgz";
path = fetchurl {
@@ -633,6 +737,14 @@
sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb";
};
}
+ {
+ name = "anymatch___anymatch_3.1.1.tgz";
+ path = fetchurl {
+ name = "anymatch___anymatch_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz";
+ sha1 = "c55ecf02185e2469259399310c173ce31233b142";
+ };
+ }
{
name = "aproba___aproba_1.2.0.tgz";
path = fetchurl {
@@ -642,19 +754,19 @@
};
}
{
- name = "archiver_utils___archiver_utils_1.3.0.tgz";
+ name = "archiver_utils___archiver_utils_2.1.0.tgz";
path = fetchurl {
- name = "archiver_utils___archiver_utils_1.3.0.tgz";
- url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz";
- sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174";
+ name = "archiver_utils___archiver_utils_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz";
+ sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2";
};
}
{
- name = "archiver___archiver_2.1.1.tgz";
+ name = "archiver___archiver_5.1.0.tgz";
path = fetchurl {
- name = "archiver___archiver_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz";
- sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc";
+ name = "archiver___archiver_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz";
+ sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37";
};
}
{
@@ -730,19 +842,11 @@
};
}
{
- name = "array_union___array_union_1.0.2.tgz";
+ name = "array_union___array_union_2.1.0.tgz";
path = fetchurl {
- name = "array_union___array_union_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz";
- sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
- };
- }
- {
- name = "array_uniq___array_uniq_1.0.3.tgz";
- path = fetchurl {
- name = "array_uniq___array_uniq_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz";
- sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+ name = "array_union___array_union_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz";
+ sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d";
};
}
{
@@ -786,11 +890,11 @@
};
}
{
- name = "asn1.js___asn1.js_4.10.1.tgz";
+ name = "asn1.js___asn1.js_5.4.1.tgz";
path = fetchurl {
- name = "asn1.js___asn1.js_4.10.1.tgz";
- url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz";
- sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0";
+ name = "asn1.js___asn1.js_5.4.1.tgz";
+ url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz";
+ sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07";
};
}
{
@@ -866,11 +970,11 @@
};
}
{
- name = "async___async_3.1.1.tgz";
+ name = "async___async_3.2.0.tgz";
path = fetchurl {
- name = "async___async_3.1.1.tgz";
- url = "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz";
- sha1 = "dd3542db03de837979c9ebbca64ca01b06dc98df";
+ name = "async___async_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz";
+ sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720";
};
}
{
@@ -906,19 +1010,11 @@
};
}
{
- name = "autolinker___autolinker_3.12.0.tgz";
+ name = "aws_sdk___aws_sdk_2.815.0.tgz";
path = fetchurl {
- name = "autolinker___autolinker_3.12.0.tgz";
- url = "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz";
- sha1 = "1184397c85828041975a3b3135032b7b931966c6";
- };
- }
- {
- name = "aws_sdk___aws_sdk_2.619.0.tgz";
- path = fetchurl {
- name = "aws_sdk___aws_sdk_2.619.0.tgz";
- url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz";
- sha1 = "daacd97fb8d948c10278071129c12908039ab542";
+ name = "aws_sdk___aws_sdk_2.815.0.tgz";
+ url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.815.0.tgz";
+ sha1 = "515ead6d0d242f603171faf30c49142fd53a53d9";
};
}
{
@@ -930,11 +1026,11 @@
};
}
{
- name = "aws4___aws4_1.9.1.tgz";
+ name = "aws4___aws4_1.11.0.tgz";
path = fetchurl {
- name = "aws4___aws4_1.9.1.tgz";
- url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz";
- sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e";
+ name = "aws4___aws4_1.11.0.tgz";
+ url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz";
+ sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59";
};
}
{
@@ -1425,6 +1521,14 @@
sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
};
}
+ {
+ 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.0.tgz";
path = fetchurl {
@@ -1433,6 +1537,14 @@
sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
};
}
+ {
+ name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz";
+ path = fetchurl {
+ name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz";
+ url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz";
+ sha1 = "9818c79e059b1355f97e0428a017c838e90ba812";
+ };
+ }
{
name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz";
path = fetchurl {
@@ -1442,19 +1554,19 @@
};
}
{
- name = "base64_js___base64_js_1.3.1.tgz";
+ name = "base64_js___base64_js_1.5.1.tgz";
path = fetchurl {
- name = "base64_js___base64_js_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz";
- sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1";
+ name = "base64_js___base64_js_1.5.1.tgz";
+ url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz";
+ sha1 = "1b1b440160a5bf7ad40b650f095963481903930a";
};
}
{
- name = "base64id___base64id_1.0.0.tgz";
+ name = "base64id___base64id_2.0.0.tgz";
path = fetchurl {
- name = "base64id___base64id_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz";
- sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+ name = "base64id___base64id_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz";
+ sha1 = "2770ac6bc47d312af97a8bf9a634342e0cd25cb6";
};
}
{
@@ -1521,6 +1633,14 @@
sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65";
};
}
+ {
+ name = "binary_extensions___binary_extensions_2.1.0.tgz";
+ path = fetchurl {
+ name = "binary_extensions___binary_extensions_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz";
+ sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9";
+ };
+ }
{
name = "bindings___bindings_1.5.0.tgz";
path = fetchurl {
@@ -1530,27 +1650,19 @@
};
}
{
- name = "bl___bl_1.2.2.tgz";
+ name = "bl___bl_3.0.1.tgz";
path = fetchurl {
- name = "bl___bl_1.2.2.tgz";
- url = "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz";
- sha1 = "a160911717103c07410cef63ef51b397c025af9c";
+ name = "bl___bl_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz";
+ sha1 = "1cbb439299609e419b5a74d7fce2f8b37d8e5c6f";
};
}
{
- name = "bl___bl_3.0.0.tgz";
+ name = "bl___bl_4.0.3.tgz";
path = fetchurl {
- name = "bl___bl_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz";
- sha1 = "3611ec00579fd18561754360b21e9f784500ff88";
- };
- }
- {
- name = "blint___blint_1.1.0.tgz";
- path = fetchurl {
- name = "blint___blint_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz";
- sha1 = "9fcc8134296651099062f8d2ee359e83c7bff8ba";
+ name = "bl___bl_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz";
+ sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489";
};
}
{
@@ -1578,11 +1690,19 @@
};
}
{
- name = "bn.js___bn.js_4.11.8.tgz";
+ name = "bn.js___bn.js_4.11.9.tgz";
path = fetchurl {
- name = "bn.js___bn.js_4.11.8.tgz";
- url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz";
- sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+ name = "bn.js___bn.js_4.11.9.tgz";
+ url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
+ sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
+ };
+ }
+ {
+ name = "bn.js___bn.js_5.1.3.tgz";
+ path = fetchurl {
+ name = "bn.js___bn.js_5.1.3.tgz";
+ url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz";
+ sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b";
};
}
{
@@ -1649,6 +1769,14 @@
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 = "brorand___brorand_1.1.0.tgz";
path = fetchurl {
@@ -1658,11 +1786,11 @@
};
}
{
- name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+ name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
path = fetchurl {
- name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
- sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4";
+ name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+ sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626";
};
}
{
@@ -1706,19 +1834,19 @@
};
}
{
- name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+ name = "browserify_rsa___browserify_rsa_4.1.0.tgz";
path = fetchurl {
- name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
- sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+ name = "browserify_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.0.4.tgz";
+ name = "browserify_sign___browserify_sign_4.2.1.tgz";
path = fetchurl {
- name = "browserify_sign___browserify_sign_4.0.4.tgz";
- url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz";
- sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+ name = "browserify_sign___browserify_sign_4.2.1.tgz";
+ url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz";
+ sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3";
};
}
{
@@ -1738,35 +1866,11 @@
};
}
{
- name = "browserslist___browserslist_4.8.7.tgz";
+ name = "browserslist___browserslist_4.14.7.tgz";
path = fetchurl {
- name = "browserslist___browserslist_4.8.7.tgz";
- url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz";
- sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0";
- };
- }
- {
- name = "buble___buble_0.19.8.tgz";
- path = fetchurl {
- name = "buble___buble_0.19.8.tgz";
- url = "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz";
- sha1 = "d642f0081afab66dccd897d7b6360d94030b9d3d";
- };
- }
- {
- name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz";
- path = fetchurl {
- name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz";
- sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0";
- };
- }
- {
- name = "buffer_alloc___buffer_alloc_1.2.0.tgz";
- path = fetchurl {
- name = "buffer_alloc___buffer_alloc_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz";
- sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec";
+ name = "browserslist___browserslist_4.14.7.tgz";
+ url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz";
+ sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6";
};
}
{
@@ -1785,14 +1889,6 @@
sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
};
}
- {
- name = "buffer_fill___buffer_fill_1.0.0.tgz";
- path = fetchurl {
- name = "buffer_fill___buffer_fill_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz";
- sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c";
- };
- }
{
name = "buffer_from___buffer_from_1.1.1.tgz";
path = fetchurl {
@@ -1817,14 +1913,6 @@
sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
};
}
- {
- name = "buffer___buffer_4.9.1.tgz";
- path = fetchurl {
- name = "buffer___buffer_4.9.1.tgz";
- url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz";
- sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
- };
- }
{
name = "buffer___buffer_4.9.2.tgz";
path = fetchurl {
@@ -1834,19 +1922,19 @@
};
}
{
- name = "buffer___buffer_5.4.3.tgz";
+ name = "buffer___buffer_5.7.1.tgz";
path = fetchurl {
- name = "buffer___buffer_5.4.3.tgz";
- url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz";
- sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115";
+ name = "buffer___buffer_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz";
+ sha1 = "ba62e7c13133053582197160851a8f648e99eed0";
};
}
{
- name = "bufferutil___bufferutil_4.0.1.tgz";
+ name = "bufferutil___bufferutil_4.0.2.tgz";
path = fetchurl {
- name = "bufferutil___bufferutil_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.1.tgz";
- sha1 = "3a177e8e5819a1243fe16b63a199951a7ad8d4a7";
+ name = "bufferutil___bufferutil_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz";
+ sha1 = "79f68631910f6b993d870fc77dc0a2894eb96cd5";
};
}
{
@@ -1858,11 +1946,11 @@
};
}
{
- name = "bunyan___bunyan_1.8.12.tgz";
+ name = "bunyan___bunyan_1.8.14.tgz";
path = fetchurl {
- name = "bunyan___bunyan_1.8.12.tgz";
- url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz";
- sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
+ name = "bunyan___bunyan_1.8.14.tgz";
+ url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz";
+ sha1 = "3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4";
};
}
{
@@ -1882,11 +1970,19 @@
};
}
{
- name = "cacache___cacache_12.0.3.tgz";
+ name = "cacache___cacache_12.0.4.tgz";
path = fetchurl {
- name = "cacache___cacache_12.0.3.tgz";
- url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz";
- sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390";
+ name = "cacache___cacache_12.0.4.tgz";
+ url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz";
+ sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c";
+ };
+ }
+ {
+ name = "cacache___cacache_15.0.5.tgz";
+ path = fetchurl {
+ name = "cacache___cacache_15.0.5.tgz";
+ url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz";
+ sha1 = "69162833da29170d6732334643c60e005f5f17d0";
};
}
{
@@ -1897,6 +1993,14 @@
sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2";
};
}
+ {
+ name = "call_bind___call_bind_1.0.0.tgz";
+ path = fetchurl {
+ name = "call_bind___call_bind_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz";
+ sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce";
+ };
+ }
{
name = "caller_callsite___caller_callsite_2.0.0.tgz";
path = fetchurl {
@@ -1946,11 +2050,11 @@
};
}
{
- name = "camelcase___camelcase_1.2.1.tgz";
+ name = "camel_case___camel_case_4.1.1.tgz";
path = fetchurl {
- name = "camelcase___camelcase_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz";
- sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+ name = "camel_case___camel_case_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz";
+ sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547";
};
}
{
@@ -1978,19 +2082,11 @@
};
}
{
- name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz";
+ name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz";
path = fetchurl {
- name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz";
- url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
- sha1 = "283e2ef17d94889cc216a22c6f85303d78ca852d";
- };
- }
- {
- name = "cardinal___cardinal_2.1.1.tgz";
- path = fetchurl {
- name = "cardinal___cardinal_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz";
- sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505";
+ name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz";
+ url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz";
+ sha1 = "2d11aaeb239b340bc1aa730eca18a37fdb07a9ab";
};
}
{
@@ -2002,19 +2098,11 @@
};
}
{
- name = "center_align___center_align_0.1.3.tgz";
+ name = "ccount___ccount_1.1.0.tgz";
path = fetchurl {
- name = "center_align___center_align_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz";
- sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
- };
- }
- {
- 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 = "ccount___ccount_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz";
+ sha1 = "246687debb6014735131be8abab2d93898f8d043";
};
}
{
@@ -2025,6 +2113,22 @@
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
};
}
+ {
+ name = "chalk___chalk_2.4.2.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_2.4.2.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+ };
+ }
+ {
+ name = "chalk___chalk_3.0.0.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
+ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
+ };
+ }
{
name = "chalk___chalk_0.4.0.tgz";
path = fetchurl {
@@ -2034,11 +2138,43 @@
};
}
{
- name = "chance___chance_1.1.4.tgz";
+ name = "chance___chance_1.1.7.tgz";
path = fetchurl {
- name = "chance___chance_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz";
- sha1 = "d8743bf8e40bb05e024c305ca1ff441195eb23db";
+ name = "chance___chance_1.1.7.tgz";
+ url = "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz";
+ sha1 = "e99dde5ac16681af787b5ba94c8277c090d6cfe8";
+ };
+ }
+ {
+ name = "character_entities_html4___character_entities_html4_1.1.4.tgz";
+ path = fetchurl {
+ name = "character_entities_html4___character_entities_html4_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz";
+ sha1 = "0e64b0a3753ddbf1fdc044c5fd01d0199a02e125";
+ };
+ }
+ {
+ 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";
};
}
{
@@ -2073,6 +2209,14 @@
sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917";
};
}
+ {
+ name = "chokidar___chokidar_3.4.3.tgz";
+ path = fetchurl {
+ name = "chokidar___chokidar_3.4.3.tgz";
+ url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz";
+ sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b";
+ };
+ }
{
name = "chownr___chownr_1.1.4.tgz";
path = fetchurl {
@@ -2081,6 +2225,14 @@
sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b";
};
}
+ {
+ name = "chownr___chownr_2.0.0.tgz";
+ path = fetchurl {
+ name = "chownr___chownr_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz";
+ sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece";
+ };
+ }
{
name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz";
path = fetchurl {
@@ -2113,6 +2265,14 @@
sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
};
}
+ {
+ name = "clean_stack___clean_stack_2.2.0.tgz";
+ path = fetchurl {
+ name = "clean_stack___clean_stack_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz";
+ sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b";
+ };
+ }
{
name = "cli_color___cli_color_1.4.0.tgz";
path = fetchurl {
@@ -2130,27 +2290,19 @@
};
}
{
- name = "cli_width___cli_width_2.2.0.tgz";
+ name = "cli_width___cli_width_2.2.1.tgz";
path = fetchurl {
- name = "cli_width___cli_width_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz";
- sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+ name = "cli_width___cli_width_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz";
+ sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48";
};
}
{
- name = "clipboard___clipboard_2.0.4.tgz";
+ name = "clipboard___clipboard_2.0.6.tgz";
path = fetchurl {
- name = "clipboard___clipboard_2.0.4.tgz";
- url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz";
- sha1 = "836dafd66cf0fea5d71ce5d5b0bf6e958009112d";
- };
- }
- {
- name = "cliui___cliui_2.1.0.tgz";
- path = fetchurl {
- name = "cliui___cliui_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz";
- sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+ name = "clipboard___clipboard_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz";
+ sha1 = "52921296eec0fdf77ead1749421b21c968647376";
};
}
{
@@ -2177,6 +2329,14 @@
sha1 = "37ef1e080a8ffb55c2f4164f536f1919e7968aee";
};
}
+ {
+ name = "co___co_3.1.0.tgz";
+ path = fetchurl {
+ name = "co___co_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz";
+ sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
+ };
+ }
{
name = "coa___coa_2.0.2.tgz";
path = fetchurl {
@@ -2198,9 +2358,9 @@
path =
let
repo = fetchgit {
- url = "https://github.com/hackmdio/CodeMirror.git";
- rev = "2ac9b9f25707606b0c09b99decaf9d08dd434570";
- sha256 = "0aw6lixljaj0z8dbak0s60qfyk48qs747fw249qa4s9i6gb7f48v";
+ url = "https://github.com/hedgedoc/CodeMirror.git";
+ rev = "f780b569b3717cdff4c8507538cc63101bfa02e1";
+ sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz";
};
in
runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } ''
@@ -2209,6 +2369,14 @@
tar cf $out --mode u+w -C ${repo} .
'';
}
+ {
+ name = "collapse_white_space___collapse_white_space_1.0.6.tgz";
+ path = fetchurl {
+ name = "collapse_white_space___collapse_white_space_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz";
+ sha1 = "e63629c0016665792060dbbeb79c42239d2c5287";
+ };
+ }
{
name = "collection_visit___collection_visit_1.0.0.tgz";
path = fetchurl {
@@ -2225,6 +2393,14 @@
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 {
@@ -2242,11 +2418,11 @@
};
}
{
- name = "color_string___color_string_1.5.3.tgz";
+ name = "color_string___color_string_1.5.4.tgz";
path = fetchurl {
- name = "color_string___color_string_1.5.3.tgz";
- url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz";
- sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc";
+ name = "color_string___color_string_1.5.4.tgz";
+ url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz";
+ sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6";
};
}
{
@@ -2258,19 +2434,19 @@
};
}
{
- name = "color___color_3.1.2.tgz";
+ name = "color___color_3.1.3.tgz";
path = fetchurl {
- name = "color___color_3.1.2.tgz";
- url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz";
- sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10";
+ name = "color___color_3.1.3.tgz";
+ url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz";
+ sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e";
};
}
{
- name = "colornames___colornames_1.1.1.tgz";
+ name = "colorette___colorette_1.2.1.tgz";
path = fetchurl {
- name = "colornames___colornames_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz";
- sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96";
+ name = "colorette___colorette_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz";
+ sha1 = "4d0b921325c14faf92633086a536db6e89564b1b";
};
}
{
@@ -2313,14 +2489,6 @@
sha1 = "df46e867d0fc2aec66a34662b406a9ccafff5b0f";
};
}
- {
- name = "commander___commander_3.0.2.tgz";
- path = fetchurl {
- name = "commander___commander_3.0.2.tgz";
- url = "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz";
- sha1 = "6837c3fb677ad9933d1cfba42dd14d5117d6b39e";
- };
- }
{
name = "commander___commander_4.1.1.tgz";
path = fetchurl {
@@ -2370,11 +2538,11 @@
};
}
{
- name = "compress_commons___compress_commons_1.2.2.tgz";
+ name = "compress_commons___compress_commons_4.0.2.tgz";
path = fetchurl {
- name = "compress_commons___compress_commons_1.2.2.tgz";
- url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz";
- sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
+ name = "compress_commons___compress_commons_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz";
+ sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7";
};
}
{
@@ -2409,6 +2577,14 @@
sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
};
}
+ {
+ name = "concat_stream___concat_stream_2.0.0.tgz";
+ path = fetchurl {
+ name = "concat_stream___concat_stream_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz";
+ sha1 = "414cf5af790a48c60ab9be4527d56d5e41133cb1";
+ };
+ }
{
name = "config_chain___config_chain_1.1.12.tgz";
path = fetchurl {
@@ -2498,11 +2674,11 @@
};
}
{
- name = "cookie_parser___cookie_parser_1.4.3.tgz";
+ name = "cookie_parser___cookie_parser_1.4.5.tgz";
path = fetchurl {
- name = "cookie_parser___cookie_parser_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz";
- sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
+ name = "cookie_parser___cookie_parser_1.4.5.tgz";
+ url = "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz";
+ sha1 = "3e572d4b7c0c80f9c61daf604e4336831b5d1d49";
};
}
{
@@ -2529,6 +2705,14 @@
sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba";
};
}
+ {
+ name = "cookie___cookie_0.4.1.tgz";
+ path = fetchurl {
+ name = "cookie___cookie_0.4.1.tgz";
+ url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz";
+ sha1 = "afd713fe26ebd21ba95ceb61f9a8116e50a537d1";
+ };
+ }
{
name = "cookiejar___cookiejar_2.0.6.tgz";
path = fetchurl {
@@ -2537,6 +2721,14 @@
sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
};
}
+ {
+ name = "copy_anything___copy_anything_2.0.1.tgz";
+ path = fetchurl {
+ name = "copy_anything___copy_anything_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.1.tgz";
+ sha1 = "2afbce6da684bdfcbec93752fa762819cb480d9a";
+ };
+ }
{
name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
path = fetchurl {
@@ -2554,11 +2746,11 @@
};
}
{
- name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
+ name = "copy_webpack_plugin___copy_webpack_plugin_6.4.1.tgz";
path = fetchurl {
- name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
- url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";
- sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88";
+ 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";
};
}
{
@@ -2586,27 +2778,27 @@
};
}
{
- name = "crc32_stream___crc32_stream_2.0.0.tgz";
+ name = "crc_32___crc_32_1.2.0.tgz";
path = fetchurl {
- name = "crc32_stream___crc32_stream_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz";
- sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
+ name = "crc_32___crc_32_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz";
+ sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208";
};
}
{
- name = "crc___crc_3.8.0.tgz";
+ name = "crc32_stream___crc32_stream_4.0.1.tgz";
path = fetchurl {
- name = "crc___crc_3.8.0.tgz";
- url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz";
- sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6";
+ name = "crc32_stream___crc32_stream_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz";
+ sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067";
};
}
{
- name = "create_ecdh___create_ecdh_4.0.3.tgz";
+ name = "create_ecdh___create_ecdh_4.0.4.tgz";
path = fetchurl {
- name = "create_ecdh___create_ecdh_4.0.3.tgz";
- url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz";
- sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff";
+ name = "create_ecdh___create_ecdh_4.0.4.tgz";
+ url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz";
+ sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e";
};
}
{
@@ -2641,14 +2833,6 @@
sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec";
};
}
- {
- name = "crypto_random_string___crypto_random_string_3.1.0.tgz";
- path = fetchurl {
- name = "crypto_random_string___crypto_random_string_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz";
- sha1 = "0368382de82e914179ad2ca9c7a788e260184bae";
- };
- }
{
name = "css_b64_images___css_b64_images_0.2.5.tgz";
path = fetchurl {
@@ -2674,11 +2858,11 @@
};
}
{
- name = "css_loader___css_loader_3.4.2.tgz";
+ name = "css_loader___css_loader_3.6.0.tgz";
path = fetchurl {
- name = "css_loader___css_loader_3.4.2.tgz";
- url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz";
- sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202";
+ name = "css_loader___css_loader_3.6.0.tgz";
+ url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz";
+ sha1 = "2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645";
};
}
{
@@ -2714,11 +2898,11 @@
};
}
{
- name = "css_unit_converter___css_unit_converter_1.1.1.tgz";
+ name = "css_tree___css_tree_1.0.1.tgz";
path = fetchurl {
- name = "css_unit_converter___css_unit_converter_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz";
- sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996";
+ name = "css_tree___css_tree_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz";
+ sha1 = "7726678dfe2a57993a018d9dce519bf1760e3b6d";
};
}
{
@@ -2730,19 +2914,11 @@
};
}
{
- name = "css_what___css_what_3.2.1.tgz";
+ name = "css_what___css_what_3.4.2.tgz";
path = fetchurl {
- name = "css_what___css_what_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz";
- sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1";
- };
- }
- {
- name = "cssesc___cssesc_2.0.0.tgz";
- path = fetchurl {
- name = "cssesc___cssesc_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz";
- sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703";
+ name = "css_what___css_what_3.4.2.tgz";
+ url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz";
+ sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4";
};
}
{
@@ -2810,11 +2986,11 @@
};
}
{
- name = "csso___csso_4.0.2.tgz";
+ name = "csso___csso_4.1.0.tgz";
path = fetchurl {
- name = "csso___csso_4.0.2.tgz";
- url = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz";
- sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d";
+ name = "csso___csso_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz";
+ sha1 = "1d31193efa99b87aa6bad6c0cef155e543d09e8b";
};
}
{
@@ -2874,11 +3050,11 @@
};
}
{
- name = "d3_brush___d3_brush_1.1.5.tgz";
+ name = "d3_brush___d3_brush_1.1.6.tgz";
path = fetchurl {
- name = "d3_brush___d3_brush_1.1.5.tgz";
- url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz";
- sha1 = "066b8e84d17b192986030446c97c0fba7e1bacdc";
+ name = "d3_brush___d3_brush_1.1.6.tgz";
+ url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz";
+ sha1 = "b0a22c7372cabec128bdddf9bddc058592f89e9b";
};
}
{
@@ -2898,11 +3074,11 @@
};
}
{
- name = "d3_color___d3_color_1.4.0.tgz";
+ name = "d3_color___d3_color_1.4.1.tgz";
path = fetchurl {
- name = "d3_color___d3_color_1.4.0.tgz";
- url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz";
- sha1 = "89c45a995ed773b13314f06460df26d60ba0ecaf";
+ name = "d3_color___d3_color_1.4.1.tgz";
+ url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz";
+ sha1 = "c52002bf8846ada4424d55d97982fef26eb3bc8a";
};
}
{
@@ -2938,19 +3114,19 @@
};
}
{
- name = "d3_ease___d3_ease_1.0.6.tgz";
+ name = "d3_ease___d3_ease_1.0.7.tgz";
path = fetchurl {
- name = "d3_ease___d3_ease_1.0.6.tgz";
- url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz";
- sha1 = "ebdb6da22dfac0a22222f2d4da06f66c416a0ec0";
+ name = "d3_ease___d3_ease_1.0.7.tgz";
+ url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz";
+ sha1 = "9a834890ef8b8ae8c558b2fe55bd57f5993b85e2";
};
}
{
- name = "d3_fetch___d3_fetch_1.1.2.tgz";
+ name = "d3_fetch___d3_fetch_1.2.0.tgz";
path = fetchurl {
- name = "d3_fetch___d3_fetch_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz";
- sha1 = "957c8fbc6d4480599ba191b1b2518bf86b3e1be2";
+ name = "d3_fetch___d3_fetch_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz";
+ sha1 = "15ce2ecfc41b092b1db50abd2c552c2316cf7fc7";
};
}
{
@@ -2962,19 +3138,19 @@
};
}
{
- name = "d3_format___d3_format_1.4.3.tgz";
+ name = "d3_format___d3_format_1.4.5.tgz";
path = fetchurl {
- name = "d3_format___d3_format_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz";
- sha1 = "4e8eb4dff3fdcb891a8489ec6e698601c41b96f1";
+ name = "d3_format___d3_format_1.4.5.tgz";
+ url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz";
+ sha1 = "374f2ba1320e3717eb74a9356c67daee17a7edb4";
};
}
{
- name = "d3_geo___d3_geo_1.11.9.tgz";
+ name = "d3_geo___d3_geo_1.12.1.tgz";
path = fetchurl {
- name = "d3_geo___d3_geo_1.11.9.tgz";
- url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz";
- sha1 = "77eaed14ba62fc2c0aef55cd2943849c866f7ae6";
+ name = "d3_geo___d3_geo_1.12.1.tgz";
+ url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz";
+ sha1 = "7fc2ab7414b72e59fbcbd603e80d9adc029b035f";
};
}
{
@@ -3042,11 +3218,11 @@
};
}
{
- name = "d3_selection___d3_selection_1.4.1.tgz";
+ name = "d3_selection___d3_selection_1.4.2.tgz";
path = fetchurl {
- name = "d3_selection___d3_selection_1.4.1.tgz";
- url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz";
- sha1 = "98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98";
+ name = "d3_selection___d3_selection_1.4.2.tgz";
+ url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz";
+ sha1 = "dcaa49522c0dbf32d6c1858afc26b6094555bc5c";
};
}
{
@@ -3058,11 +3234,11 @@
};
}
{
- name = "d3_time_format___d3_time_format_2.2.3.tgz";
+ name = "d3_time_format___d3_time_format_2.3.0.tgz";
path = fetchurl {
- name = "d3_time_format___d3_time_format_2.2.3.tgz";
- url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz";
- sha1 = "0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb";
+ name = "d3_time_format___d3_time_format_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz";
+ sha1 = "107bdc028667788a8924ba040faf1fbccd5a7850";
};
}
{
@@ -3106,11 +3282,11 @@
};
}
{
- name = "d3___d3_5.15.0.tgz";
+ name = "d3___d3_5.16.0.tgz";
path = fetchurl {
- name = "d3___d3_5.15.0.tgz";
- url = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz";
- sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a";
+ name = "d3___d3_5.16.0.tgz";
+ url = "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz";
+ sha1 = "9c5e8d3b56403c79d4ed42fbd62f6113f199c877";
};
}
{
@@ -3169,14 +3345,6 @@
sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
};
}
- {
- name = "debug___debug_4.1.1.tgz";
- path = fetchurl {
- name = "debug___debug_4.1.1.tgz";
- url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
- sha1 = "3b72260255109c6b589cee050f1d516139664791";
- };
- }
{
name = "debug___debug_2.6.9.tgz";
path = fetchurl {
@@ -3201,6 +3369,30 @@
sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b";
};
}
+ {
+ name = "debug___debug_4.2.0.tgz";
+ path = fetchurl {
+ name = "debug___debug_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz";
+ sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1";
+ };
+ }
+ {
+ name = "debug___debug_4.3.1.tgz";
+ path = fetchurl {
+ name = "debug___debug_4.3.1.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz";
+ sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee";
+ };
+ }
+ {
+ name = "debug___debug_4.1.1.tgz";
+ path = fetchurl {
+ name = "debug___debug_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
+ sha1 = "3b72260255109c6b589cee050f1d516139664791";
+ };
+ }
{
name = "decamelize___decamelize_1.2.0.tgz";
path = fetchurl {
@@ -3377,22 +3569,14 @@
sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
};
}
- {
- name = "diagnostics___diagnostics_1.1.1.tgz";
- path = fetchurl {
- name = "diagnostics___diagnostics_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz";
- sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a";
- };
- }
{
name = "diff-match-patch.git";
path =
let
repo = fetchgit {
url = "https://github.com/hackmdio/diff-match-patch.git";
- rev = "5b73bb82454a81ecdbdb81afb4bea4c36132fbaa";
- sha256 = "0awiyanl31n7n8ipx5yri713yvk6i692gphgvcr2nm9rr57hn6i7";
+ rev = "c2f8fb9d69aa9490b764850aa86ba442c93ccf78";
+ sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7";
};
in
runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } ''
@@ -3418,19 +3602,11 @@
};
}
{
- name = "dir_glob___dir_glob_2.2.2.tgz";
+ name = "dir_glob___dir_glob_3.0.1.tgz";
path = fetchurl {
- name = "dir_glob___dir_glob_2.2.2.tgz";
- url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz";
- sha1 = "fa09f0694153c8918b18ba0deafae94769fc50c4";
- };
- }
- {
- name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz";
- path = fetchurl {
- name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz";
- url = "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz";
- sha1 = "73988161841f3dcc81f47686d539a2c702c88624";
+ name = "dir_glob___dir_glob_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz";
+ sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f";
};
}
{
@@ -3490,11 +3666,11 @@
};
}
{
- name = "domelementtype___domelementtype_2.0.1.tgz";
+ name = "domelementtype___domelementtype_2.0.2.tgz";
path = fetchurl {
- name = "domelementtype___domelementtype_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz";
- sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d";
+ name = "domelementtype___domelementtype_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz";
+ sha1 = "f3b6e549201e46f588b59463dd77187131fe6971";
};
}
{
@@ -3538,11 +3714,19 @@
};
}
{
- name = "dot_prop___dot_prop_5.2.0.tgz";
+ name = "dot_case___dot_case_3.0.3.tgz";
path = fetchurl {
- name = "dot_prop___dot_prop_5.2.0.tgz";
- url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz";
- sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb";
+ name = "dot_case___dot_case_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz";
+ sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa";
+ };
+ }
+ {
+ 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";
};
}
{
@@ -3561,14 +3745,6 @@
sha1 = "2996d5490c37e1347be263b423ed7b297fb0d97e";
};
}
- {
- name = "duplexer___duplexer_0.1.1.tgz";
- path = fetchurl {
- name = "duplexer___duplexer_0.1.1.tgz";
- url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz";
- sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
- };
- }
{
name = "duplexify___duplexify_3.7.1.tgz";
path = fetchurl {
@@ -3618,19 +3794,19 @@
};
}
{
- name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz";
+ name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz";
path = fetchurl {
- name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz";
- url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz";
- sha1 = "f0fc1e561104dbfba55cb3d45cad3626dc75d7e9";
+ name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz";
+ url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
+ sha1 = "c7ed98512c7ff36ddcbfed9e54e6355335c35257";
};
}
{
- name = "elliptic___elliptic_6.5.2.tgz";
+ name = "elliptic___elliptic_6.5.3.tgz";
path = fetchurl {
- name = "elliptic___elliptic_6.5.2.tgz";
- url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz";
- sha1 = "05c5678d7173c049d8ca433552224a495d0e3762";
+ name = "elliptic___elliptic_6.5.3.tgz";
+ url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz";
+ sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6";
};
}
{
@@ -3641,6 +3817,14 @@
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 = "emojify.js___emojify.js_1.1.0.tgz";
path = fetchurl {
@@ -3650,19 +3834,19 @@
};
}
{
- name = "emojis_list___emojis_list_2.1.0.tgz";
+ name = "emojis_list___emojis_list_3.0.0.tgz";
path = fetchurl {
- name = "emojis_list___emojis_list_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz";
- sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+ name = "emojis_list___emojis_list_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz";
+ sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78";
};
}
{
- name = "enabled___enabled_1.0.2.tgz";
+ name = "enabled___enabled_2.0.0.tgz";
path = fetchurl {
- name = "enabled___enabled_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz";
- sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93";
+ name = "enabled___enabled_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz";
+ sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2";
};
}
{
@@ -3682,43 +3866,35 @@
};
}
{
- name = "engine.io_client___engine.io_client_3.2.1.tgz";
+ name = "engine.io_client___engine.io_client_3.4.4.tgz";
path = fetchurl {
- name = "engine.io_client___engine.io_client_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz";
- sha1 = "6f54c0475de487158a1a7c77d10178708b6add36";
+ name = "engine.io_client___engine.io_client_3.4.4.tgz";
+ url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz";
+ sha1 = "77d8003f502b0782dd792b073a4d2cf7ca5ab967";
};
}
{
- name = "engine.io_parser___engine.io_parser_2.1.3.tgz";
+ name = "engine.io_parser___engine.io_parser_2.2.1.tgz";
path = fetchurl {
- name = "engine.io_parser___engine.io_parser_2.1.3.tgz";
- url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz";
- sha1 = "757ab970fbf2dfb32c7b74b033216d5739ef79a6";
+ name = "engine.io_parser___engine.io_parser_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz";
+ sha1 = "57ce5611d9370ee94f99641b589f94c97e4f5da7";
};
}
{
- name = "engine.io___engine.io_3.2.1.tgz";
+ name = "engine.io___engine.io_3.4.2.tgz";
path = fetchurl {
- name = "engine.io___engine.io_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz";
- sha1 = "b60281c35484a70ee0351ea0ebff83ec8c9522a2";
+ name = "engine.io___engine.io_3.4.2.tgz";
+ url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz";
+ sha1 = "8fc84ee00388e3e228645e0a7d3dfaeed5bd122c";
};
}
{
- name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
+ name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz";
path = fetchurl {
- name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
- sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f";
- };
- }
- {
- name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
- path = fetchurl {
- name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
- url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
- sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66";
+ name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz";
+ url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
+ sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126";
};
}
{
@@ -3730,19 +3906,27 @@
};
}
{
- name = "entities___entities_2.0.0.tgz";
+ name = "entities___entities_2.1.0.tgz";
path = fetchurl {
- name = "entities___entities_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz";
- sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4";
+ name = "entities___entities_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz";
+ sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5";
};
}
{
- name = "env_variable___env_variable_0.0.6.tgz";
+ name = "entities___entities_2.0.3.tgz";
path = fetchurl {
- name = "env_variable___env_variable_0.0.6.tgz";
- url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz";
- sha1 = "74ab20b3786c545b62b4a4813ab8cf22726c9808";
+ name = "entities___entities_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz";
+ sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f";
+ };
+ }
+ {
+ name = "entity_decode___entity_decode_2.0.2.tgz";
+ path = fetchurl {
+ name = "entity_decode___entity_decode_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz";
+ sha1 = "e4f807e52c3294246e9347d1f2b02b07fd5f92e7";
};
}
{
@@ -3762,11 +3946,19 @@
};
}
{
- name = "es_abstract___es_abstract_1.17.4.tgz";
+ name = "es_abstract___es_abstract_1.17.7.tgz";
path = fetchurl {
- name = "es_abstract___es_abstract_1.17.4.tgz";
- url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
- sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
+ name = "es_abstract___es_abstract_1.17.7.tgz";
+ url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz";
+ sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c";
+ };
+ }
+ {
+ name = "es_abstract___es_abstract_1.18.0_next.1.tgz";
+ path = fetchurl {
+ name = "es_abstract___es_abstract_1.18.0_next.1.tgz";
+ url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+ sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68";
};
}
{
@@ -3801,14 +3993,6 @@
sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
};
}
- {
- name = "es6_promise___es6_promise_4.2.8.tgz";
- path = fetchurl {
- name = "es6_promise___es6_promise_4.2.8.tgz";
- url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz";
- sha1 = "4eb21594c972bc40553d276e510539143db53e0a";
- };
- }
{
name = "es6_symbol___es6_symbol_3.1.3.tgz";
path = fetchurl {
@@ -3825,6 +4009,14 @@
sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53";
};
}
+ {
+ name = "escalade___escalade_3.1.1.tgz";
+ path = fetchurl {
+ name = "escalade___escalade_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz";
+ sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40";
+ };
+ }
{
name = "escape_html___escape_html_1.0.3.tgz";
path = fetchurl {
@@ -3842,19 +4034,11 @@
};
}
{
- name = "escaper___escaper_2.5.3.tgz";
+ name = "escodegen___escodegen_1.14.3.tgz";
path = fetchurl {
- name = "escaper___escaper_2.5.3.tgz";
- url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz";
- sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5";
- };
- }
- {
- name = "escodegen___escodegen_1.14.1.tgz";
- path = fetchurl {
- name = "escodegen___escodegen_1.14.1.tgz";
- url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz";
- sha1 = "ba01d0c8278b5e95a9a45350142026659027a457";
+ name = "escodegen___escodegen_1.14.3.tgz";
+ url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz";
+ sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503";
};
}
{
@@ -3866,19 +4050,19 @@
};
}
{
- name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
+ 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.3.tgz";
- url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz";
- sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404";
+ 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.5.2.tgz";
+ name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
path = fetchurl {
- name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz";
- sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708";
+ name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
+ sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6";
};
}
{
@@ -3890,11 +4074,11 @@
};
}
{
- name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
+ name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
path = fetchurl {
- name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz";
- sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
+ name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
+ sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702";
};
}
{
@@ -3914,11 +4098,11 @@
};
}
{
- name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
+ name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz";
path = fetchurl {
- name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz";
- sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4";
+ name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz";
+ sha1 = "0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5";
};
}
{
@@ -3938,11 +4122,11 @@
};
}
{
- name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+ name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
path = fetchurl {
- name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
- sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
+ 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";
};
}
{
@@ -3970,19 +4154,19 @@
};
}
{
- name = "esquery___esquery_1.1.0.tgz";
+ name = "esquery___esquery_1.3.1.tgz";
path = fetchurl {
- name = "esquery___esquery_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz";
- sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48";
+ name = "esquery___esquery_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz";
+ sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57";
};
}
{
- name = "esrecurse___esrecurse_4.2.1.tgz";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
path = fetchurl {
- name = "esrecurse___esrecurse_4.2.1.tgz";
- url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
- sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
+ url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
+ sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921";
};
}
{
@@ -3994,11 +4178,11 @@
};
}
{
- name = "estree_walker___estree_walker_0.6.1.tgz";
+ name = "estraverse___estraverse_5.2.0.tgz";
path = fetchurl {
- name = "estree_walker___estree_walker_0.6.1.tgz";
- url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz";
- sha1 = "53049143f40c6eb918b23671d1fe3219f3a1b362";
+ name = "estraverse___estraverse_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz";
+ sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880";
};
}
{
@@ -4026,11 +4210,11 @@
};
}
{
- name = "eve___eve_0.4.2.tgz";
+ name = "eve___eve_0.5.4.tgz";
path = fetchurl {
- name = "eve___eve_0.4.2.tgz";
- url = "https://registry.yarnpkg.com/eve/-/eve-0.4.2.tgz";
- sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
+ name = "eve___eve_0.5.4.tgz";
+ url = "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz";
+ sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
};
}
{
@@ -4050,11 +4234,11 @@
};
}
{
- name = "events___events_3.1.0.tgz";
+ name = "events___events_3.2.0.tgz";
path = fetchurl {
- name = "events___events_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz";
- sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59";
+ name = "events___events_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz";
+ sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379";
};
}
{
@@ -4066,11 +4250,11 @@
};
}
{
- name = "execa___execa_1.0.0.tgz";
+ name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz";
path = fetchurl {
- name = "execa___execa_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz";
- sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8";
+ name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
+ sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
};
}
{
@@ -4105,14 +4289,6 @@
sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
};
}
- {
- name = "expect_ct___expect_ct_0.2.0.tgz";
- path = fetchurl {
- name = "expect_ct___expect_ct_0.2.0.tgz";
- url = "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz";
- sha1 = "3a54741b6ed34cc7a93305c605f63cd268a54a62";
- };
- }
{
name = "expose_loader___expose_loader_0.7.5.tgz";
path = fetchurl {
@@ -4122,11 +4298,11 @@
};
}
{
- name = "express_session___express_session_1.17.0.tgz";
+ name = "express_session___express_session_1.17.1.tgz";
path = fetchurl {
- name = "express_session___express_session_1.17.0.tgz";
- url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz";
- sha1 = "9b50dbb5e8a03c3537368138f072736150b7f9b3";
+ name = "express_session___express_session_1.17.1.tgz";
+ url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz";
+ sha1 = "36ecbc7034566d38c8509885c044d461c11bf357";
};
}
{
@@ -4201,14 +4377,6 @@
sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543";
};
}
- {
- name = "extract_zip___extract_zip_1.6.7.tgz";
- path = fetchurl {
- name = "extract_zip___extract_zip_1.6.7.tgz";
- url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz";
- sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
- };
- }
{
name = "extsprintf___extsprintf_1.2.0.tgz";
path = fetchurl {
@@ -4234,11 +4402,19 @@
};
}
{
- name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+ name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
path = fetchurl {
- name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
- url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
- sha1 = "545145077c501491e33b15ec408c294376e94ae4";
+ 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_glob___fast_glob_3.2.4.tgz";
+ path = fetchurl {
+ name = "fast_glob___fast_glob_3.2.4.tgz";
+ url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz";
+ sha1 = "d20aefbf99579383e7f3cc66529158c9b98554d3";
};
}
{
@@ -4266,11 +4442,19 @@
};
}
{
- name = "fd_slicer___fd_slicer_1.0.1.tgz";
+ name = "fastq___fastq_1.9.0.tgz";
path = fetchurl {
- name = "fd_slicer___fd_slicer_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz";
- sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+ name = "fastq___fastq_1.9.0.tgz";
+ url = "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz";
+ sha1 = "e16a72f338eaca48e91b5c23593bcc2ef66b7947";
+ };
+ }
+ {
+ name = "fault___fault_1.0.4.tgz";
+ path = fetchurl {
+ name = "fault___fault_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz";
+ sha1 = "eafcfc0a6d214fc94601e170df29954a4f842f13";
};
}
{
@@ -4282,19 +4466,19 @@
};
}
{
- name = "fecha___fecha_2.3.3.tgz";
+ name = "fecha___fecha_4.2.0.tgz";
path = fetchurl {
- name = "fecha___fecha_2.3.3.tgz";
- url = "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz";
- sha1 = "948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd";
+ name = "fecha___fecha_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz";
+ sha1 = "3ffb6395453e3f3efff850404f0a59b6747f5f41";
};
}
{
- name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+ name = "figgy_pudding___figgy_pudding_3.5.2.tgz";
path = fetchurl {
- name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
- url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
- sha1 = "862470112901c727a0e495a80744bd5baa1d6790";
+ name = "figgy_pudding___figgy_pudding_3.5.2.tgz";
+ url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
+ sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e";
};
}
{
@@ -4305,6 +4489,14 @@
sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
};
}
+ {
+ name = "figures___figures_3.2.0.tgz";
+ path = fetchurl {
+ name = "figures___figures_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz";
+ sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af";
+ };
+ }
{
name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
path = fetchurl {
@@ -4361,6 +4553,14 @@
sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
};
}
+ {
+ name = "fill_range___fill_range_7.0.1.tgz";
+ path = fetchurl {
+ name = "fill_range___fill_range_7.0.1.tgz";
+ url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz";
+ sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40";
+ };
+ }
{
name = "finalhandler___finalhandler_1.1.2.tgz";
path = fetchurl {
@@ -4385,6 +4585,14 @@
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 {
@@ -4401,6 +4609,14 @@
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 {
@@ -4418,19 +4634,19 @@
};
}
{
- name = "flatted___flatted_2.0.1.tgz";
+ name = "flatted___flatted_2.0.2.tgz";
path = fetchurl {
- name = "flatted___flatted_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz";
- sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08";
+ name = "flatted___flatted_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz";
+ sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138";
};
}
{
- name = "flowchart.js___flowchart.js_1.13.0.tgz";
+ name = "flowchart.js___flowchart.js_1.15.0.tgz";
path = fetchurl {
- name = "flowchart.js___flowchart.js_1.13.0.tgz";
- url = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz";
- sha1 = "fd966270bd310ddefb168d6826c792c5f345372f";
+ name = "flowchart.js___flowchart.js_1.15.0.tgz";
+ url = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz";
+ sha1 = "132ba2df14af0a65e67280026ef05a1ffd16569f";
};
}
{
@@ -4441,6 +4657,14 @@
sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8";
};
}
+ {
+ name = "fn.name___fn.name_1.1.0.tgz";
+ path = fetchurl {
+ name = "fn.name___fn.name_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz";
+ sha1 = "26cad8017967aea8731bc42961d04a3d5988accc";
+ };
+ }
{
name = "follow_redirects___follow_redirects_1.5.10.tgz";
path = fetchurl {
@@ -4506,11 +4730,19 @@
};
}
{
- name = "formidable___formidable_1.2.1.tgz";
+ name = "format___format_0.2.2.tgz";
path = fetchurl {
- name = "formidable___formidable_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz";
- sha1 = "70fb7ca0290ee6ff961090415f4b3df3d2082659";
+ name = "format___format_0.2.2.tgz";
+ url = "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz";
+ sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b";
+ };
+ }
+ {
+ name = "formidable___formidable_1.2.2.tgz";
+ path = fetchurl {
+ name = "formidable___formidable_1.2.2.tgz";
+ url = "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz";
+ sha1 = "bf69aea2972982675f00865342b982986f6b8dd9";
};
}
{
@@ -4537,14 +4769,6 @@
sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
};
}
- {
- name = "frameguard___frameguard_3.1.0.tgz";
- path = fetchurl {
- name = "frameguard___frameguard_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/frameguard/-/frameguard-3.1.0.tgz";
- sha1 = "bd1442cca1d67dc346a6751559b6d04502103a22";
- };
- }
{
name = "fresh___fresh_0.5.2.tgz";
path = fetchurl {
@@ -4569,14 +4793,6 @@
sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad";
};
}
- {
- name = "fs_extra___fs_extra_1.0.0.tgz";
- path = fetchurl {
- name = "fs_extra___fs_extra_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz";
- sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
- };
- }
{
name = "fs_extra___fs_extra_7.0.1.tgz";
path = fetchurl {
@@ -4593,6 +4809,14 @@
sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7";
};
}
+ {
+ 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_readdir_recursive___fs_readdir_recursive_1.1.0.tgz";
path = fetchurl {
@@ -4618,11 +4842,19 @@
};
}
{
- name = "fsevents___fsevents_1.2.11.tgz";
+ name = "fsevents___fsevents_1.2.13.tgz";
path = fetchurl {
- name = "fsevents___fsevents_1.2.11.tgz";
- url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz";
- sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3";
+ name = "fsevents___fsevents_1.2.13.tgz";
+ url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz";
+ sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38";
+ };
+ }
+ {
+ name = "fsevents___fsevents_2.1.3.tgz";
+ path = fetchurl {
+ name = "fsevents___fsevents_2.1.3.tgz";
+ url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz";
+ sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e";
};
}
{
@@ -4674,11 +4906,11 @@
};
}
{
- name = "get_stream___get_stream_4.1.0.tgz";
+ name = "get_intrinsic___get_intrinsic_1.0.1.tgz";
path = fetchurl {
- name = "get_stream___get_stream_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz";
- sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5";
+ name = "get_intrinsic___get_intrinsic_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+ sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be";
};
}
{
@@ -4729,6 +4961,14 @@
sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
};
}
+ {
+ name = "glob_parent___glob_parent_5.1.1.tgz";
+ path = fetchurl {
+ name = "glob_parent___glob_parent_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz";
+ sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229";
+ };
+ }
{
name = "glob___glob_7.1.2.tgz";
path = fetchurl {
@@ -4753,14 +4993,6 @@
sha1 = "141f33b81a7c2492e125594307480c46679278a6";
};
}
- {
- 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_modules___global_modules_1.0.0.tgz";
path = fetchurl {
@@ -4769,6 +5001,14 @@
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 {
@@ -4802,11 +5042,11 @@
};
}
{
- name = "globby___globby_7.1.1.tgz";
+ name = "globby___globby_11.0.1.tgz";
path = fetchurl {
- name = "globby___globby_7.1.1.tgz";
- url = "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz";
- sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
+ name = "globby___globby_11.0.1.tgz";
+ url = "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz";
+ sha1 = "9a2bf107a068f3ffeabc49ad702c79ede8cfd357";
};
}
{
@@ -4818,11 +5058,11 @@
};
}
{
- name = "graceful_fs___graceful_fs_4.2.3.tgz";
+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
path = fetchurl {
- name = "graceful_fs___graceful_fs_4.2.3.tgz";
- url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
- sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
+ url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
+ sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
};
}
{
@@ -4842,11 +5082,11 @@
};
}
{
- name = "handlebars___handlebars_4.7.3.tgz";
+ name = "handlebars___handlebars_4.7.6.tgz";
path = fetchurl {
- name = "handlebars___handlebars_4.7.3.tgz";
- url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz";
- sha1 = "8ece2797826886cf8082d1726ff21d2a022550ee";
+ name = "handlebars___handlebars_4.7.6.tgz";
+ url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz";
+ sha1 = "d4c05c1baf90e9945f77aa68a7a219aa4a7df74e";
};
}
{
@@ -4858,11 +5098,11 @@
};
}
{
- name = "har_validator___har_validator_5.1.3.tgz";
+ name = "har_validator___har_validator_5.1.5.tgz";
path = fetchurl {
- name = "har_validator___har_validator_5.1.3.tgz";
- url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz";
- sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
+ name = "har_validator___har_validator_5.1.5.tgz";
+ url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz";
+ sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd";
};
}
{
@@ -4905,6 +5145,14 @@
sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
};
}
+ {
+ name = "has_flag___has_flag_4.0.0.tgz";
+ path = fetchurl {
+ name = "has_flag___has_flag_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz";
+ sha1 = "944771fd9c81c81265c4d6941860da06bb59479b";
+ };
+ }
{
name = "has_symbols___has_symbols_1.0.1.tgz";
path = fetchurl {
@@ -4962,11 +5210,11 @@
};
}
{
- name = "hash_base___hash_base_3.0.4.tgz";
+ name = "hash_base___hash_base_3.1.0.tgz";
path = fetchurl {
- name = "hash_base___hash_base_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz";
- sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+ name = "hash_base___hash_base_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz";
+ sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33";
};
}
{
@@ -4977,14 +5225,6 @@
sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42";
};
}
- {
- name = "hasha___hasha_2.2.0.tgz";
- path = fetchurl {
- name = "hasha___hasha_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz";
- sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
- };
- }
{
name = "he___he_1.1.1.tgz";
path = fetchurl {
@@ -5010,19 +5250,19 @@
};
}
{
- name = "helmet_csp___helmet_csp_2.9.4.tgz";
+ name = "helmet_csp___helmet_csp_2.10.0.tgz";
path = fetchurl {
- name = "helmet_csp___helmet_csp_2.9.4.tgz";
- url = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz";
- sha1 = "801382bac98f2f88706dc5c89d95c7e31af3a4a9";
+ name = "helmet_csp___helmet_csp_2.10.0.tgz";
+ url = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.10.0.tgz";
+ sha1 = "685dde1747bc16c5e28ad9d91e229a69f0a85e84";
};
}
{
- name = "helmet___helmet_3.21.2.tgz";
+ name = "helmet___helmet_3.23.3.tgz";
path = fetchurl {
- name = "helmet___helmet_3.21.2.tgz";
- url = "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz";
- sha1 = "7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f";
+ name = "helmet___helmet_3.23.3.tgz";
+ url = "https://registry.yarnpkg.com/helmet/-/helmet-3.23.3.tgz";
+ sha1 = "5ba30209c5f73ded4ab65746a3a11bedd4579ab7";
};
}
{
@@ -5042,19 +5282,11 @@
};
}
{
- name = "highlight.js___highlight.js_9.18.1.tgz";
+ name = "highlight.js___highlight.js_9.18.5.tgz";
path = fetchurl {
- name = "highlight.js___highlight.js_9.18.1.tgz";
- url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz";
- sha1 = "ed21aa001fe6252bb10a3d76d47573c6539fe13c";
- };
- }
- {
- name = "highlight.js___highlight.js_9.12.0.tgz";
- path = fetchurl {
- name = "highlight.js___highlight.js_9.12.0.tgz";
- url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz";
- sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+ name = "highlight.js___highlight.js_9.18.5.tgz";
+ url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz";
+ sha1 = "d18a359867f378c138d6819edfc2a8acd5f29825";
};
}
{
@@ -5082,11 +5314,11 @@
};
}
{
- name = "hosted_git_info___hosted_git_info_2.8.5.tgz";
+ name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
path = fetchurl {
- name = "hosted_git_info___hosted_git_info_2.8.5.tgz";
- url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
- sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c";
+ name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+ url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+ sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488";
};
}
{
@@ -5138,11 +5370,11 @@
};
}
{
- name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz";
+ name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz";
path = fetchurl {
- name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz";
- url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz";
- sha1 = "b33549b57be7f0357be0d0b892995aaed1ed90f8";
+ name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha1 = "922e96f1f3bb60832c2634b79884096389b1f054";
};
}
{
@@ -5154,11 +5386,11 @@
};
}
{
- name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
+ name = "html_webpack_plugin___html_webpack_plugin_4.5.0.tgz";
path = fetchurl {
- name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
- url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz";
- sha1 = "3059a69144b5aecef97708196ca32f9e68677715";
+ name = "html_webpack_plugin___html_webpack_plugin_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz";
+ sha1 = "625097650886b97ea5dae331c320e3238f6c121c";
};
}
{
@@ -5202,11 +5434,11 @@
};
}
{
- name = "i18n___i18n_0.8.5.tgz";
+ name = "i18n___i18n_0.13.2.tgz";
path = fetchurl {
- name = "i18n___i18n_0.8.5.tgz";
- url = "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz";
- sha1 = "3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec";
+ name = "i18n___i18n_0.13.2.tgz";
+ url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz";
+ sha1 = "3886678fe7cbbed45bac2ce53b8144c788a1c1b5";
};
}
{
@@ -5218,11 +5450,19 @@
};
}
{
- name = "iconv_lite___iconv_lite_0.5.1.tgz";
+ name = "iconv_lite___iconv_lite_0.5.2.tgz";
path = fetchurl {
- name = "iconv_lite___iconv_lite_0.5.1.tgz";
- url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz";
- sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64";
+ name = "iconv_lite___iconv_lite_0.5.2.tgz";
+ url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz";
+ sha1 = "af6d628dccfb463b7364d97f715e4b74b8c8c2b8";
+ };
+ }
+ {
+ name = "iconv_lite___iconv_lite_0.6.2.tgz";
+ path = fetchurl {
+ name = "iconv_lite___iconv_lite_0.6.2.tgz";
+ url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz";
+ sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01";
};
}
{
@@ -5242,11 +5482,11 @@
};
}
{
- name = "ienoopen___ienoopen_1.1.0.tgz";
+ name = "ieee754___ieee754_1.2.1.tgz";
path = fetchurl {
- name = "ienoopen___ienoopen_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz";
- sha1 = "411e5d530c982287dbdc3bb31e7a9c9e32630974";
+ name = "ieee754___ieee754_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz";
+ sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352";
};
}
{
@@ -5265,14 +5505,6 @@
sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37";
};
}
- {
- name = "ignore___ignore_3.3.10.tgz";
- path = fetchurl {
- name = "ignore___ignore_3.3.10.tgz";
- url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz";
- sha1 = "0a97fb876986e8081c631160f8f9f389157f0043";
- };
- }
{
name = "ignore___ignore_4.0.6.tgz";
path = fetchurl {
@@ -5282,11 +5514,11 @@
};
}
{
- name = "ignore___ignore_5.1.4.tgz";
+ name = "ignore___ignore_5.1.8.tgz";
path = fetchurl {
- name = "ignore___ignore_5.1.4.tgz";
- url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz";
- sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf";
+ name = "ignore___ignore_5.1.8.tgz";
+ url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz";
+ sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57";
};
}
{
@@ -5303,8 +5535,8 @@
let
repo = fetchgit {
url = "https://github.com/hackmdio/node-imgur.git";
- rev = "4fe9cfa3893505c34c49067483d85d3ad4376cd6";
- sha256 = "1bixzclrs7lzpfkcxwmzl9kz6l2bjz0jz40bikdl1zhgc2zjiiv0";
+ rev = "de0a7a1f1eb2cb6628385fedb990ad396a190573";
+ sha256 = "11m1wyh6l3ngfgc3qdxa5drlagvniz82fi7c191nb27d3s0lcfmd";
};
in
runCommandNoCC "node-imgur.git" { buildInputs = [gnutar]; } ''
@@ -5322,11 +5554,11 @@
};
}
{
- name = "import_fresh___import_fresh_3.2.1.tgz";
+ name = "import_fresh___import_fresh_3.2.2.tgz";
path = fetchurl {
- name = "import_fresh___import_fresh_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
- sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
+ name = "import_fresh___import_fresh_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz";
+ sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e";
};
}
{
@@ -5353,6 +5585,14 @@
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 {
@@ -5434,11 +5674,11 @@
};
}
{
- name = "interpret___interpret_1.2.0.tgz";
+ name = "interpret___interpret_1.4.0.tgz";
path = fetchurl {
- name = "interpret___interpret_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz";
- sha1 = "d5061a6224be58e8083985f5014d844359576296";
+ name = "interpret___interpret_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz";
+ sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e";
};
}
{
@@ -5449,14 +5689,6 @@
sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
};
}
- {
- name = "invert_kv___invert_kv_2.0.0.tgz";
- path = fetchurl {
- name = "invert_kv___invert_kv_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz";
- sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02";
- };
- }
{
name = "ionicons___ionicons_2.0.1.tgz";
path = fetchurl {
@@ -5466,11 +5698,11 @@
};
}
{
- name = "ipaddr.js___ipaddr.js_1.9.0.tgz";
+ name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
path = fetchurl {
- name = "ipaddr.js___ipaddr.js_1.9.0.tgz";
- url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
- sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65";
+ name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
+ url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+ sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3";
};
}
{
@@ -5497,6 +5729,30 @@
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_alphanumeric___is_alphanumeric_1.0.0.tgz";
+ path = fetchurl {
+ name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz";
+ sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4";
+ };
+ }
+ {
+ 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_arguments___is_arguments_1.0.4.tgz";
path = fetchurl {
@@ -5529,6 +5785,14 @@
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_bluebird___is_bluebird_1.0.2.tgz";
path = fetchurl {
@@ -5546,11 +5810,19 @@
};
}
{
- name = "is_callable___is_callable_1.1.5.tgz";
+ name = "is_buffer___is_buffer_2.0.5.tgz";
path = fetchurl {
- name = "is_callable___is_callable_1.1.5.tgz";
- url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
- sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
+ 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.2.tgz";
+ path = fetchurl {
+ name = "is_callable___is_callable_1.2.2.tgz";
+ url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz";
+ sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9";
};
}
{
@@ -5561,6 +5833,14 @@
sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
};
}
+ {
+ name = "is_core_module___is_core_module_2.2.0.tgz";
+ path = fetchurl {
+ name = "is_core_module___is_core_module_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz";
+ sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a";
+ };
+ }
{
name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
path = fetchurl {
@@ -5585,6 +5865,14 @@
sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e";
};
}
+ {
+ 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 {
@@ -5617,6 +5905,14 @@
sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
};
}
+ {
+ name = "is_empty___is_empty_1.2.0.tgz";
+ path = fetchurl {
+ name = "is_empty___is_empty_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz";
+ sha1 = "de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b";
+ };
+ }
{
name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz";
path = fetchurl {
@@ -5681,6 +5977,14 @@
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_2.0.1.tgz";
path = fetchurl {
@@ -5705,6 +6009,22 @@
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.0.tgz";
+ path = fetchurl {
+ name = "is_negative_zero___is_negative_zero_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
+ sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
+ };
+ }
{
name = "is_number___is_number_2.1.0.tgz";
path = fetchurl {
@@ -5729,6 +6049,14 @@
sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff";
};
}
+ {
+ 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 {
@@ -5745,6 +6073,14 @@
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 {
@@ -5770,11 +6106,11 @@
};
}
{
- name = "is_promise___is_promise_2.1.0.tgz";
+ name = "is_promise___is_promise_2.2.2.tgz";
path = fetchurl {
- name = "is_promise___is_promise_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
- sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+ name = "is_promise___is_promise_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz";
+ sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1";
};
}
{
@@ -5786,19 +6122,11 @@
};
}
{
- name = "is_regex___is_regex_1.0.5.tgz";
+ name = "is_regex___is_regex_1.1.1.tgz";
path = fetchurl {
- name = "is_regex___is_regex_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
- sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
- };
- }
- {
- name = "is_regexp___is_regexp_1.0.0.tgz";
- path = fetchurl {
- name = "is_regexp___is_regexp_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz";
- sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
+ name = "is_regex___is_regex_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz";
+ sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9";
};
}
{
@@ -5810,11 +6138,11 @@
};
}
{
- name = "is_stream___is_stream_1.1.0.tgz";
+ name = "is_stream___is_stream_2.0.0.tgz";
path = fetchurl {
- name = "is_stream___is_stream_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz";
- sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+ name = "is_stream___is_stream_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz";
+ sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3";
};
}
{
@@ -5849,6 +6177,22 @@
sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
};
}
+ {
+ name = "is_what___is_what_3.12.0.tgz";
+ path = fetchurl {
+ name = "is_what___is_what_3.12.0.tgz";
+ url = "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz";
+ sha1 = "f4405ce4bd6dd420d3ced51a026fb90e03705e55";
+ };
+ }
+ {
+ name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz";
+ path = fetchurl {
+ name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz";
+ sha1 = "0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7";
+ };
+ }
{
name = "is_windows___is_windows_1.0.2.tgz";
path = fetchurl {
@@ -5857,6 +6201,14 @@
sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d";
};
}
+ {
+ name = "is_word_character___is_word_character_1.0.4.tgz";
+ path = fetchurl {
+ name = "is_word_character___is_word_character_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz";
+ sha1 = "ce0e73216f98599060592f62ff31354ddbeb0230";
+ };
+ }
{
name = "is_wsl___is_wsl_1.1.0.tgz";
path = fetchurl {
@@ -5946,19 +6298,19 @@
};
}
{
- name = "jquery___jquery_3.4.1.tgz";
+ name = "jquery___jquery_3.5.1.tgz";
path = fetchurl {
- name = "jquery___jquery_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz";
- sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2";
+ name = "jquery___jquery_3.5.1.tgz";
+ url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz";
+ sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5";
};
}
{
- name = "js_beautify___js_beautify_1.10.3.tgz";
+ name = "js_beautify___js_beautify_1.13.0.tgz";
path = fetchurl {
- name = "js_beautify___js_beautify_1.10.3.tgz";
- url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz";
- sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1";
+ name = "js_beautify___js_beautify_1.13.0.tgz";
+ url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz";
+ sha1 = "a056d5d3acfd4918549aae3ab039f9f3c51eebb2";
};
}
{
@@ -5974,9 +6326,9 @@
path =
let
repo = fetchgit {
- url = "https://github.com/codimd/js-sequence-diagrams.git";
- rev = "b9afa038521e5dadf9b97624a3c7db21890be669";
- sha256 = "12v57bdld5a2550xvqh1rcinpld48awgd1s0gbny7z0b0z827ggw";
+ url = "https://github.com/hedgedoc/js-sequence-diagrams.git";
+ rev = "bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39";
+ sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw";
};
in
runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } ''
@@ -6002,19 +6354,27 @@
};
}
{
- name = "js_yaml___js_yaml_3.13.1.tgz";
+ name = "js_yaml___js_yaml_3.14.0.tgz";
path = fetchurl {
- name = "js_yaml___js_yaml_3.13.1.tgz";
- url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
- sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
+ name = "js_yaml___js_yaml_3.14.0.tgz";
+ url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz";
+ sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482";
};
}
{
- name = "jsbi___jsbi_3.1.1.tgz";
+ name = "js_yaml___js_yaml_3.14.1.tgz";
path = fetchurl {
- name = "jsbi___jsbi_3.1.1.tgz";
- url = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz";
- sha1 = "8ea18b3e08d102c6cc09acaa9a099921d775f4fa";
+ 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 = "jsbi___jsbi_3.1.4.tgz";
+ path = fetchurl {
+ name = "jsbi___jsbi_3.1.4.tgz";
+ url = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz";
+ sha1 = "9654dd02207a66a4911b4e4bb74265bc2cbc9dd0";
};
}
{
@@ -6073,6 +6433,14 @@
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 {
@@ -6130,11 +6498,11 @@
};
}
{
- name = "jsonfile___jsonfile_2.4.0.tgz";
+ name = "json5___json5_2.1.3.tgz";
path = fetchurl {
- name = "jsonfile___jsonfile_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz";
- sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
+ name = "json5___json5_2.1.3.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
+ sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
};
}
{
@@ -6185,14 +6553,6 @@
sha1 = "001099f3639468c9414000e99995fa52fb478304";
};
}
- {
- name = "kew___kew_0.7.0.tgz";
- path = fetchurl {
- name = "kew___kew_0.7.0.tgz";
- url = "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz";
- sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
- };
- }
{
name = "keymaster___keymaster_1.6.2.tgz";
path = fetchurl {
@@ -6201,6 +6561,14 @@
sha1 = "e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb";
};
}
+ {
+ name = "khroma___khroma_1.1.0.tgz";
+ path = fetchurl {
+ name = "khroma___khroma_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz";
+ sha1 = "cc17723eb719c5245ea66d23dd577d5695452db5";
+ };
+ }
{
name = "kind_of___kind_of_3.2.2.tgz";
path = fetchurl {
@@ -6234,19 +6602,11 @@
};
}
{
- name = "klaw___klaw_1.3.1.tgz";
+ name = "kuler___kuler_2.0.0.tgz";
path = fetchurl {
- name = "klaw___klaw_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz";
- sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
- };
- }
- {
- name = "kuler___kuler_1.0.1.tgz";
- path = fetchurl {
- name = "kuler___kuler_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz";
- sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6";
+ name = "kuler___kuler_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz";
+ sha1 = "e2c570a3800388fb44407e851531c1d670b061b3";
};
}
{
@@ -6257,14 +6617,6 @@
sha1 = "9742df0e10e3cf46e5c0381c2de90d3a7a2d7555";
};
}
- {
- name = "lazy_cache___lazy_cache_1.0.4.tgz";
- path = fetchurl {
- name = "lazy_cache___lazy_cache_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz";
- sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
- };
- }
{
name = "lazystream___lazystream_1.0.0.tgz";
path = fetchurl {
@@ -6273,14 +6625,6 @@
sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
};
}
- {
- name = "lcid___lcid_2.0.0.tgz";
- path = fetchurl {
- name = "lcid___lcid_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz";
- sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
- };
- }
{
name = "ldap_filter___ldap_filter_0.2.2.tgz";
path = fetchurl {
@@ -6290,11 +6634,11 @@
};
}
{
- name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz";
+ name = "ldapauth_fork___ldapauth_fork_4.3.3.tgz";
path = fetchurl {
- name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz";
- url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz";
- sha1 = "500c04f339257ac0e189af8752ec5df43982ceac";
+ name = "ldapauth_fork___ldapauth_fork_4.3.3.tgz";
+ url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.3.tgz";
+ sha1 = "d62c8f18a5035fd47a572f2ac7aa8c8227b3f4c2";
};
}
{
@@ -6322,11 +6666,11 @@
};
}
{
- name = "less___less_3.11.1.tgz";
+ name = "less___less_3.13.1.tgz";
path = fetchurl {
- name = "less___less_3.11.1.tgz";
- url = "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz";
- sha1 = "c6bf08e39e02404fe6b307a3dfffafdc55bd36e2";
+ name = "less___less_3.13.1.tgz";
+ url = "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz";
+ sha1 = "0ebc91d2a0e9c0c6735b83d496b0ab0583077909";
};
}
{
@@ -6337,6 +6681,22 @@
sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
};
}
+ {
+ name = "libnpmconfig___libnpmconfig_1.2.1.tgz";
+ path = fetchurl {
+ name = "libnpmconfig___libnpmconfig_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz";
+ sha1 = "c0c2f793a74e67d4825e5039e7a02a0044dfcbc0";
+ };
+ }
+ {
+ 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 = "linkify_it___linkify_it_2.2.0.tgz";
path = fetchurl {
@@ -6361,6 +6721,14 @@
sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
};
}
+ {
+ name = "load_plugin___load_plugin_3.0.0.tgz";
+ path = fetchurl {
+ name = "load_plugin___load_plugin_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz";
+ sha1 = "8f3ce57cf4e5111639911012487bc1c2ba3d0e6c";
+ };
+ }
{
name = "loader_runner___loader_runner_2.4.0.tgz";
path = fetchurl {
@@ -6370,11 +6738,19 @@
};
}
{
- name = "loader_utils___loader_utils_1.2.3.tgz";
+ name = "loader_utils___loader_utils_1.4.0.tgz";
path = fetchurl {
- name = "loader_utils___loader_utils_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz";
- sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7";
+ 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";
};
}
{
@@ -6393,6 +6769,14 @@
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.assignin___lodash.assignin_4.2.0.tgz";
path = fetchurl {
@@ -6417,6 +6801,14 @@
sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
};
}
+ {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ path = fetchurl {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz";
+ sha1 = "9ccb4e505d486b91651345772885a2df27fd017c";
+ };
+ }
{
name = "lodash.filter___lodash.filter_4.6.0.tgz";
path = fetchurl {
@@ -6441,6 +6833,14 @@
sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
};
}
+ {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ path = fetchurl {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+ };
+ }
{
name = "lodash.map___lodash.map_4.6.0.tgz";
path = fetchurl {
@@ -6505,6 +6905,14 @@
sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
};
}
+ {
+ name = "lodash.union___lodash.union_4.6.0.tgz";
+ path = fetchurl {
+ name = "lodash.union___lodash.union_4.6.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz";
+ sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
+ };
+ }
{
name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
path = fetchurl {
@@ -6514,19 +6922,19 @@
};
}
{
- name = "lodash___lodash_4.17.15.tgz";
+ name = "lodash___lodash_4.17.20.tgz";
path = fetchurl {
- name = "lodash___lodash_4.17.15.tgz";
- url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
- sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
+ name = "lodash___lodash_4.17.20.tgz";
+ url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
+ sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
};
}
{
- name = "logform___logform_2.1.2.tgz";
+ name = "logform___logform_2.2.0.tgz";
path = fetchurl {
- name = "logform___logform_2.1.2.tgz";
- url = "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz";
- sha1 = "957155ebeb67a13164069825ce67ddb5bb2dd360";
+ name = "logform___logform_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz";
+ sha1 = "40f036d19161fc76b68ab50fdc7fe495544492f2";
};
}
{
@@ -6538,11 +6946,11 @@
};
}
{
- name = "longest___longest_1.0.1.tgz";
+ name = "longest_streak___longest_streak_2.0.4.tgz";
path = fetchurl {
- name = "longest___longest_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz";
- sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+ name = "longest_streak___longest_streak_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz";
+ sha1 = "b8599957da5b5dab64dee3fe316fa774597d90e4";
};
}
{
@@ -6561,6 +6969,14 @@
sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
};
}
+ {
+ name = "lower_case___lower_case_2.0.1.tgz";
+ path = fetchurl {
+ name = "lower_case___lower_case_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz";
+ sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7";
+ };
+ }
{
name = "lru_cache___lru_cache_4.1.5.tgz";
path = fetchurl {
@@ -6577,6 +6993,14 @@
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 = "lru_queue___lru_queue_0.1.0.tgz";
path = fetchurl {
@@ -6586,11 +7010,11 @@
};
}
{
- name = "lutim___lutim_1.0.2.tgz";
+ name = "lutim___lutim_1.0.3.tgz";
path = fetchurl {
- name = "lutim___lutim_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/lutim/-/lutim-1.0.2.tgz";
- sha1 = "0b1e5a83c0c8d45900beb4eaf551e34f34f8a3e8";
+ name = "lutim___lutim_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/lutim/-/lutim-1.0.3.tgz";
+ sha1 = "3a29d0f2731eed7097f2d7367defeaa2ae45d820";
};
}
{
@@ -6609,14 +7033,6 @@
tar cf $out --mode u+w -C ${repo} .
'';
}
- {
- name = "magic_string___magic_string_0.25.6.tgz";
- path = fetchurl {
- name = "magic_string___magic_string_0.25.6.tgz";
- url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz";
- sha1 = "5586387d1242f919c6d223579cc938bf1420795e";
- };
- }
{
name = "make_dir___make_dir_1.3.0.tgz";
path = fetchurl {
@@ -6633,6 +7049,14 @@
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 = "make_plural___make_plural_4.3.0.tgz";
path = fetchurl {
@@ -6642,27 +7066,11 @@
};
}
{
- name = "make_plural___make_plural_6.0.1.tgz";
+ name = "make_plural___make_plural_6.2.2.tgz";
path = fetchurl {
- name = "make_plural___make_plural_6.0.1.tgz";
- url = "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz";
- sha1 = "ed3839fac3f469ebbe505751d48fe3319769edfc";
- };
- }
- {
- 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_age_cleaner___map_age_cleaner_0.1.3.tgz";
- path = fetchurl {
- name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
- sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a";
+ name = "make_plural___make_plural_6.2.2.tgz";
+ url = "https://registry.yarnpkg.com/make-plural/-/make-plural-6.2.2.tgz";
+ sha1 = "beb5fd751355e72660eeb2218bb98eec92853c6c";
};
}
{
@@ -6682,11 +7090,27 @@
};
}
{
- name = "mariadb___mariadb_2.2.0.tgz";
+ name = "mariadb___mariadb_2.5.2.tgz";
path = fetchurl {
- name = "mariadb___mariadb_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz";
- sha1 = "077e8c44ded718f2ecebef321c3703fe8d524504";
+ name = "mariadb___mariadb_2.5.2.tgz";
+ url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.2.tgz";
+ sha1 = "0046331541589a9c0405507d91d79bcc972b3f5e";
+ };
+ }
+ {
+ name = "markdown_escapes___markdown_escapes_1.0.4.tgz";
+ path = fetchurl {
+ name = "markdown_escapes___markdown_escapes_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz";
+ sha1 = "c95415ef451499d7602b91095f3c8e8975f78535";
+ };
+ }
+ {
+ name = "markdown_extensions___markdown_extensions_1.1.1.tgz";
+ path = fetchurl {
+ name = "markdown_extensions___markdown_extensions_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz";
+ sha1 = "fea03b539faeaee9b4ef02a3769b455b189f7fc3";
};
}
{
@@ -6706,11 +7130,11 @@
};
}
{
- name = "markdown_it_deflist___markdown_it_deflist_2.0.3.tgz";
+ name = "markdown_it_deflist___markdown_it_deflist_2.1.0.tgz";
path = fetchurl {
- name = "markdown_it_deflist___markdown_it_deflist_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz";
- sha1 = "5727db04184d3cb2bc6ee4a9641e3a1091d5fd6f";
+ name = "markdown_it_deflist___markdown_it_deflist_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz";
+ sha1 = "50d7a56b9544cd81252f7623bd785e28a8dcef5c";
};
}
{
@@ -6794,19 +7218,19 @@
};
}
{
- name = "markdown_pdf___markdown_pdf_10.0.0.tgz";
+ name = "markdown_table___markdown_table_2.0.0.tgz";
path = fetchurl {
- name = "markdown_pdf___markdown_pdf_10.0.0.tgz";
- url = "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz";
- sha1 = "0cf7a32740c2966aa79392a35742749d6ed2a491";
+ name = "markdown_table___markdown_table_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz";
+ sha1 = "194a90ced26d31fe753d8b9434430214c011865b";
};
}
{
- name = "marked___marked_0.8.0.tgz";
+ name = "marked___marked_1.2.7.tgz";
path = fetchurl {
- name = "marked___marked_0.8.0.tgz";
- url = "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz";
- sha1 = "ec5c0c9b93878dc52dd54be8d0e524097bd81a99";
+ name = "marked___marked_1.2.7.tgz";
+ url = "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz";
+ sha1 = "6e14b595581d2319cdcf033a24caaf41455a01fb";
};
}
{
@@ -6826,11 +7250,11 @@
};
}
{
- name = "mathjax___mathjax_2.7.7.tgz";
+ name = "mathjax___mathjax_2.7.9.tgz";
path = fetchurl {
- name = "mathjax___mathjax_2.7.7.tgz";
- url = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz";
- sha1 = "22ff89550a7b1f5f06a037d13da5ff3c33e11ec4";
+ name = "mathjax___mathjax_2.7.9.tgz";
+ url = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz";
+ sha1 = "d6b67955c173e7d719fcb2fc0288662884eb7d3d";
};
}
{
@@ -6857,6 +7281,46 @@
sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f";
};
}
+ {
+ name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz";
+ path = fetchurl {
+ name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz";
+ sha1 = "5ad2e42cfcc41b92a10c1421a98c288d7b447a6d";
+ };
+ }
+ {
+ name = "mdast_util_compact___mdast_util_compact_2.0.1.tgz";
+ path = fetchurl {
+ name = "mdast_util_compact___mdast_util_compact_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz";
+ sha1 = "cabc69a2f43103628326f35b1acf735d55c99490";
+ };
+ }
+ {
+ name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz";
+ path = fetchurl {
+ name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz";
+ sha1 = "6410418926fd5673d40f519406b35d17da10e3c5";
+ };
+ }
+ {
+ name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz";
+ path = fetchurl {
+ name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz";
+ sha1 = "27055500103f51637bd07d01da01eb1967a43527";
+ };
+ }
+ {
+ name = "mdn_data___mdn_data_2.0.12.tgz";
+ path = fetchurl {
+ name = "mdn_data___mdn_data_2.0.12.tgz";
+ url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz";
+ sha1 = "bbb658d08b38f574bbb88f7b83703defdcc46844";
+ };
+ }
{
name = "mdn_data___mdn_data_2.0.4.tgz";
path = fetchurl {
@@ -6881,14 +7345,6 @@
sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
};
}
- {
- name = "mem___mem_4.3.0.tgz";
- path = fetchurl {
- name = "mem___mem_4.3.0.tgz";
- url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz";
- sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178";
- };
- }
{
name = "memoizee___memoizee_0.4.14.tgz";
path = fetchurl {
@@ -6922,11 +7378,19 @@
};
}
{
- name = "mermaid___mermaid_8.4.7.tgz";
+ name = "merge2___merge2_1.4.1.tgz";
path = fetchurl {
- name = "mermaid___mermaid_8.4.7.tgz";
- url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz";
- sha1 = "1af8f6bece99f022a514471c42b80cabf7706501";
+ name = "merge2___merge2_1.4.1.tgz";
+ url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz";
+ sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae";
+ };
+ }
+ {
+ name = "mermaid___mermaid_8.8.4.tgz";
+ path = fetchurl {
+ name = "mermaid___mermaid_8.8.4.tgz";
+ url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.8.4.tgz";
+ sha1 = "5ea699bcfa1ef848d78b2ce8efb1e0118f30d9f7";
};
}
{
@@ -6938,11 +7402,11 @@
};
}
{
- name = "messageformat_parser___messageformat_parser_4.1.2.tgz";
+ name = "messageformat_parser___messageformat_parser_4.1.3.tgz";
path = fetchurl {
- name = "messageformat_parser___messageformat_parser_4.1.2.tgz";
- url = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz";
- sha1 = "fd34ec39912a14868a1595eaeb742485ab8ab372";
+ name = "messageformat_parser___messageformat_parser_4.1.3.tgz";
+ url = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz";
+ sha1 = "b824787f57fcda7d50769f5b63e8d4fda68f5b9e";
};
}
{
@@ -6958,9 +7422,9 @@
path =
let
repo = fetchgit {
- url = "https://github.com/codimd/meta-marked";
- rev = "a7b45a287465f79656134ff7142d1d74c8fcacfd";
- sha256 = "0cd3mxxgr3h49y6df5py8d36pyxv2j8kafxfw0npqhss9233f491";
+ url = "https://github.com/hedgedoc/meta-marked";
+ rev = "4fb5cb5a204969cc91e66eee92c0211188e69a2b";
+ sha256 = "05fi7p37zqqbrrk929pp6945prg4qb27q0rm81ginw3aqawps33c";
};
in
runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } ''
@@ -7001,6 +7465,14 @@
sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23";
};
}
+ {
+ name = "micromatch___micromatch_4.0.2.tgz";
+ path = fetchurl {
+ name = "micromatch___micromatch_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz";
+ sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259";
+ };
+ }
{
name = "miller_rabin___miller_rabin_4.0.1.tgz";
path = fetchurl {
@@ -7010,19 +7482,27 @@
};
}
{
- name = "mime_db___mime_db_1.43.0.tgz";
+ name = "mime_db___mime_db_1.44.0.tgz";
path = fetchurl {
- name = "mime_db___mime_db_1.43.0.tgz";
- url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz";
- sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58";
+ name = "mime_db___mime_db_1.44.0.tgz";
+ url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz";
+ sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92";
};
}
{
- name = "mime_types___mime_types_2.1.26.tgz";
+ name = "mime_db___mime_db_1.45.0.tgz";
path = fetchurl {
- name = "mime_types___mime_types_2.1.26.tgz";
- url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
- sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
+ name = "mime_db___mime_db_1.45.0.tgz";
+ url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz";
+ sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea";
+ };
+ }
+ {
+ name = "mime_types___mime_types_2.1.27.tgz";
+ path = fetchurl {
+ name = "mime_types___mime_types_2.1.27.tgz";
+ url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz";
+ sha1 = "47949f98e279ea53119f5722e0f34e529bec009f";
};
}
{
@@ -7042,11 +7522,11 @@
};
}
{
- name = "mime___mime_2.4.4.tgz";
+ name = "mime___mime_2.4.6.tgz";
path = fetchurl {
- name = "mime___mime_2.4.4.tgz";
- url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz";
- sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
+ name = "mime___mime_2.4.6.tgz";
+ url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz";
+ sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1";
};
}
{
@@ -7058,19 +7538,11 @@
};
}
{
- name = "mimic_fn___mimic_fn_2.1.0.tgz";
+ name = "mini_css_extract_plugin___mini_css_extract_plugin_0.12.0.tgz";
path = fetchurl {
- name = "mimic_fn___mimic_fn_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz";
- sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b";
- };
- }
- {
- name = "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_css_extract_plugin___mini_css_extract_plugin_0.12.0.tgz";
+ url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz";
+ sha1 = "ddeb74fd6304ca9f99c1db74acc7d5b507705454";
};
}
{
@@ -7114,19 +7586,11 @@
};
}
{
- name = "minimist___minimist_1.2.0.tgz";
+ name = "minimist___minimist_1.2.5.tgz";
path = fetchurl {
- name = "minimist___minimist_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
- sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
- };
- }
- {
- name = "minimist___minimist_0.0.10.tgz";
- path = fetchurl {
- name = "minimist___minimist_0.0.10.tgz";
- url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz";
- sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+ name = "minimist___minimist_1.2.5.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
};
}
{
@@ -7137,6 +7601,30 @@
sha1 = "7e514d38eaacf2264556b232f1c2c063cc6ca7ba";
};
}
+ {
+ 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_2.9.0.tgz";
path = fetchurl {
@@ -7145,6 +7633,14 @@
sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6";
};
}
+ {
+ 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_1.3.3.tgz";
path = fetchurl {
@@ -7153,6 +7649,14 @@
sha1 = "2290de96818a34c29551c8a8d301216bd65a861d";
};
}
+ {
+ 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 {
@@ -7177,6 +7681,22 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
+ {
+ 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 = "mocha___mocha_5.2.0.tgz";
path = fetchurl {
@@ -7202,27 +7722,27 @@
};
}
{
- name = "moment_timezone___moment_timezone_0.5.27.tgz";
+ name = "moment_timezone___moment_timezone_0.5.32.tgz";
path = fetchurl {
- name = "moment_timezone___moment_timezone_0.5.27.tgz";
- url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz";
- sha1 = "73adec8139b6fe30452e78f210f27b1f346b8877";
+ name = "moment_timezone___moment_timezone_0.5.32.tgz";
+ url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz";
+ sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2";
};
}
{
- name = "moment___moment_2.24.0.tgz";
+ name = "moment___moment_2.29.1.tgz";
path = fetchurl {
- name = "moment___moment_2.24.0.tgz";
- url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
- sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
+ name = "moment___moment_2.29.1.tgz";
+ url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz";
+ sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3";
};
}
{
- name = "morgan___morgan_1.9.1.tgz";
+ name = "morgan___morgan_1.10.0.tgz";
path = fetchurl {
- name = "morgan___morgan_1.9.1.tgz";
- url = "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz";
- sha1 = "0a8d16734a1d9afbc824b99df87e738e58e2da59";
+ name = "morgan___morgan_1.10.0.tgz";
+ url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz";
+ sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7";
};
}
{
@@ -7258,11 +7778,11 @@
};
}
{
- name = "mustache___mustache_4.0.0.tgz";
+ name = "mustache___mustache_4.0.1.tgz";
path = fetchurl {
- name = "mustache___mustache_4.0.0.tgz";
- url = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz";
- sha1 = "7f02465dbb5b435859d154831c032acdfbbefb31";
+ name = "mustache___mustache_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz";
+ sha1 = "d99beb031701ad433338e7ea65e0489416c854a2";
};
}
{
@@ -7282,11 +7802,11 @@
};
}
{
- name = "mysql2___mysql2_2.1.0.tgz";
+ name = "mysql2___mysql2_2.2.5.tgz";
path = fetchurl {
- name = "mysql2___mysql2_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz";
- sha1 = "55ecfd4353114c148cc4c253192dbbfd000e6642";
+ name = "mysql2___mysql2_2.2.5.tgz";
+ url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz";
+ sha1 = "72624ffb4816f80f96b9c97fedd8c00935f9f340";
};
}
{
@@ -7298,11 +7818,19 @@
};
}
{
- name = "nan___nan_2.14.0.tgz";
+ name = "nan___nan_2.14.2.tgz";
path = fetchurl {
- name = "nan___nan_2.14.0.tgz";
- url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
- sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
+ name = "nan___nan_2.14.2.tgz";
+ url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz";
+ sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19";
+ };
+ }
+ {
+ name = "nanoid___nanoid_2.1.11.tgz";
+ path = fetchurl {
+ name = "nanoid___nanoid_2.1.11.tgz";
+ url = "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz";
+ sha1 = "ec24b8a758d591561531b4176a01e3ab4f0f0280";
};
}
{
@@ -7321,6 +7849,14 @@
sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0";
};
}
+ {
+ name = "native_request___native_request_1.0.8.tgz";
+ path = fetchurl {
+ name = "native_request___native_request_1.0.8.tgz";
+ url = "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz";
+ sha1 = "8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb";
+ };
+ }
{
name = "natural_compare___natural_compare_1.4.0.tgz";
path = fetchurl {
@@ -7338,11 +7874,11 @@
};
}
{
- name = "needle___needle_2.3.2.tgz";
+ name = "needle___needle_2.5.2.tgz";
path = fetchurl {
- name = "needle___needle_2.3.2.tgz";
- url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz";
- sha1 = "3342dea100b7160960a450dc8c22160ac712a528";
+ name = "needle___needle_2.5.2.tgz";
+ url = "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz";
+ sha1 = "cf1a8fce382b5a280108bba90a14993c00e4010a";
};
}
{
@@ -7354,11 +7890,11 @@
};
}
{
- name = "neo_async___neo_async_2.6.1.tgz";
+ name = "neo_async___neo_async_2.6.2.tgz";
path = fetchurl {
- name = "neo_async___neo_async_2.6.1.tgz";
- url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz";
- sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
+ name = "neo_async___neo_async_2.6.2.tgz";
+ url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz";
+ sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f";
};
}
{
@@ -7393,6 +7929,14 @@
sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
};
}
+ {
+ name = "no_case___no_case_3.0.3.tgz";
+ path = fetchurl {
+ name = "no_case___no_case_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz";
+ sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8";
+ };
+ }
{
name = "nocache___nocache_2.1.0.tgz";
path = fetchurl {
@@ -7402,19 +7946,19 @@
};
}
{
- name = "node_forge___node_forge_0.7.6.tgz";
+ name = "node_forge___node_forge_0.10.0.tgz";
path = fetchurl {
- name = "node_forge___node_forge_0.7.6.tgz";
- url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz";
- sha1 = "fdf3b418aee1f94f0ef642cd63486c77ca9724ac";
+ name = "node_forge___node_forge_0.10.0.tgz";
+ url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz";
+ sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3";
};
}
{
- name = "node_gyp_build___node_gyp_build_3.7.0.tgz";
+ name = "node_gyp_build___node_gyp_build_4.2.3.tgz";
path = fetchurl {
- name = "node_gyp_build___node_gyp_build_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz";
- sha1 = "daa77a4f547b9aed3e2aac779eaf151afd60ec8d";
+ name = "node_gyp_build___node_gyp_build_4.2.3.tgz";
+ url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz";
+ sha1 = "ce6277f853835f718829efb47db20f3e4d9c4739";
};
}
{
@@ -7425,14 +7969,6 @@
sha1 = "b64f513d18338625f90346d27b0d235e631f6425";
};
}
- {
- name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
- path = fetchurl {
- name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
- url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
- sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83";
- };
- }
{
name = "node_pre_gyp___node_pre_gyp_0.11.0.tgz";
path = fetchurl {
@@ -7442,19 +7978,11 @@
};
}
{
- name = "node_releases___node_releases_1.1.49.tgz";
+ name = "node_releases___node_releases_1.1.66.tgz";
path = fetchurl {
- name = "node_releases___node_releases_1.1.49.tgz";
- url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz";
- sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e";
- };
- }
- {
- name = "node_static___node_static_0.7.11.tgz";
- path = fetchurl {
- name = "node_static___node_static_0.7.11.tgz";
- url = "https://registry.yarnpkg.com/node-static/-/node-static-0.7.11.tgz";
- sha1 = "60120d349f3cef533e4e820670057eb631882e7f";
+ name = "node_releases___node_releases_1.1.66.tgz";
+ url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz";
+ sha1 = "609bd0dc069381015cd982300bae51ab4f1b1814";
};
}
{
@@ -7466,11 +7994,19 @@
};
}
{
- name = "nopt___nopt_4.0.1.tgz";
+ name = "nopt___nopt_4.0.3.tgz";
path = fetchurl {
- name = "nopt___nopt_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
- sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+ name = "nopt___nopt_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz";
+ sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48";
+ };
+ }
+ {
+ name = "nopt___nopt_5.0.0.tgz";
+ path = fetchurl {
+ name = "nopt___nopt_5.0.0.tgz";
+ url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz";
+ sha1 = "530942bb58a512fccafe53fe210f13a25355dc88";
};
}
{
@@ -7537,14 +8073,6 @@
sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e";
};
}
- {
- name = "npm_run_path___npm_run_path_2.0.2.tgz";
- path = fetchurl {
- name = "npm_run_path___npm_run_path_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz";
- sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
- };
- }
{
name = "npmlog___npmlog_4.1.2.tgz";
path = fetchurl {
@@ -7626,19 +8154,19 @@
};
}
{
- name = "object_inspect___object_inspect_1.7.0.tgz";
+ name = "object_inspect___object_inspect_1.8.0.tgz";
path = fetchurl {
- name = "object_inspect___object_inspect_1.7.0.tgz";
- url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
- sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
+ name = "object_inspect___object_inspect_1.8.0.tgz";
+ url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz";
+ sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0";
};
}
{
- name = "object_is___object_is_1.0.2.tgz";
+ name = "object_is___object_is_1.1.3.tgz";
path = fetchurl {
- name = "object_is___object_is_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz";
- sha1 = "6b80eb84fe451498f65007982f035a5b445edec4";
+ name = "object_is___object_is_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz";
+ sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81";
};
}
{
@@ -7658,11 +8186,11 @@
};
}
{
- name = "object.assign___object.assign_4.1.0.tgz";
+ name = "object.assign___object.assign_4.1.2.tgz";
path = fetchurl {
- name = "object.assign___object.assign_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
- sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
+ name = "object.assign___object.assign_4.1.2.tgz";
+ url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz";
+ sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940";
};
}
{
@@ -7722,11 +8250,11 @@
};
}
{
- name = "one_time___one_time_0.0.4.tgz";
+ name = "one_time___one_time_1.0.0.tgz";
path = fetchurl {
- name = "one_time___one_time_0.0.4.tgz";
- url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz";
- sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e";
+ name = "one_time___one_time_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz";
+ sha1 = "e06bc174aed214ed58edede573b433bbf827cb45";
};
}
{
@@ -7738,27 +8266,19 @@
};
}
{
- name = "openid___openid_2.0.6.tgz";
+ name = "openid___openid_2.0.7.tgz";
path = fetchurl {
- name = "openid___openid_2.0.6.tgz";
- url = "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz";
- sha1 = "707375e59ab9f73025899727679b20328171c9aa";
+ name = "openid___openid_2.0.7.tgz";
+ url = "https://registry.yarnpkg.com/openid/-/openid-2.0.7.tgz";
+ sha1 = "37bf50af2aa692623364c004de35d41fd399c6e4";
};
}
{
- name = "optimist___optimist_0.6.1.tgz";
+ name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz";
path = fetchurl {
- name = "optimist___optimist_0.6.1.tgz";
- url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz";
- sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
- };
- }
- {
- name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
- path = fetchurl {
- name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
- url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz";
- sha1 = "e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572";
+ name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz";
+ url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz";
+ sha1 = "85883c6528aaa02e30bbad9908c92926bb52dc90";
};
}
{
@@ -7785,22 +8305,6 @@
sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
};
}
- {
- name = "os_homedir___os_homedir_2.0.0.tgz";
- path = fetchurl {
- name = "os_homedir___os_homedir_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz";
- sha1 = "a0c76bb001a8392a503cbd46e7e650b3423a923c";
- };
- }
- {
- name = "os_locale___os_locale_3.1.0.tgz";
- path = fetchurl {
- name = "os_locale___os_locale_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz";
- sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a";
- };
- }
{
name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
path = fetchurl {
@@ -7825,30 +8329,6 @@
sha1 = "d0a33eefe61a205facb90092e826598d5245ce76";
};
}
- {
- name = "p_defer___p_defer_1.0.0.tgz";
- path = fetchurl {
- name = "p_defer___p_defer_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz";
- sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
- };
- }
- {
- name = "p_finally___p_finally_1.0.0.tgz";
- path = fetchurl {
- name = "p_finally___p_finally_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz";
- sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
- };
- }
- {
- name = "p_is_promise___p_is_promise_2.1.0.tgz";
- path = fetchurl {
- name = "p_is_promise___p_is_promise_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz";
- sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e";
- };
- }
{
name = "p_limit___p_limit_1.3.0.tgz";
path = fetchurl {
@@ -7858,11 +8338,19 @@
};
}
{
- name = "p_limit___p_limit_2.2.2.tgz";
+ name = "p_limit___p_limit_2.3.0.tgz";
path = fetchurl {
- name = "p_limit___p_limit_2.2.2.tgz";
- url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
- sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
+ name = "p_limit___p_limit_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz";
+ sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1";
+ };
+ }
+ {
+ name = "p_limit___p_limit_3.0.2.tgz";
+ path = fetchurl {
+ name = "p_limit___p_limit_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz";
+ sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe";
};
}
{
@@ -7881,6 +8369,22 @@
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 {
@@ -7929,6 +8433,14 @@
sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
};
}
+ {
+ name = "param_case___param_case_3.0.3.tgz";
+ path = fetchurl {
+ name = "param_case___param_case_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz";
+ sha1 = "4be41f8399eff621c56eebb829a5e451d9801238";
+ };
+ }
{
name = "parent_module___parent_module_1.0.1.tgz";
path = fetchurl {
@@ -7938,11 +8450,19 @@
};
}
{
- name = "parse_asn1___parse_asn1_5.1.5.tgz";
+ name = "parse_asn1___parse_asn1_5.1.6.tgz";
path = fetchurl {
- name = "parse_asn1___parse_asn1_5.1.5.tgz";
- url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz";
- sha1 = "003271343da58dc94cace494faef3d2147ecea0e";
+ 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";
};
}
{
@@ -7969,6 +8489,14 @@
sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
};
}
+ {
+ name = "parse_json___parse_json_5.1.0.tgz";
+ path = fetchurl {
+ name = "parse_json___parse_json_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz";
+ sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646";
+ };
+ }
{
name = "parse_passwd___parse_passwd_1.0.0.tgz";
path = fetchurl {
@@ -7993,6 +8521,14 @@
sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
};
}
+ {
+ name = "parseqs___parseqs_0.0.6.tgz";
+ path = fetchurl {
+ name = "parseqs___parseqs_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz";
+ sha1 = "8e4bb5a19d1cdc844a08ac974d34e273afa670d5";
+ };
+ }
{
name = "parseuri___parseuri_0.0.5.tgz";
path = fetchurl {
@@ -8001,6 +8537,14 @@
sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
};
}
+ {
+ name = "parseuri___parseuri_0.0.6.tgz";
+ path = fetchurl {
+ name = "parseuri___parseuri_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz";
+ sha1 = "e1496e829e3ac2ff47f39a4dd044b32823c4a25a";
+ };
+ }
{
name = "parseurl___parseurl_1.3.3.tgz";
path = fetchurl {
@@ -8009,6 +8553,14 @@
sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4";
};
}
+ {
+ name = "pascal_case___pascal_case_3.1.1.tgz";
+ path = fetchurl {
+ name = "pascal_case___pascal_case_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz";
+ sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f";
+ };
+ }
{
name = "pascalcase___pascalcase_0.1.1.tgz";
path = fetchurl {
@@ -8058,11 +8610,11 @@
};
}
{
- name = "passport_ldapauth___passport_ldapauth_2.1.3.tgz";
+ name = "passport_ldapauth___passport_ldapauth_2.1.4.tgz";
path = fetchurl {
- name = "passport_ldapauth___passport_ldapauth_2.1.3.tgz";
- url = "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz";
- sha1 = "833530c31c1e2f8d2ab7a1ff97339291074dc6f6";
+ name = "passport_ldapauth___passport_ldapauth_2.1.4.tgz";
+ url = "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.4.tgz";
+ sha1 = "2259e4e5d2d9c2b3d50a04f6640a941effda8da9";
};
}
{
@@ -8098,11 +8650,11 @@
};
}
{
- name = "passport_saml___passport_saml_1.3.2.tgz";
+ name = "passport_saml___passport_saml_1.5.0.tgz";
path = fetchurl {
- name = "passport_saml___passport_saml_1.3.2.tgz";
- url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz";
- sha1 = "6cd7e747d7fd0283877d9f48b84c55908ab4182b";
+ name = "passport_saml___passport_saml_1.5.0.tgz";
+ url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.5.0.tgz";
+ sha1 = "4f22526b577987fb2304219c29e05d2172fca5cf";
};
}
{
@@ -8161,6 +8713,14 @@
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 {
@@ -8210,11 +8770,11 @@
};
}
{
- name = "path_type___path_type_3.0.0.tgz";
+ name = "path_type___path_type_4.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";
+ url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz";
+ sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b";
};
}
{
@@ -8226,27 +8786,19 @@
};
}
{
- name = "pbkdf2___pbkdf2_3.0.17.tgz";
+ name = "pbkdf2___pbkdf2_3.1.1.tgz";
path = fetchurl {
- name = "pbkdf2___pbkdf2_3.0.17.tgz";
- url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz";
- sha1 = "976c206530617b14ebb32114239f7b09336e93a6";
+ name = "pbkdf2___pbkdf2_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz";
+ sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94";
};
}
{
- name = "pdfobject___pdfobject_2.1.1.tgz";
+ name = "pdfobject___pdfobject_2.2.4.tgz";
path = fetchurl {
- name = "pdfobject___pdfobject_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.1.1.tgz";
- sha1 = "2949d4d218d130d16b6149c7f7226f0a73400d4a";
- };
- }
- {
- name = "pend___pend_1.2.0.tgz";
- path = fetchurl {
- name = "pend___pend_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz";
- sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+ name = "pdfobject___pdfobject_2.2.4.tgz";
+ url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz";
+ sha1 = "ccb3c191129298a471e9ccb59c88a3ee0b7c7530";
};
}
{
@@ -8258,11 +8810,11 @@
};
}
{
- name = "pg_connection_string___pg_connection_string_0.1.3.tgz";
+ name = "pg_connection_string___pg_connection_string_2.4.0.tgz";
path = fetchurl {
- name = "pg_connection_string___pg_connection_string_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz";
- sha1 = "da1847b20940e42ee1492beaf65d49d91b245df7";
+ name = "pg_connection_string___pg_connection_string_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz";
+ sha1 = "c979922eb47832999a204da5dbe1ebf2341b6a10";
};
}
{
@@ -8282,19 +8834,19 @@
};
}
{
- name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz";
+ name = "pg_pool___pg_pool_3.2.2.tgz";
path = fetchurl {
- name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz";
- sha1 = "e45c3ae678b901a2873af1e17b92d787962ef914";
+ name = "pg_pool___pg_pool_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz";
+ sha1 = "a560e433443ed4ad946b84d774b3f22452694dff";
};
}
{
- name = "pg_pool___pg_pool_2.0.10.tgz";
+ name = "pg_protocol___pg_protocol_1.4.0.tgz";
path = fetchurl {
- name = "pg_pool___pg_pool_2.0.10.tgz";
- url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz";
- sha1 = "842ee23b04e86824ce9d786430f8365082d81c4a";
+ name = "pg_protocol___pg_protocol_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz";
+ sha1 = "43a71a92f6fe3ac559952555aa3335c8cb4908be";
};
}
{
@@ -8306,27 +8858,27 @@
};
}
{
- name = "pg___pg_7.18.1.tgz";
+ name = "pg___pg_8.5.1.tgz";
path = fetchurl {
- name = "pg___pg_7.18.1.tgz";
- url = "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz";
- sha1 = "67f59c47a99456fcb34f9fe53662b79d4a992f6d";
+ name = "pg___pg_8.5.1.tgz";
+ url = "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz";
+ sha1 = "34dcb15f6db4a29c702bf5031ef2e1e25a06a120";
};
}
{
- name = "pgpass___pgpass_1.0.2.tgz";
+ name = "pgpass___pgpass_1.0.4.tgz";
path = fetchurl {
- name = "pgpass___pgpass_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz";
- sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
+ name = "pgpass___pgpass_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz";
+ sha1 = "85eb93a83800b20f8057a2b029bf05abaf94ea9c";
};
}
{
- name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz";
+ name = "picomatch___picomatch_2.2.2.tgz";
path = fetchurl {
- name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz";
- url = "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
- sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
+ name = "picomatch___picomatch_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz";
+ sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad";
};
}
{
@@ -8353,22 +8905,6 @@
sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231";
};
}
- {
- name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
- path = fetchurl {
- name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
- sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
- };
- }
- {
- name = "pinkie___pinkie_2.0.4.tgz";
- path = fetchurl {
- name = "pinkie___pinkie_2.0.4.tgz";
- url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz";
- sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
- };
- }
{
name = "pkg_dir___pkg_dir_2.0.0.tgz";
path = fetchurl {
@@ -8385,6 +8921,14 @@
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 = "pkginfo___pkginfo_0.2.3.tgz";
path = fetchurl {
@@ -8393,6 +8937,22 @@
sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
};
}
+ {
+ name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz";
+ path = fetchurl {
+ name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz";
+ sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942";
+ };
+ }
+ {
+ name = "pluralize___pluralize_8.0.0.tgz";
+ path = fetchurl {
+ name = "pluralize___pluralize_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz";
+ sha1 = "1a6fa16a38d12a1901e0320fa017051c539ce3b1";
+ };
+ }
{
name = "pn___pn_1.1.0.tgz";
path = fetchurl {
@@ -8418,11 +8978,11 @@
};
}
{
- name = "postcss_calc___postcss_calc_7.0.1.tgz";
+ name = "postcss_calc___postcss_calc_7.0.5.tgz";
path = fetchurl {
- name = "postcss_calc___postcss_calc_7.0.1.tgz";
- url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz";
- sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436";
+ name = "postcss_calc___postcss_calc_7.0.5.tgz";
+ url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz";
+ sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e";
};
}
{
@@ -8530,19 +9090,19 @@
};
}
{
- name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
+ 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.2.tgz";
- url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz";
- sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915";
+ 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.1.1.tgz";
+ name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz";
path = fetchurl {
- name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz";
- sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba";
+ 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";
};
}
{
@@ -8658,19 +9218,11 @@
};
}
{
- name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
+ name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz";
path = fetchurl {
- name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
- sha1 = "249044356697b33b64f1a8f7c80922dddee7195c";
- };
- }
- {
- name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
- path = fetchurl {
- name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
- url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
- sha1 = "934cf799d016c83411859e09dcecade01286ec5c";
+ name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz";
+ url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz";
+ sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3";
};
}
{
@@ -8698,19 +9250,19 @@
};
}
{
- name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
+ name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz";
path = fetchurl {
- name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
- url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz";
- sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9";
+ 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_7.0.26.tgz";
+ name = "postcss___postcss_7.0.35.tgz";
path = fetchurl {
- name = "postcss___postcss_7.0.26.tgz";
- url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz";
- sha1 = "5ed615cfcab35ba9bbb82414a4fa88ea10429587";
+ name = "postcss___postcss_7.0.35.tgz";
+ url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz";
+ sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24";
};
}
{
@@ -8730,11 +9282,11 @@
};
}
{
- name = "postgres_date___postgres_date_1.0.4.tgz";
+ name = "postgres_date___postgres_date_1.0.7.tgz";
path = fetchurl {
- name = "postgres_date___postgres_date_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz";
- sha1 = "1c2728d62ef1bff49abdd35c1f86d4bdf118a728";
+ name = "postgres_date___postgres_date_1.0.7.tgz";
+ url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz";
+ sha1 = "51bc086006005e5061c591cee727f2531bf641a8";
};
}
{
@@ -8778,19 +9330,27 @@
};
}
{
- name = "pretty_error___pretty_error_2.1.1.tgz";
+ name = "pretty_error___pretty_error_2.1.2.tgz";
path = fetchurl {
- name = "pretty_error___pretty_error_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz";
- sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3";
+ name = "pretty_error___pretty_error_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz";
+ sha1 = "be89f82d81b1c86ec8fdfbc385045882727f93b6";
};
}
{
- name = "prismjs___prismjs_1.19.0.tgz";
+ name = "printj___printj_1.1.2.tgz";
path = fetchurl {
- name = "prismjs___prismjs_1.19.0.tgz";
- url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz";
- sha1 = "713afbd45c3baca4b321569f2df39e17e729d4dc";
+ name = "printj___printj_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz";
+ sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222";
+ };
+ }
+ {
+ name = "prismjs___prismjs_1.22.0.tgz";
+ path = fetchurl {
+ name = "prismjs___prismjs_1.22.0.tgz";
+ url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz";
+ sha1 = "73c3400afc58a823dd7eed023f8e1ce9fd8977fa";
};
}
{
@@ -8825,14 +9385,6 @@
sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
};
}
- {
- name = "progress___progress_1.1.8.tgz";
- path = fetchurl {
- name = "progress___progress_1.1.8.tgz";
- url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz";
- sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
- };
- }
{
name = "progress___progress_2.0.3.tgz";
path = fetchurl {
@@ -8849,14 +9401,6 @@
sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
};
}
- {
- name = "promise___promise_7.3.1.tgz";
- path = fetchurl {
- name = "promise___promise_7.3.1.tgz";
- url = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz";
- sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
- };
- }
{
name = "proto_list___proto_list_1.2.4.tgz";
path = fetchurl {
@@ -8866,11 +9410,11 @@
};
}
{
- name = "proxy_addr___proxy_addr_2.0.5.tgz";
+ name = "proxy_addr___proxy_addr_2.0.6.tgz";
path = fetchurl {
- name = "proxy_addr___proxy_addr_2.0.5.tgz";
- url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz";
- sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34";
+ name = "proxy_addr___proxy_addr_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz";
+ sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf";
};
}
{
@@ -8890,11 +9434,11 @@
};
}
{
- name = "psl___psl_1.7.0.tgz";
+ name = "psl___psl_1.8.0.tgz";
path = fetchurl {
- name = "psl___psl_1.7.0.tgz";
- url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz";
- sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c";
+ name = "psl___psl_1.8.0.tgz";
+ url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz";
+ sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24";
};
}
{
@@ -9042,11 +9586,11 @@
};
}
{
- name = "randomcolor___randomcolor_0.5.4.tgz";
+ name = "randomcolor___randomcolor_0.6.2.tgz";
path = fetchurl {
- name = "randomcolor___randomcolor_0.5.4.tgz";
- url = "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.5.4.tgz";
- sha1 = "df615b13f25b89ea58c5f8f72647f0a6f07adcc3";
+ name = "randomcolor___randomcolor_0.6.2.tgz";
+ url = "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.6.2.tgz";
+ sha1 = "7a57362ae1a1278439aeed2c15e5deb8ea33f56d";
};
}
{
@@ -9065,14 +9609,6 @@
sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031";
};
}
- {
- name = "raphael___raphael_2.2.8.tgz";
- path = fetchurl {
- name = "raphael___raphael_2.2.8.tgz";
- url = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.8.tgz";
- sha1 = "4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3";
- };
- }
{
name = "raphael___raphael_2.3.0.tgz";
path = fetchurl {
@@ -9081,22 +9617,6 @@
sha1 = "eabeb09dba861a1d4cee077eaafb8c53f3131f89";
};
}
- {
- name = "raphael";
- path =
- let
- repo = fetchgit {
- url = "https://github.com/dmitrybaranovskiy/raphael";
- rev = "d8fbe4be81d362837f95e33886b80fb41de443b4";
- sha256 = "1g2jif250j3szn75fivns8d66m9s7msivhdh4jqbbmy8mvv8xzn9";
- };
- in
- runCommandNoCC "raphael" { buildInputs = [gnutar]; } ''
- # Set u+w because tar-fs can't unpack archives with read-only dirs
- # https://github.com/mafintosh/tar-fs/issues/79
- tar cf $out --mode u+w -C ${repo} .
- '';
- }
{
name = "raw_body___raw_body_2.4.0.tgz";
path = fetchurl {
@@ -9153,14 +9673,6 @@
sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
};
}
- {
- 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 = "readable_stream___readable_stream_1.0.34.tgz";
path = fetchurl {
@@ -9169,6 +9681,14 @@
sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
};
}
+ {
+ 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 = "readable_stream___readable_stream_2.0.6.tgz";
path = fetchurl {
@@ -9177,6 +9697,14 @@
sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
};
}
+ {
+ name = "readdir_glob___readdir_glob_1.1.1.tgz";
+ path = fetchurl {
+ name = "readdir_glob___readdir_glob_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz";
+ sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4";
+ };
+ }
{
name = "readdirp___readdirp_2.2.1.tgz";
path = fetchurl {
@@ -9185,6 +9713,14 @@
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 = "readline_sync___readline_sync_1.4.10.tgz";
path = fetchurl {
@@ -9193,14 +9729,6 @@
sha1 = "41df7fbb4b6312d673011594145705bf56d8873b";
};
}
- {
- name = "redeyed___redeyed_2.1.1.tgz";
- path = fetchurl {
- name = "redeyed___redeyed_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz";
- sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
- };
- }
{
name = "reduce_component___reduce_component_1.0.1.tgz";
path = fetchurl {
@@ -9218,19 +9746,11 @@
};
}
{
- name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+ name = "regenerate___regenerate_1.4.2.tgz";
path = fetchurl {
- name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
- url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz";
- sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e";
- };
- }
- {
- name = "regenerate___regenerate_1.4.0.tgz";
- path = fetchurl {
- name = "regenerate___regenerate_1.4.0.tgz";
- url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz";
- sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11";
+ name = "regenerate___regenerate_1.4.2.tgz";
+ url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz";
+ sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a";
};
}
{
@@ -9297,14 +9817,6 @@
sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
};
}
- {
- name = "regexpu_core___regexpu_core_4.6.0.tgz";
- path = fetchurl {
- name = "regexpu_core___regexpu_core_4.6.0.tgz";
- url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz";
- sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6";
- };
- }
{
name = "regjsgen___regjsgen_0.2.0.tgz";
path = fetchurl {
@@ -9313,14 +9825,6 @@
sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
};
}
- {
- name = "regjsgen___regjsgen_0.5.1.tgz";
- path = fetchurl {
- name = "regjsgen___regjsgen_0.5.1.tgz";
- url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz";
- sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c";
- };
- }
{
name = "regjsparser___regjsparser_0.1.5.tgz";
path = fetchurl {
@@ -9329,14 +9833,6 @@
sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
};
}
- {
- name = "regjsparser___regjsparser_0.6.3.tgz";
- path = fetchurl {
- name = "regjsparser___regjsparser_0.6.3.tgz";
- url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz";
- sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460";
- };
- }
{
name = "relateurl___relateurl_0.2.7.tgz";
path = fetchurl {
@@ -9346,11 +9842,411 @@
};
}
{
- name = "remarkable___remarkable_2.0.0.tgz";
+ name = "remark_cli___remark_cli_8.0.1.tgz";
path = fetchurl {
- name = "remarkable___remarkable_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz";
- sha1 = "795f965bede8300362ce51a716edc322d9e7a4ca";
+ name = "remark_cli___remark_cli_8.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-cli/-/remark-cli-8.0.1.tgz";
+ sha1 = "093e9f27c1d56a591f4c44c017de5749d4e79a08";
+ };
+ }
+ {
+ name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz";
+ sha1 = "27347959acf42a6c3e401488d8210e973576b254";
+ };
+ }
+ {
+ name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz";
+ sha1 = "448b0f2660acfcdfff2138d125ff5b1c1279c0cb";
+ };
+ }
+ {
+ name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz";
+ sha1 = "10340eb2f87acff41140d52ad7e5b40b47e6690a";
+ };
+ }
+ {
+ name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz";
+ sha1 = "97f01bf9bf77a7bdf8013b124b7157dd90b07c64";
+ };
+ }
+ {
+ name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz";
+ sha1 = "1d5ca2070d4798d16c23120726158157796dc317";
+ };
+ }
+ {
+ name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz";
+ sha1 = "2cb3ddb1157082c45760c7d01ca08e13376aaf62";
+ };
+ }
+ {
+ name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz";
+ sha1 = "7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf";
+ };
+ }
+ {
+ name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz";
+ path = fetchurl {
+ name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz";
+ sha1 = "7e2feec02919aa3db5c71fda19d726a9e24a4c6c";
+ };
+ }
+ {
+ name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz";
+ path = fetchurl {
+ name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz";
+ sha1 = "b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb";
+ };
+ }
+ {
+ name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz";
+ sha1 = "2149b55cda17604562d040c525a2a0d26aeb0f0f";
+ };
+ }
+ {
+ name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz";
+ sha1 = "b578f251508a05d79bc2d1ae941e0620e23bf1d3";
+ };
+ }
+ {
+ name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz";
+ sha1 = "8216fca67d97bbbeec8a19b6c71bfefc16549f72";
+ };
+ }
+ {
+ name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz";
+ sha1 = "51a595c69fcfa73a245a030dfaa3504938a1173a";
+ };
+ }
+ {
+ name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz";
+ sha1 = "96387459440dcd61e522ab02bff138b32bfaa63a";
+ };
+ }
+ {
+ name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz";
+ sha1 = "c6472514e17bc02136ca87936260407ada90bf8d";
+ };
+ }
+ {
+ name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-2.0.1.tgz";
+ sha1 = "864ddda464d5cd11f725c83f00bb240538661d50";
+ };
+ }
+ {
+ name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz";
+ sha1 = "56f240707a75b59bce3384ccc9da94548affa98f";
+ };
+ }
+ {
+ name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz";
+ path = fetchurl {
+ name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz";
+ sha1 = "d0d15410637d61b031a83d7c78022ec46d6c858a";
+ };
+ }
+ {
+ name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz";
+ sha1 = "f75e5c24adb42385593e0d75ca39987edb70b6c4";
+ };
+ }
+ {
+ name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_3.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-3.0.1.tgz";
+ sha1 = "fb1d5a87ee6f21b731bb2ee52df55632c519a5eb";
+ };
+ }
+ {
+ name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-2.0.1.tgz";
+ sha1 = "4163fa21619fe69325333f83eed8a933ed32e7ec";
+ };
+ }
+ {
+ name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz";
+ sha1 = "4a4b70e029155ebcfc03d8b2358c427b69a87576";
+ };
+ }
+ {
+ name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz";
+ sha1 = "fcc064133fe00745943c334080fed822f72711ea";
+ };
+ }
+ {
+ name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz";
+ sha1 = "4ca3425f6613f94feaef6941028583299727c339";
+ };
+ }
+ {
+ name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz";
+ sha1 = "e9a6f2aeab948aa249c8a8356359e3d8843a4c5c";
+ };
+ }
+ {
+ name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz";
+ sha1 = "6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6";
+ };
+ }
+ {
+ name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz";
+ sha1 = "3e37bfef74bbdd4b07aa9ef9dd452758f8b46731";
+ };
+ }
+ {
+ name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz";
+ sha1 = "4e0e4d42a63f0fdfb856bb5d8d8112725656e700";
+ };
+ }
+ {
+ name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz";
+ sha1 = "face59f9a95c8aa278a8ee0c728bc44cd53ea9ed";
+ };
+ }
+ {
+ name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-2.0.1.tgz";
+ sha1 = "630b546566d34bde87943da318a80fc7ff856f1f";
+ };
+ }
+ {
+ name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz";
+ sha1 = "731908f9866c1880e6024dcee1269fb0f40335d6";
+ };
+ }
+ {
+ name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz";
+ sha1 = "3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635";
+ };
+ }
+ {
+ name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz";
+ sha1 = "b2c6c3ed95e5615f8e5f031c7d271a18dc17618e";
+ };
+ }
+ {
+ name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz";
+ sha1 = "d174d12a57e8307caf6232f61a795bc1d64afeaa";
+ };
+ }
+ {
+ name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz";
+ sha1 = "8f963f81036e45cfb7061b3639e9c6952308bc94";
+ };
+ }
+ {
+ name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-2.0.1.tgz";
+ sha1 = "67ef344389fa40be9c6017835cf58ca417c417d0";
+ };
+ }
+ {
+ name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz";
+ sha1 = "183c31967e6f2ae8ef00effad03633f7fd00ffaa";
+ };
+ }
+ {
+ name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz";
+ sha1 = "0de343de2efb41f01eae9f0f7e7d30fe43db5595";
+ };
+ }
+ {
+ name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz";
+ sha1 = "f59bd82e75d3eaabd0eee1c8c0f5513372eb553c";
+ };
+ }
+ {
+ name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz";
+ sha1 = "1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4";
+ };
+ }
+ {
+ name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-2.0.1.tgz";
+ sha1 = "b1e557ec44e1a33beb45578e97bf9441149379f6";
+ };
+ }
+ {
+ name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz";
+ sha1 = "12b7e4c54473d69c9866cb33439c718d09cffcc5";
+ };
+ }
+ {
+ name = "remark_lint_table_pipes___remark_lint_table_pipes_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_table_pipes___remark_lint_table_pipes_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-2.0.1.tgz";
+ sha1 = "b8594394f65053a030e8a51baa8504e388139a19";
+ };
+ }
+ {
+ name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz";
+ sha1 = "e64692aa9594dbe7e945ae76ab2218949cd92477";
+ };
+ }
+ {
+ name = "remark_lint___remark_lint_7.0.1.tgz";
+ path = fetchurl {
+ name = "remark_lint___remark_lint_7.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-lint/-/remark-lint-7.0.1.tgz";
+ sha1 = "665a5cbea9f7c95e64593f69bb6816ee8343ffdf";
+ };
+ }
+ {
+ name = "remark_message_control___remark_message_control_6.0.0.tgz";
+ path = fetchurl {
+ name = "remark_message_control___remark_message_control_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz";
+ sha1 = "955b054b38c197c9f2e35b1d88a4912949db7fc5";
+ };
+ }
+ {
+ name = "remark_parse___remark_parse_8.0.3.tgz";
+ path = fetchurl {
+ name = "remark_parse___remark_parse_8.0.3.tgz";
+ url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz";
+ sha1 = "9c62aa3b35b79a486454c690472906075f40c7e1";
+ };
+ }
+ {
+ name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_3.0.1.tgz";
+ path = fetchurl {
+ name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-3.0.1.tgz";
+ sha1 = "7f160e2ded777bfb14d544e9f72c6873bdfb6da3";
+ };
+ }
+ {
+ name = "remark_stringify___remark_stringify_8.1.1.tgz";
+ path = fetchurl {
+ name = "remark_stringify___remark_stringify_8.1.1.tgz";
+ url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz";
+ sha1 = "e2a9dc7a7bf44e46a155ec78996db896780d8ce5";
+ };
+ }
+ {
+ name = "remark___remark_12.0.1.tgz";
+ path = fetchurl {
+ name = "remark___remark_12.0.1.tgz";
+ url = "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz";
+ sha1 = "f1ddf68db7be71ca2bad0a33cd3678b86b9c709f";
};
}
{
@@ -9362,11 +10258,11 @@
};
}
{
- name = "renderkid___renderkid_2.0.3.tgz";
+ name = "renderkid___renderkid_2.0.4.tgz";
path = fetchurl {
- name = "renderkid___renderkid_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz";
- sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149";
+ name = "renderkid___renderkid_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz";
+ sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c";
};
}
{
@@ -9394,27 +10290,27 @@
};
}
{
- name = "request_progress___request_progress_2.0.1.tgz";
+ name = "replace_ext___replace_ext_1.0.0.tgz";
path = fetchurl {
- name = "request_progress___request_progress_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz";
- sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+ name = "replace_ext___replace_ext_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz";
+ sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
};
}
{
- name = "request_promise_core___request_promise_core_1.1.3.tgz";
+ name = "request_promise_core___request_promise_core_1.1.4.tgz";
path = fetchurl {
- name = "request_promise_core___request_promise_core_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz";
- sha1 = "e9a3c081b51380dfea677336061fea879a829ee9";
+ name = "request_promise_core___request_promise_core_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz";
+ sha1 = "3eedd4223208d419867b78ce815167d10593a22f";
};
}
{
- name = "request_promise_native___request_promise_native_1.0.8.tgz";
+ name = "request_promise_native___request_promise_native_1.0.9.tgz";
path = fetchurl {
- name = "request_promise_native___request_promise_native_1.0.8.tgz";
- url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz";
- sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36";
+ name = "request_promise_native___request_promise_native_1.0.9.tgz";
+ url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz";
+ sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28";
};
}
{
@@ -9441,14 +10337,6 @@
sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b";
};
}
- {
- name = "require_relative___require_relative_0.8.7.tgz";
- path = fetchurl {
- name = "require_relative___require_relative_0.8.7.tgz";
- url = "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz";
- sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de";
- };
- }
{
name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
path = fetchurl {
@@ -9481,6 +10369,14 @@
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_url___resolve_url_0.2.1.tgz";
path = fetchurl {
@@ -9490,11 +10386,11 @@
};
}
{
- name = "resolve___resolve_1.15.1.tgz";
+ name = "resolve___resolve_1.19.0.tgz";
path = fetchurl {
- name = "resolve___resolve_1.15.1.tgz";
- url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz";
- sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8";
+ name = "resolve___resolve_1.19.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz";
+ sha1 = "1af5bf630409734a067cae29318aac7fa29a267c";
};
}
{
@@ -9521,6 +10417,14 @@
sha1 = "769f63d536bec4783549db0777cb56dadd9d8543";
};
}
+ {
+ 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 = "reveal.js___reveal.js_3.9.2.tgz";
path = fetchurl {
@@ -9545,14 +10449,6 @@
sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3";
};
}
- {
- name = "right_align___right_align_0.1.3.tgz";
- path = fetchurl {
- name = "right_align___right_align_0.1.3.tgz";
- url = "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz";
- sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
- };
- }
{
name = "rimraf___rimraf_2.6.3.tgz";
path = fetchurl {
@@ -9569,6 +10465,14 @@
sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
};
}
+ {
+ name = "rimraf___rimraf_3.0.2.tgz";
+ path = fetchurl {
+ name = "rimraf___rimraf_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz";
+ sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a";
+ };
+ }
{
name = "rimraf___rimraf_2.4.5.tgz";
path = fetchurl {
@@ -9586,43 +10490,19 @@
};
}
{
- name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz";
+ name = "run_async___run_async_2.4.1.tgz";
path = fetchurl {
- name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz";
- url = "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz";
- sha1 = "f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a";
+ name = "run_async___run_async_2.4.1.tgz";
+ url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz";
+ sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455";
};
}
{
- name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz";
+ name = "run_parallel___run_parallel_1.1.10.tgz";
path = fetchurl {
- name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz";
- url = "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz";
- sha1 = "72f2af0748b592364dbd3389e600e5a9444a351e";
- };
- }
- {
- name = "rollup_watch___rollup_watch_4.3.1.tgz";
- path = fetchurl {
- name = "rollup_watch___rollup_watch_4.3.1.tgz";
- url = "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz";
- sha1 = "5aa1eaeab787addf368905d102b39d6fc5ce4a8b";
- };
- }
- {
- name = "rollup___rollup_0.66.6.tgz";
- path = fetchurl {
- name = "rollup___rollup_0.66.6.tgz";
- url = "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz";
- sha1 = "ce7d6185beb7acea644ce220c25e71ae03275482";
- };
- }
- {
- name = "run_async___run_async_2.3.0.tgz";
- path = fetchurl {
- name = "run_async___run_async_2.3.0.tgz";
- url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz";
- sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+ name = "run_parallel___run_parallel_1.1.10.tgz";
+ url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz";
+ sha1 = "60a51b2ae836636c81377df16cb107351bcd13ef";
};
}
{
@@ -9642,19 +10522,19 @@
};
}
{
- name = "rxjs___rxjs_6.5.4.tgz";
+ name = "rxjs___rxjs_6.6.3.tgz";
path = fetchurl {
- name = "rxjs___rxjs_6.5.4.tgz";
- url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
- sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
+ name = "rxjs___rxjs_6.6.3.tgz";
+ url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz";
+ sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552";
};
}
{
- name = "safe_buffer___safe_buffer_5.2.0.tgz";
+ name = "safe_buffer___safe_buffer_5.2.1.tgz";
path = fetchurl {
- name = "safe_buffer___safe_buffer_5.2.0.tgz";
- url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz";
- sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519";
+ name = "safe_buffer___safe_buffer_5.2.1.tgz";
+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz";
+ sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6";
};
}
{
@@ -9665,6 +10545,14 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
+ {
+ name = "safe_buffer___safe_buffer_5.2.0.tgz";
+ path = fetchurl {
+ name = "safe_buffer___safe_buffer_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz";
+ sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519";
+ };
+ }
{
name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz";
path = fetchurl {
@@ -9722,19 +10610,19 @@
};
}
{
- name = "schema_utils___schema_utils_2.6.4.tgz";
+ name = "schema_utils___schema_utils_2.7.1.tgz";
path = fetchurl {
- name = "schema_utils___schema_utils_2.6.4.tgz";
- url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz";
- sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53";
+ 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 = "scope_css___scope_css_1.2.1.tgz";
+ name = "schema_utils___schema_utils_3.0.0.tgz";
path = fetchurl {
- name = "scope_css___scope_css_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz";
- sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e";
+ name = "schema_utils___schema_utils_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz";
+ sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef";
};
}
{
@@ -9777,6 +10665,14 @@
sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
};
}
+ {
+ name = "semver_compare___semver_compare_1.0.0.tgz";
+ path = fetchurl {
+ name = "semver_compare___semver_compare_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz";
+ sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc";
+ };
+ }
{
name = "semver___semver_5.7.1.tgz";
path = fetchurl {
@@ -9785,14 +10681,6 @@
sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7";
};
}
- {
- name = "semver___semver_4.3.2.tgz";
- path = fetchurl {
- name = "semver___semver_4.3.2.tgz";
- url = "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz";
- sha1 = "c7a07158a80bedd052355b770d82d6640f803be7";
- };
- }
{
name = "semver___semver_6.3.0.tgz";
path = fetchurl {
@@ -9834,27 +10722,27 @@
};
}
{
- name = "sequelize___sequelize_5.21.4.tgz";
+ name = "sequelize___sequelize_5.22.3.tgz";
path = fetchurl {
- name = "sequelize___sequelize_5.21.4.tgz";
- url = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz";
- sha1 = "a49597dbd7862e4e1fb8ec819de04705d06d9d17";
+ name = "sequelize___sequelize_5.22.3.tgz";
+ url = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.22.3.tgz";
+ sha1 = "7e7a92ddd355d883c9eb11cdb106d874d0d2636f";
};
}
{
- name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+ name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
path = fetchurl {
- name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
- url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
- sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
+ name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
+ sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa";
};
}
{
- name = "series_stream___series_stream_1.0.1.tgz";
+ name = "serialize_javascript___serialize_javascript_5.0.1.tgz";
path = fetchurl {
- name = "series_stream___series_stream_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/series-stream/-/series-stream-1.0.1.tgz";
- sha1 = "311a09c5c1d5a091440832e1a480a47400f1005d";
+ name = "serialize_javascript___serialize_javascript_5.0.1.tgz";
+ url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
+ sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4";
};
}
{
@@ -9930,11 +10818,11 @@
};
}
{
- name = "shortid___shortid_2.2.8.tgz";
+ name = "shortid___shortid_2.2.16.tgz";
path = fetchurl {
- name = "shortid___shortid_2.2.8.tgz";
- url = "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz";
- sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131";
+ name = "shortid___shortid_2.2.16.tgz";
+ url = "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz";
+ sha1 = "b742b8f0cb96406fd391c76bfc18a67a57fe5608";
};
}
{
@@ -9946,11 +10834,11 @@
};
}
{
- name = "signal_exit___signal_exit_3.0.2.tgz";
+ name = "signal_exit___signal_exit_3.0.3.tgz";
path = fetchurl {
- name = "signal_exit___signal_exit_3.0.2.tgz";
- url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
- sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+ name = "signal_exit___signal_exit_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz";
+ sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c";
};
}
{
@@ -9969,6 +10857,14 @@
sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
};
}
+ {
+ name = "slash___slash_3.0.0.tgz";
+ path = fetchurl {
+ name = "slash___slash_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz";
+ sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634";
+ };
+ }
{
name = "slice_ansi___slice_ansi_2.1.0.tgz";
path = fetchurl {
@@ -9978,11 +10874,11 @@
};
}
{
- name = "slugify___slugify_1.3.6.tgz";
+ name = "sliced___sliced_1.0.1.tgz";
path = fetchurl {
- name = "slugify___slugify_1.3.6.tgz";
- url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz";
- sha1 = "ba5fd6159b570fe4811d02ea9b1f4906677638c3";
+ name = "sliced___sliced_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz";
+ sha1 = "0b3a662b5d04c3177b1926bea82b03f837a2ef41";
};
}
{
@@ -10010,11 +10906,11 @@
};
}
{
- name = "snapsvg___snapsvg_0.4.0.tgz";
+ name = "snapsvg___snapsvg_0.5.1.tgz";
path = fetchurl {
- name = "snapsvg___snapsvg_0.4.0.tgz";
- url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.4.0.tgz";
- sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
+ name = "snapsvg___snapsvg_0.5.1.tgz";
+ url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz";
+ sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
};
}
{
@@ -10026,27 +10922,43 @@
};
}
{
- name = "socket.io_client___socket.io_client_2.1.1.tgz";
+ name = "socket.io_client___socket.io_client_2.3.0.tgz";
path = fetchurl {
- name = "socket.io_client___socket.io_client_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz";
- sha1 = "dcb38103436ab4578ddb026638ae2f21b623671f";
+ name = "socket.io_client___socket.io_client_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz";
+ sha1 = "14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4";
};
}
{
- name = "socket.io_parser___socket.io_parser_3.2.0.tgz";
+ name = "socket.io_client___socket.io_client_2.3.1.tgz";
path = fetchurl {
- name = "socket.io_parser___socket.io_parser_3.2.0.tgz";
- url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz";
- sha1 = "e7c6228b6aa1f814e6148aea325b51aa9499e077";
+ name = "socket.io_client___socket.io_client_2.3.1.tgz";
+ url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz";
+ sha1 = "91a4038ef4d03c19967bb3c646fec6e0eaa78cff";
};
}
{
- name = "socket.io___socket.io_2.1.1.tgz";
+ name = "socket.io_parser___socket.io_parser_3.3.1.tgz";
path = fetchurl {
- name = "socket.io___socket.io_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz";
- sha1 = "a069c5feabee3e6b214a75b40ce0652e1cfb9980";
+ name = "socket.io_parser___socket.io_parser_3.3.1.tgz";
+ url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz";
+ sha1 = "f07d9c8cb3fb92633aa93e76d98fd3a334623199";
+ };
+ }
+ {
+ name = "socket.io_parser___socket.io_parser_3.4.1.tgz";
+ path = fetchurl {
+ name = "socket.io_parser___socket.io_parser_3.4.1.tgz";
+ url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz";
+ sha1 = "b06af838302975837eab2dc980037da24054d64a";
+ };
+ }
+ {
+ name = "socket.io___socket.io_2.3.0.tgz";
+ path = fetchurl {
+ name = "socket.io___socket.io_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz";
+ sha1 = "cd762ed6a4faeca59bc1f3e243c0969311eb73fb";
};
}
{
@@ -10082,11 +10994,11 @@
};
}
{
- name = "source_map_support___source_map_support_0.5.16.tgz";
+ name = "source_map_support___source_map_support_0.5.19.tgz";
path = fetchurl {
- name = "source_map_support___source_map_support_0.5.16.tgz";
- url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
- sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
+ 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";
};
}
{
@@ -10114,43 +11026,43 @@
};
}
{
- name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz";
+ name = "source_map___source_map_0.7.3.tgz";
path = fetchurl {
- name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz";
- url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz";
- sha1 = "ea804bd94857402e6992d05a38ef1ae35a9ab4c4";
+ 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.0.tgz";
+ name = "spdx_correct___spdx_correct_3.1.1.tgz";
path = fetchurl {
- name = "spdx_correct___spdx_correct_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz";
- sha1 = "fb83e504445268f154b074e218c87c003cd31df4";
+ 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.2.0.tgz";
+ name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
path = fetchurl {
- name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
- sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977";
+ 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.0.tgz";
+ name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz";
path = fetchurl {
- name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
- sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0";
+ 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.5.tgz";
+ name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
path = fetchurl {
- name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
- url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
- sha1 = "3694b5804567a458d3c8045842a6358632f62654";
+ name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
+ url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+ sha1 = "c80757383c28abf7296744998cbc106ae8b854ce";
};
}
{
@@ -10170,11 +11082,11 @@
};
}
{
- name = "split___split_1.0.1.tgz";
+ name = "split2___split2_3.2.2.tgz";
path = fetchurl {
- name = "split___split_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz";
- sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9";
+ name = "split2___split2_3.2.2.tgz";
+ url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz";
+ sha1 = "bf2cf2a37d838312c249c89206fd7a17dd12365f";
};
}
{
@@ -10194,19 +11106,19 @@
};
}
{
- name = "sqlite3___sqlite3_4.1.1.tgz";
+ name = "sqlite3___sqlite3_4.2.0.tgz";
path = fetchurl {
- name = "sqlite3___sqlite3_4.1.1.tgz";
- url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz";
- sha1 = "539a42e476640796578e22d589b3283c28055242";
+ name = "sqlite3___sqlite3_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.2.0.tgz";
+ sha1 = "49026d665e9fc4f922e56fb9711ba5b4c85c4901";
};
}
{
- name = "sqlstring___sqlstring_2.3.1.tgz";
+ name = "sqlstring___sqlstring_2.3.2.tgz";
path = fetchurl {
- name = "sqlstring___sqlstring_2.3.1.tgz";
- url = "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz";
- sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40";
+ name = "sqlstring___sqlstring_2.3.2.tgz";
+ url = "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz";
+ sha1 = "cdae7169389a1375b18e885f2e60b3e460809514";
};
}
{
@@ -10225,6 +11137,14 @@
sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8";
};
}
+ {
+ name = "ssri___ssri_8.0.0.tgz";
+ path = fetchurl {
+ name = "ssri___ssri_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz";
+ sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808";
+ };
+ }
{
name = "stable___stable_0.1.8.tgz";
path = fetchurl {
@@ -10241,6 +11161,14 @@
sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
};
}
+ {
+ name = "state_toggle___state_toggle_1.0.3.tgz";
+ path = fetchurl {
+ name = "state_toggle___state_toggle_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz";
+ sha1 = "e123b16a88e143139b09c6852221bc9815917dfe";
+ };
+ }
{
name = "static_extend___static_extend_0.1.2.tgz";
path = fetchurl {
@@ -10289,14 +11217,6 @@
sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae";
};
}
- {
- name = "stream_from_to___stream_from_to_1.4.3.tgz";
- path = fetchurl {
- name = "stream_from_to___stream_from_to_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/stream-from-to/-/stream-from-to-1.4.3.tgz";
- sha1 = "b270473ebc514e73615727c5d2f76b229941df94";
- };
- }
{
name = "stream_http___stream_http_2.8.3.tgz";
path = fetchurl {
@@ -10362,19 +11282,27 @@
};
}
{
- name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+ name = "string_width___string_width_4.2.0.tgz";
path = fetchurl {
- name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
- sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
+ name = "string_width___string_width_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz";
+ sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
};
}
{
- name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz";
path = fetchurl {
- name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
- sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
+ name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz";
+ sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46";
+ };
+ }
+ {
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz";
+ path = fetchurl {
+ name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz";
+ sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7";
};
}
{
@@ -10409,6 +11337,14 @@
sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
};
}
+ {
+ name = "stringify_entities___stringify_entities_3.1.0.tgz";
+ path = fetchurl {
+ name = "stringify_entities___stringify_entities_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz";
+ sha1 = "b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903";
+ };
+ }
{
name = "strip_ansi___strip_ansi_3.0.1.tgz";
path = fetchurl {
@@ -10433,6 +11369,14 @@
sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae";
};
}
+ {
+ name = "strip_ansi___strip_ansi_6.0.0.tgz";
+ path = fetchurl {
+ name = "strip_ansi___strip_ansi_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz";
+ sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532";
+ };
+ }
{
name = "strip_ansi___strip_ansi_0.1.1.tgz";
path = fetchurl {
@@ -10449,22 +11393,6 @@
sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
};
}
- {
- name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
- path = fetchurl {
- name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz";
- sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89";
- };
- }
- {
- name = "strip_eof___strip_eof_1.0.0.tgz";
- path = fetchurl {
- name = "strip_eof___strip_eof_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz";
- sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
- };
- }
{
name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
path = fetchurl {
@@ -10473,14 +11401,6 @@
sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
};
}
- {
- name = "style_loader___style_loader_1.1.3.tgz";
- path = fetchurl {
- name = "style_loader___style_loader_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz";
- sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200";
- };
- }
{
name = "stylehacks___stylehacks_4.0.3.tgz";
path = fetchurl {
@@ -10489,6 +11409,14 @@
sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5";
};
}
+ {
+ name = "stylis___stylis_3.5.4.tgz";
+ path = fetchurl {
+ name = "stylis___stylis_3.5.4.tgz";
+ url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz";
+ sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe";
+ };
+ }
{
name = "superagent___superagent_1.8.3.tgz";
path = fetchurl {
@@ -10505,14 +11433,6 @@
sha1 = "1c6b337402c2137605efe19f10fec390f6faab54";
};
}
- {
- 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_2.0.0.tgz";
path = fetchurl {
@@ -10529,6 +11449,22 @@
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 = "svgo___svgo_1.3.2.tgz";
path = fetchurl {
@@ -10562,11 +11498,11 @@
};
}
{
- name = "tar_stream___tar_stream_1.6.2.tgz";
+ name = "tar_stream___tar_stream_2.1.4.tgz";
path = fetchurl {
- name = "tar_stream___tar_stream_1.6.2.tgz";
- url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz";
- sha1 = "8ea55dab37972253d9a9af90fdcd559ae435c555";
+ name = "tar_stream___tar_stream_2.1.4.tgz";
+ url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz";
+ sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa";
};
}
{
@@ -10577,6 +11513,14 @@
sha1 = "43b364bc52888d555298637b10d60790254ab525";
};
}
+ {
+ name = "tar___tar_6.0.5.tgz";
+ path = fetchurl {
+ name = "tar___tar_6.0.5.tgz";
+ url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz";
+ sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f";
+ };
+ }
{
name = "tedious___tedious_6.7.0.tgz";
path = fetchurl {
@@ -10586,19 +11530,19 @@
};
}
{
- name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
+ name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz";
path = fetchurl {
- name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
- sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c";
+ name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz";
+ url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz";
+ sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b";
};
}
{
- name = "terser___terser_4.6.3.tgz";
+ name = "terser___terser_4.8.0.tgz";
path = fetchurl {
- name = "terser___terser_4.6.3.tgz";
- url = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz";
- sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87";
+ name = "terser___terser_4.8.0.tgz";
+ url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz";
+ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
};
}
{
@@ -10617,14 +11561,6 @@
sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
};
}
- {
- name = "throttleit___throttleit_1.0.0.tgz";
- path = fetchurl {
- name = "throttleit___throttleit_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz";
- sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
- };
- }
{
name = "through2___through2_0.6.5.tgz";
path = fetchurl {
@@ -10641,14 +11577,6 @@
sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd";
};
}
- {
- name = "through2___through2_3.0.1.tgz";
- path = fetchurl {
- name = "through2___through2_3.0.1.tgz";
- url = "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz";
- sha1 = "39276e713c3302edf9e388dd9c812dd3b825bd5a";
- };
- }
{
name = "through___through_2.3.8.tgz";
path = fetchurl {
@@ -10658,11 +11586,11 @@
};
}
{
- name = "timers_browserify___timers_browserify_2.0.11.tgz";
+ name = "timers_browserify___timers_browserify_2.0.12.tgz";
path = fetchurl {
- name = "timers_browserify___timers_browserify_2.0.11.tgz";
- url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz";
- sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f";
+ name = "timers_browserify___timers_browserify_2.0.12.tgz";
+ url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz";
+ sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee";
};
}
{
@@ -10697,14 +11625,6 @@
sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
};
}
- {
- name = "tmp___tmp_0.1.0.tgz";
- path = fetchurl {
- name = "tmp___tmp_0.1.0.tgz";
- url = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz";
- sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877";
- };
- }
{
name = "to_array___to_array_0.1.4.tgz";
path = fetchurl {
@@ -10721,14 +11641,6 @@
sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
};
}
- {
- name = "to_buffer___to_buffer_1.1.1.tgz";
- path = fetchurl {
- name = "to_buffer___to_buffer_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz";
- sha1 = "493bd48f62d7c43fcded313a03dcadb2e1213a80";
- };
- }
{
name = "to_fast_properties___to_fast_properties_1.0.3.tgz";
path = fetchurl {
@@ -10753,6 +11665,14 @@
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 {
@@ -10761,6 +11681,14 @@
sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
};
}
+ {
+ name = "to_vfile___to_vfile_6.1.0.tgz";
+ path = fetchurl {
+ name = "to_vfile___to_vfile_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz";
+ sha1 = "5f7a3f65813c2c4e34ee1f7643a5646344627699";
+ };
+ }
{
name = "toidentifier___toidentifier_1.0.0.tgz";
path = fetchurl {
@@ -10786,11 +11714,11 @@
};
}
{
- name = "tough_cookie___tough_cookie_2.4.3.tgz";
+ name = "tough_cookie___tough_cookie_2.5.0.tgz";
path = fetchurl {
- name = "tough_cookie___tough_cookie_2.4.3.tgz";
- url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz";
- sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
+ name = "tough_cookie___tough_cookie_2.5.0.tgz";
+ url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz";
+ sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2";
};
}
{
@@ -10809,6 +11737,22 @@
sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
};
}
+ {
+ name = "trim_trailing_lines___trim_trailing_lines_1.1.4.tgz";
+ path = fetchurl {
+ name = "trim_trailing_lines___trim_trailing_lines_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz";
+ sha1 = "bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0";
+ };
+ }
+ {
+ name = "trim___trim_0.0.1.tgz";
+ path = fetchurl {
+ name = "trim___trim_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz";
+ sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
+ };
+ }
{
name = "triple_beam___triple_beam_1.3.0.tgz";
path = fetchurl {
@@ -10817,6 +11761,14 @@
sha1 = "a595214c7298db8339eeeee083e4d10bd8cb8dd9";
};
}
+ {
+ 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 = "try_catch___try_catch_2.0.1.tgz";
path = fetchurl {
@@ -10834,11 +11786,19 @@
};
}
{
- name = "tslib___tslib_1.10.0.tgz";
+ name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
path = fetchurl {
- name = "tslib___tslib_1.10.0.tgz";
- url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz";
- sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a";
+ name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
+ url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
+ sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b";
+ };
+ }
+ {
+ name = "tslib___tslib_1.14.1.tgz";
+ path = fetchurl {
+ name = "tslib___tslib_1.14.1.tgz";
+ url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz";
+ sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00";
};
}
{
@@ -10889,14 +11849,6 @@
sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
};
}
- {
- name = "type_fest___type_fest_0.8.1.tgz";
- path = fetchurl {
- name = "type_fest___type_fest_0.8.1.tgz";
- url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz";
- sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
- };
- }
{
name = "type_is___type_is_1.6.18.tgz";
path = fetchurl {
@@ -10914,11 +11866,11 @@
};
}
{
- name = "type___type_2.0.0.tgz";
+ name = "type___type_2.1.0.tgz";
path = fetchurl {
- name = "type___type_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz";
- sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3";
+ name = "type___type_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz";
+ sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f";
};
}
{
@@ -10938,27 +11890,19 @@
};
}
{
- name = "uglify_js___uglify_js_2.8.29.tgz";
+ name = "uglify_js___uglify_js_3.11.6.tgz";
path = fetchurl {
- name = "uglify_js___uglify_js_2.8.29.tgz";
- url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz";
- sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+ name = "uglify_js___uglify_js_3.11.6.tgz";
+ url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz";
+ sha1 = "144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c";
};
}
{
- name = "uglify_js___uglify_js_3.7.7.tgz";
+ name = "uglify_js___uglify_js_3.12.2.tgz";
path = fetchurl {
- name = "uglify_js___uglify_js_3.7.7.tgz";
- url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz";
- sha1 = "21e52c7dccda80a53bf7cde69628a7e511aec9c9";
- };
- }
- {
- name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
- path = fetchurl {
- name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
- sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+ name = "uglify_js___uglify_js_3.12.2.tgz";
+ url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz";
+ sha1 = "c7ae89da0ed1bb58999c7fce07190b347fdbdaba";
};
}
{
@@ -10978,35 +11922,19 @@
};
}
{
- name = "ultron___ultron_1.1.1.tgz";
+ name = "umzug___umzug_2.3.0.tgz";
path = fetchurl {
- name = "ultron___ultron_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz";
- sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c";
+ name = "umzug___umzug_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz";
+ sha1 = "0ef42b62df54e216b05dcaf627830a6a8b84a184";
};
}
{
- name = "umzug___umzug_2.2.0.tgz";
+ name = "underscore___underscore_1.11.0.tgz";
path = fetchurl {
- name = "umzug___umzug_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz";
- sha1 = "6160bdc1817e4a63a625946775063c638623e62e";
- };
- }
- {
- name = "underscore___underscore_1.8.3.tgz";
- path = fetchurl {
- name = "underscore___underscore_1.8.3.tgz";
- url = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz";
- sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
- };
- }
- {
- name = "underscore___underscore_1.9.2.tgz";
- path = fetchurl {
- name = "underscore___underscore_1.9.2.tgz";
- url = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz";
- sha1 = "0c8d6f536d6f378a5af264a72f7bec50feb7cf2f";
+ name = "underscore___underscore_1.11.0.tgz";
+ url = "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz";
+ sha1 = "dd7c23a195db34267186044649870ff1bab5929e";
};
}
{
@@ -11018,35 +11946,59 @@
};
}
{
- name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
+ name = "underscore___underscore_1.8.3.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 = "underscore___underscore_1.8.3.tgz";
+ url = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz";
+ sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
};
}
{
- name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz";
+ name = "unherit___unherit_1.1.3.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 = "unherit___unherit_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz";
+ sha1 = "6c9b503f2b41b262330c80e91c8614abdaa69c22";
};
}
{
- name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+ name = "unified_args___unified_args_8.1.0.tgz";
path = fetchurl {
- name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz";
- sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277";
+ name = "unified_args___unified_args_8.1.0.tgz";
+ url = "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz";
+ sha1 = "a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5";
};
}
{
- name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz";
+ name = "unified_engine___unified_engine_8.0.0.tgz";
path = fetchurl {
- name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz";
- sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57";
+ name = "unified_engine___unified_engine_8.0.0.tgz";
+ url = "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.0.0.tgz";
+ sha1 = "e3996ff6eaecc6ca3408af92b70e25691192d17d";
+ };
+ }
+ {
+ name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz";
+ path = fetchurl {
+ name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz";
+ sha1 = "b4ab801ff93c251faa917a8d1c10241af030de84";
+ };
+ }
+ {
+ name = "unified_message_control___unified_message_control_3.0.1.tgz";
+ path = fetchurl {
+ name = "unified_message_control___unified_message_control_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz";
+ sha1 = "7018855daea9af96082cbea35970d48c9c4dbbf2";
+ };
+ }
+ {
+ name = "unified___unified_9.2.0.tgz";
+ path = fetchurl {
+ name = "unified___unified_9.2.0.tgz";
+ url = "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz";
+ sha1 = "67a62c627c40589edebbf60f53edfd4d822027f8";
};
}
{
@@ -11089,6 +12041,70 @@
sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c";
};
}
+ {
+ name = "unist_util_generated___unist_util_generated_1.1.6.tgz";
+ path = fetchurl {
+ name = "unist_util_generated___unist_util_generated_1.1.6.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz";
+ sha1 = "5ab51f689e2992a472beb1b35f2ce7ff2f324d4b";
+ };
+ }
+ {
+ name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz";
+ path = fetchurl {
+ name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz";
+ sha1 = "168c8770a99902318ca268f8c391e294bcf44540";
+ };
+ }
+ {
+ name = "unist_util_is___unist_util_is_4.0.3.tgz";
+ path = fetchurl {
+ name = "unist_util_is___unist_util_is_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz";
+ sha1 = "e8b44db55fc20c43752b3346c116344d45d7c91d";
+ };
+ }
+ {
+ name = "unist_util_position___unist_util_position_3.1.0.tgz";
+ path = fetchurl {
+ name = "unist_util_position___unist_util_position_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz";
+ sha1 = "1c42ee6301f8d52f47d14f62bbdb796571fa2d47";
+ };
+ }
+ {
+ name = "unist_util_remove_position___unist_util_remove_position_2.0.1.tgz";
+ path = fetchurl {
+ name = "unist_util_remove_position___unist_util_remove_position_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz";
+ sha1 = "5d19ca79fdba712301999b2b73553ca8f3b352cc";
+ };
+ }
+ {
+ 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 = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz";
+ path = fetchurl {
+ name = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz";
+ sha1 = "65a6ce698f78a6b0f56aa0e88f13801886cdaef6";
+ };
+ }
+ {
+ name = "unist_util_visit___unist_util_visit_2.0.3.tgz";
+ path = fetchurl {
+ name = "unist_util_visit___unist_util_visit_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz";
+ sha1 = "c3703893146df47203bb8a9795af47d7b971208c";
+ };
+ }
{
name = "universalify___universalify_0.1.2.tgz";
path = fetchurl {
@@ -11138,11 +12154,11 @@
};
}
{
- name = "uri_js___uri_js_4.2.2.tgz";
+ name = "uri_js___uri_js_4.4.0.tgz";
path = fetchurl {
- name = "uri_js___uri_js_4.2.2.tgz";
- url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
- sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
+ name = "uri_js___uri_js_4.4.0.tgz";
+ url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz";
+ sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602";
};
}
{
@@ -11194,11 +12210,11 @@
};
}
{
- name = "utf_8_validate___utf_8_validate_5.0.2.tgz";
+ name = "utf_8_validate___utf_8_validate_5.0.3.tgz";
path = fetchurl {
- name = "utf_8_validate___utf_8_validate_5.0.2.tgz";
- url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.2.tgz";
- sha1 = "63cfbccd85dc1f2b66cf7a1d0eebc08ed056bfb3";
+ name = "utf_8_validate___utf_8_validate_5.0.3.tgz";
+ url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz";
+ sha1 = "3b64e418ad2ff829809025fdfef595eab2f03a27";
};
}
{
@@ -11274,11 +12290,11 @@
};
}
{
- name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
path = fetchurl {
- name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
- sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe";
+ name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132";
};
}
{
@@ -11361,6 +12377,54 @@
sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
};
}
+ {
+ name = "vfile_location___vfile_location_3.2.0.tgz";
+ path = fetchurl {
+ name = "vfile_location___vfile_location_3.2.0.tgz";
+ url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz";
+ sha1 = "d8e41fbcbd406063669ebf6c33d56ae8721d0f3c";
+ };
+ }
+ {
+ 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_reporter___vfile_reporter_6.0.1.tgz";
+ path = fetchurl {
+ name = "vfile_reporter___vfile_reporter_6.0.1.tgz";
+ url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz";
+ sha1 = "45d4dc11df2e312196ea2ceb95e42a67fc8ce814";
+ };
+ }
+ {
+ name = "vfile_sort___vfile_sort_2.2.2.tgz";
+ path = fetchurl {
+ name = "vfile_sort___vfile_sort_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz";
+ sha1 = "720fe067ce156aba0b411a01bb0dc65596aa1190";
+ };
+ }
+ {
+ name = "vfile_statistics___vfile_statistics_1.1.4.tgz";
+ path = fetchurl {
+ name = "vfile_statistics___vfile_statistics_1.1.4.tgz";
+ url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz";
+ sha1 = "b99fd15ecf0f44ba088cc973425d666cb7a9f245";
+ };
+ }
+ {
+ name = "vfile___vfile_4.2.0.tgz";
+ path = fetchurl {
+ name = "vfile___vfile_4.2.0.tgz";
+ url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz";
+ sha1 = "26c78ac92eb70816b01d4565e003b7e65a2a0e01";
+ };
+ }
{
name = "visibilityjs___visibilityjs_1.2.8.tgz";
path = fetchurl {
@@ -11386,19 +12450,27 @@
};
}
{
- name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+ name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
path = fetchurl {
- name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
- sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+ name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+ sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd";
};
}
{
- name = "watchpack___watchpack_1.6.0.tgz";
+ name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz";
path = fetchurl {
- name = "watchpack___watchpack_1.6.0.tgz";
- url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz";
- sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00";
+ 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";
};
}
{
@@ -11426,19 +12498,11 @@
};
}
{
- name = "webpack_cli___webpack_cli_3.3.11.tgz";
+ name = "webpack_cli___webpack_cli_3.3.12.tgz";
path = fetchurl {
- name = "webpack_cli___webpack_cli_3.3.11.tgz";
- url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz";
- sha1 = "3bf21889bf597b5d82c38f215135a411edfdc631";
- };
- }
- {
- name = "webpack_log___webpack_log_2.0.0.tgz";
- path = fetchurl {
- name = "webpack_log___webpack_log_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz";
- sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f";
+ name = "webpack_cli___webpack_cli_3.3.12.tgz";
+ url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz";
+ sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a";
};
}
{
@@ -11458,11 +12522,11 @@
};
}
{
- name = "webpack___webpack_4.41.6.tgz";
+ name = "webpack___webpack_4.44.2.tgz";
path = fetchurl {
- name = "webpack___webpack_4.41.6.tgz";
- url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz";
- sha1 = "12f2f804bf6542ef166755050d4afbc8f66ba7e1";
+ name = "webpack___webpack_4.44.2.tgz";
+ url = "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz";
+ sha1 = "6bfe2b0af055c8b2d1e90ed2cd9363f841266b72";
};
}
{
@@ -11522,27 +12586,19 @@
};
}
{
- name = "window_size___window_size_0.1.0.tgz";
+ name = "winston_transport___winston_transport_4.4.0.tgz";
path = fetchurl {
- name = "window_size___window_size_0.1.0.tgz";
- url = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz";
- sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+ name = "winston_transport___winston_transport_4.4.0.tgz";
+ url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz";
+ sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59";
};
}
{
- name = "winston_transport___winston_transport_4.3.0.tgz";
+ name = "winston___winston_3.3.3.tgz";
path = fetchurl {
- name = "winston_transport___winston_transport_4.3.0.tgz";
- url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz";
- sha1 = "df68c0c202482c448d9b47313c07304c2d7c2c66";
- };
- }
- {
- name = "winston___winston_3.2.1.tgz";
- path = fetchurl {
- name = "winston___winston_3.2.1.tgz";
- url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz";
- sha1 = "63061377976c73584028be2490a1846055f77f07";
+ name = "winston___winston_3.3.3.tgz";
+ url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz";
+ sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170";
};
}
{
@@ -11562,19 +12618,11 @@
};
}
{
- name = "wordwrap___wordwrap_0.0.2.tgz";
+ name = "wordwrap___wordwrap_1.0.0.tgz";
path = fetchurl {
- name = "wordwrap___wordwrap_0.0.2.tgz";
- url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz";
- sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
- };
- }
- {
- 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 = "wordwrap___wordwrap_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
+ sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
};
}
{
@@ -11593,6 +12641,14 @@
sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09";
};
}
+ {
+ name = "wrapped___wrapped_1.0.1.tgz";
+ path = fetchurl {
+ name = "wrapped___wrapped_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz";
+ sha1 = "c783d9d807b273e9b01e851680a938c87c907242";
+ };
+ }
{
name = "wrappy___wrappy_1.0.2.tgz";
path = fetchurl {
@@ -11626,11 +12682,19 @@
};
}
{
- name = "ws___ws_3.3.3.tgz";
+ name = "ws___ws_7.4.0.tgz";
path = fetchurl {
- name = "ws___ws_3.3.3.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz";
- sha1 = "f1cf84fe2d5e901ebce94efaece785f187a228f2";
+ name = "ws___ws_7.4.0.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz";
+ sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7";
+ };
+ }
+ {
+ name = "ws___ws_6.1.4.tgz";
+ path = fetchurl {
+ name = "ws___ws_6.1.4.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz";
+ sha1 = "5b5c8800afab925e94ccb29d153c8d02c1776ef9";
};
}
{
@@ -11650,19 +12714,19 @@
};
}
{
- name = "xml_crypto___xml_crypto_1.4.0.tgz";
+ name = "xml_crypto___xml_crypto_2.0.0.tgz";
path = fetchurl {
- name = "xml_crypto___xml_crypto_1.4.0.tgz";
- url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-1.4.0.tgz";
- sha1 = "de1cec8cd31cbd689cd90d3d6e8a27d4ae807de7";
+ name = "xml_crypto___xml_crypto_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.0.0.tgz";
+ sha1 = "54cd268ad9d31930afcf7092cbb664258ca9e826";
};
}
{
- name = "xml_encryption___xml_encryption_1.0.0.tgz";
+ name = "xml_encryption___xml_encryption_1.2.1.tgz";
path = fetchurl {
- name = "xml_encryption___xml_encryption_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz";
- sha1 = "fe50d3bbbe2ae06876d6aa95aa3bf958284e1612";
+ name = "xml_encryption___xml_encryption_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.1.tgz";
+ sha1 = "e6d18817c4309fd07ca7793cca93c3fd06745baa";
};
}
{
@@ -11738,11 +12802,11 @@
};
}
{
- name = "xmldom___xmldom_0.2.1.tgz";
+ name = "xmldom___xmldom_0.4.0.tgz";
path = fetchurl {
- name = "xmldom___xmldom_0.2.1.tgz";
- url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz";
- sha1 = "cac9465066f161e1c3302793ea4dbe59c518274f";
+ name = "xmldom___xmldom_0.4.0.tgz";
+ url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz";
+ sha1 = "8771e482a333af44587e30ce026f0998c23f3830";
};
}
{
@@ -11778,11 +12842,11 @@
};
}
{
- name = "xss___xss_1.0.6.tgz";
+ name = "xss___xss_1.0.8.tgz";
path = fetchurl {
- name = "xss___xss_1.0.6.tgz";
- url = "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz";
- sha1 = "eaf11e9fc476e3ae289944a1009efddd8a124b51";
+ name = "xss___xss_1.0.8.tgz";
+ url = "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz";
+ sha1 = "32feb87feb74b3dcd3d404b7a68ababf10700535";
};
}
{
@@ -11826,43 +12890,27 @@
};
}
{
- name = "yargs_parser___yargs_parser_13.1.1.tgz";
+ name = "yallist___yallist_4.0.0.tgz";
path = fetchurl {
- name = "yargs_parser___yargs_parser_13.1.1.tgz";
- url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz";
- sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0";
+ name = "yallist___yallist_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz";
+ sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
};
}
{
- name = "yargs___yargs_13.2.4.tgz";
+ name = "yargs_parser___yargs_parser_13.1.2.tgz";
path = fetchurl {
- name = "yargs___yargs_13.2.4.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz";
- sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83";
+ 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___yargs_13.3.0.tgz";
+ name = "yargs___yargs_13.3.2.tgz";
path = fetchurl {
- name = "yargs___yargs_13.3.0.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz";
- sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83";
- };
- }
- {
- name = "yargs___yargs_3.10.0.tgz";
- path = fetchurl {
- name = "yargs___yargs_3.10.0.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz";
- sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
- };
- }
- {
- name = "yauzl___yauzl_2.4.1.tgz";
- path = fetchurl {
- name = "yauzl___yauzl_2.4.1.tgz";
- url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz";
- sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
+ name = "yargs___yargs_13.3.2.tgz";
+ url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz";
+ sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd";
};
}
{
@@ -11874,11 +12922,11 @@
};
}
{
- name = "zip_stream___zip_stream_1.2.0.tgz";
+ name = "zip_stream___zip_stream_4.0.4.tgz";
path = fetchurl {
- name = "zip_stream___zip_stream_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz";
- sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04";
+ name = "zip_stream___zip_stream_4.0.4.tgz";
+ url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz";
+ sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a";
};
}
];
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 27a2b47387..42b2c69f68 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -2744,11 +2744,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation {
- name = "xrandr-1.5.0";
+ name = "xrandr-1.5.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2";
- sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1";
+ url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz";
+ sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch b/third_party/nixpkgs/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch
new file mode 100644
index 0000000000..3675292f9c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch
@@ -0,0 +1,32 @@
+---
+ hw/xfree86/Makefile.am | 1 -
+ hw/xfree86/Makefile.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index 9aeaea1..dcca3b8 100644
+--- a/hw/xfree86/Makefile.am
++++ b/hw/xfree86/Makefile.am
+@@ -100,7 +100,6 @@ EXTRA_DIST = xorgconf.cpp
+
+ # Without logdir, X will post an error on the terminal and will not start
+ install-data-local:
+- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
+ if CYGWIN
+ $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
+ endif
+diff --git a/hw/xfree86/Makefile.in b/hw/xfree86/Makefile.in
+index c4fceee..74da8f1 100644
+--- a/hw/xfree86/Makefile.in
++++ b/hw/xfree86/Makefile.in
+@@ -1161,7 +1161,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \
+
+ # Without logdir, X will post an error on the terminal and will not start
+ install-data-local:
+- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
+ @CYGWIN_TRUE@ $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
+
+ install-exec-hook:
+--
+2.25.4
+
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 02dfb7ee1f..ddf0aacdf0 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
@@ -571,7 +571,7 @@ self: super:
attrs =
if (abiCompat == null || lib.hasPrefix abiCompat version) then
attrs_passed // {
- buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; patchPhase = ''
+ buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; postPatch = ''
for i in dri3/*.c
do
sed -i -e "s|#include |#include |" $i
@@ -626,6 +626,12 @@ self: super:
if (!isDarwin)
then {
outputs = [ "out" "dev" ];
+ patches = [
+ # The build process tries to create the specified logdir when building.
+ #
+ # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
+ ./dont-create-logdir-during-build.patch
+ ];
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
udev
@@ -642,6 +648,7 @@ self: super:
"--with-xkb-bin-directory=${self.xkbcomp}/bin"
"--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb"
"--with-xkb-output=$out/share/X11/xkb/compiled"
+ "--with-log-dir=/var/log"
"--enable-glamor"
] ++ lib.optionals stdenv.hostPlatform.isMusl [
"--disable-tls"
@@ -758,8 +765,8 @@ self: super:
];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ]
++ lib.optionals isDarwin [ self.libX11 self.xorgproto ];
- prePatch = ''
- sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp
+ postFixup = ''
+ substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc
'';
});
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index d4773075a2..4fc3f3304e 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -61,7 +61,7 @@ mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
mirror://xorg/individual/app/xprop-1.2.5.tar.bz2
-mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
+mirror://xorg/individual/app/xrandr-1.5.1.tar.xz
mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
mirror://xorg/individual/app/xset-1.2.4.tar.bz2
diff --git a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
index b0685d7f95..5777532d94 100644
--- a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "zookeeper";
- version = "3.4.13";
+ version = "3.6.2";
src = fetchurl {
- url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
+ url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
+ sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199";
};
buildInputs = [ makeWrapper jre ];
@@ -15,40 +15,28 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
- cp -R conf docs lib ${pname}-${version}.jar $out
+ cp -R conf docs lib $out
+ # Without this, zkCli.sh tries creating a log file in the Nix store.
+ substituteInPlace $out/conf/log4j.properties \
+ --replace 'INFO, RFAAUDIT' 'INFO, CONSOLE'
mkdir -p $out/bin
- cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
+ cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
patchShebangs $out/bin
substituteInPlace $out/bin/zkServer.sh \
--replace /bin/echo ${coreutils}/bin/echo
- for i in $out/bin/{zkCli,zkCleanup,zkServer}.sh; do
+ for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
wrapProgram $i \
--set JAVA_HOME "${jre}" \
--prefix PATH : "${bash}/bin"
done
chmod -x $out/bin/zkEnv.sh
-
- mkdir -p $out/share/zooinspector
- cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
-
- classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
- for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
- classpath="$classpath:$jar"
- done
-
- cat << EOF > $out/bin/zooInspector.sh
- #!${runtimeShell}
- cd $out/share/zooinspector
- exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector
- EOF
- chmod +x $out/bin/zooInspector.sh
'';
meta = with stdenv.lib; {
- homepage = "http://zookeeper.apache.org";
+ homepage = "https://zookeeper.apache.org";
description = "Apache Zookeeper";
license = licenses.asl20;
- maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
+ maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ztzg ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.0.nix b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix
similarity index 85%
rename from third_party/nixpkgs/pkgs/shells/bash/5.0.nix
rename to third_party/nixpkgs/pkgs/shells/bash/5.1.nix
index 7120910d79..8950e5f5b1 100644
--- a/third_party/nixpkgs/pkgs/shells/bash/5.0.nix
+++ b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix
@@ -1,9 +1,15 @@
-{ stdenv, buildPackages
-, fetchurl, binutils ? null, bison, util-linux
+{ stdenv
+, buildPackages
+, fetchurl
+, binutils ? null
+, bison
+, util-linux
-# patch for cygwin requires readline support
-, interactive ? stdenv.isCygwin, readline80 ? null
-, withDocs ? false, texinfo ? null
+ # patch for cygwin requires readline support
+, interactive ? stdenv.isCygwin
+, readline80 ? null
+, withDocs ? false
+, texinfo ? null
}:
with stdenv.lib;
@@ -11,21 +17,19 @@ with stdenv.lib;
assert interactive -> readline80 != null;
assert withDocs -> texinfo != null;
assert stdenv.hostPlatform.isDarwin -> binutils != null;
-
let
- upstreamPatches = import ./bash-5.0-patches.nix (nr: sha256: fetchurl {
- url = "mirror://gnu/bash/bash-5.0-patches/bash50-${nr}";
+ upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl {
+ url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}";
inherit sha256;
});
in
-
stdenv.mkDerivation rec {
name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
- version = "5.0";
+ version = "5.1";
src = fetchurl {
url = "mirror://gnu/bash/bash-${version}.tar.gz";
- sha256 = "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l";
+ sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc";
};
hardeningDisable = [ "format" ];
@@ -44,7 +48,7 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p0" "-T" ];
patches = upstreamPatches
- ++ [ ./pgrp-pipe-5.0.patch ];
+ ++ [ ./pgrp-pipe-5.1.patch ];
configureFlags = [
(if interactive then "--with-installed-readline" else "--disable-readline")
@@ -87,7 +91,8 @@ stdenv.mkDerivation rec {
rm -f $out/lib/bash/Makefile.inc
'';
- postFixup = if interactive
+ postFixup =
+ if interactive
then ''
substituteInPlace "$out/bin/bashbug" \
--replace '${stdenv.shell}' "$out/bin/bash"
@@ -101,7 +106,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/bash/";
description =
"GNU Bourne-Again Shell, the de facto standard shell on Linux" +
- (if interactive then " (for interactive use)" else "");
+ (if interactive then " (for interactive use)" else "");
longDescription = ''
Bash is the shell, or command language interpreter, that will
diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix
deleted file mode 100644
index 4315191d19..0000000000
--- a/third_party/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj")
-(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47")
-(patch "003" "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf")
-(patch "004" "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l")
-(patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav")
-(patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn")
-(patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p")
-(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf")
-(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d")
-(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn")
-(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c")
-(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9")
-(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm")
-(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx")
-(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
-(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")
-(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc")
-(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw")
-]
diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix
new file mode 100644
index 0000000000..b834deda0f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix
@@ -0,0 +1,8 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b")
+(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
+(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
+(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
+]
diff --git a/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch b/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch
rename to third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
index 4496169619..1774a1c667 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.23.0";
+ version = "0.24.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4";
+ sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd";
};
- cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0";
+ cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 8fbbfd47fb..38236c117e 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2020-11-26";
+ version = "2020-12-16";
pname = "oh-my-zsh";
- rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3";
+ rev = "b28665aebb4c1b07a57890eb59551bc51d0acf37";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs=";
+ sha256 = "00m8d992jhbkd8mhm6zhirk9ga3dfzhh8idn2yp40yk7wdbzrd74";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index c8e845eec9..7e39e6779d 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "powerlevel10k";
- version = "1.14.3";
+ version = "1.14.4";
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v${version}";
- sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7";
+ sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix
index 8746f065b1..f45e981cff 100644
--- a/third_party/nixpkgs/pkgs/test/default.nix
+++ b/third_party/nixpkgs/pkgs/test/default.nix
@@ -39,6 +39,7 @@ with pkgs;
cross = callPackage ./cross {};
rustCustomSysroot = callPackage ./rust-sysroot {};
+ buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };
nixos-functions = callPackage ./nixos-functions {};
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
index 2a8d5ab5e7..4f28a6d744 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.18.191"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.18.203"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "1zsb9w0bpbwq093ydbh4b5r3287b5l9mrdx549vsv0rspmkr0d7c";
+ sha256 = "sha256-afcXbYKRc9w0Zbuyg/bDA/J/lHm4N4FttUgGk4h4H4k=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
index 81389f39dd..59b22f48f9 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
- version = "2.15.1";
+ version = "2.16.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d";
+ sha256 = "wuHPNpt5pizgAwxRxJpRBiX6keJpKRpHu6M5BpFUyeY=";
};
# put packages that needs to be overriden in the py package scope
diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
index 29787cfb17..f5f661c8e9 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -6,7 +6,8 @@ let
prePatch = (attrs.prePatch or "") + ''
rm -f azure_bdist_wheel.py tox.ini
substituteInPlace setup.py \
- --replace "wheel==0.30.0" "wheel"
+ --replace "wheel==0.30.0" "wheel" \
+ --replace "cryptography>=2.3.1,<3.0.0" "cryptography"
sed -i "/azure-namespace-package/c\ " setup.cfg
'';
@@ -148,8 +149,8 @@ let
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
- azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip"
- "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5";
+ azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip"
+ "1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz";
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip"
"0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy";
@@ -196,8 +197,8 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
- azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip"
- "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78";
+ azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip"
+ "0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
@@ -205,8 +206,8 @@ let
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip"
"18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh";
- azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "12.0.0" "zip"
- "150074lnld426lv37v4gy41cqqvj57zw4mrz5svv7iynljb2jl3l";
+ azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "13.0.0" "zip"
+ "02ac54fs4wqdwy986j9qyx6fbl5zmpkh1sykr9r6mqk1xx9l4jq8";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
"1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
@@ -241,8 +242,8 @@ let
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
"1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
- azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip"
- "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy";
+ azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip"
+ "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf";
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip"
"1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77";
@@ -256,8 +257,8 @@ let
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
- azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
- "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
+ azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip"
+ "10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip"
"1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb";
@@ -392,19 +393,6 @@ let
'';
});
- cryptography = super.cryptography.overridePythonAttrs(oldAttrs: rec {
- version = "2.9.2";
-
- src = super.fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0";
- };
-
- # prevent cycle with cryptography-vectors
- doCheck = false;
- });
-
knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.7.2";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix b/third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
index 6cc69c2290..e6b909a0a5 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/dehydrated/default.nix
@@ -1,13 +1,13 @@
{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
pname = "dehydrated";
- version = "0.6.5";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "lukas2511";
repo = "dehydrated";
rev = "v${version}";
- sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";
+ sha256 = "09jhmkjvnj98zbf92qwdr5rr7pc6v63xzyk2fbi177r7szb2yg09";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index c375b0987d..6f38b14f44 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.33.0";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "1rhiak1264czcww5ayz35am9nsn5xa3kjd90szssg46ngxisd61x";
+ sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19";
};
- vendorSha256 = "1s9xhq1k67gf9saada1dr95n1sd265hndkxz0alqw6dm2vdp3n2q";
+ vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
index 36a1cf97a1..c2e6a4479a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.21.0";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "12z5mbw7yzhyhzl6499xlhzpgysarjql4qlrpmwfpb8ij1hk8q6i";
+ sha256 = "1hxr5w8cd6f967cvhgqd3pvl8dlx2hb0pvjslzzbrs65djf8zh3k";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
index 18ec4ba463..e270e7a4c4 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lego";
- version = "4.0.1";
+ version = "4.1.3";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
- sha256 = "1s3sh4n12g7ylkpmxqjcpdw3gqhdjbh9r09h2rsrm30xr4qaqpng";
+ sha256 = "05fy6826n449adlglwi8s31km4yhd8hbd9yml8k204cb81w00zyk";
};
vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
index 4e87a68866..6c105cf9b3 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
@@ -31,14 +31,14 @@ in
buildPythonApplication rec {
pname = "lexicon";
- version = "3.4.3";
+ version = "3.5.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "AnalogJ";
repo = pname;
rev = "v${version}";
- sha256 = "1ym4gj4xyd69rsc5niilvcb72gys22rjxhj4qd574vyx3ryl34za";
+ sha256 = "1jsc2ybbf3mbvgzkgliria494dpj23mgqnw2lh43cnd9rgsjvzn3";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
index 9bff8332c3..0a079c5107 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.8";
+ version = "4.9";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
+ sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
index fd53cd9b54..022c05a4c6 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }:
+{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
+ coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
stdenv.mkDerivation rec {
version = "0.5.4.14";
@@ -11,9 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ];
buildInputs = [ gtk3 intltool libxslt ];
+ postFixup = ''
+ wrapProgram $out/bin/xarchiver \
+ --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
+ '';
+
meta = {
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
homepage = "https://github.com/ib/xarchiver";
diff --git a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
new file mode 100644
index 0000000000..9d674dcfe4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, gtest, boost, gd, libsndfile, libmad, libid3tag }:
+
+stdenv.mkDerivation rec {
+ pname = "audiowaveform";
+ version = "1.4.2";
+
+ src = fetchFromGitHub {
+ owner = "bbc";
+ repo = "audiowaveform";
+ rev = version;
+ sha256 = "0k2s2f2hgq4pnjzfkgvjwgsflihmzdq7shicfjn0z2mzw4d1bvp2";
+ };
+
+ nativeBuildInputs = [ cmake gtest ];
+
+ buildInputs = [ boost gd libsndfile libmad libid3tag ];
+
+ preConfigure = ''
+ ln -s ${gtest.src}/googletest googletest
+ ln -s ${gtest.src}/googlemock googlemock
+ '';
+
+ # One test is failing, see PR #101947
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "C++ program to generate waveform data and render waveform images from audio files";
+ longDescription = ''
+ audiowaveform is a C++ command-line application that generates waveform data from either MP3, WAV, FLAC, or Ogg Vorbis format audio files.
+ Waveform data can be used to produce a visual rendering of the audio, similar in appearance to audio editing applications.
+ '';
+ homepage = "https://github.com/bbc/audiowaveform";
+ changelog = "https://github.com/bbc/audiowaveform/blob/${version}/ChangeLog";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edbentley ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix
index 2a55015be1..1965fb0831 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/volctl/default.nix
@@ -1,43 +1,49 @@
-{ stdenv, fetchFromGitHub, python3, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
+{ stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }:
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "volctl";
- version = "0.6.3";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "buzz";
repo = pname;
- rev = version;
- sha256 = "0rppqc5wiqxd83z2mgvhi6gdx7yhy9wnav1dbbi1wvm7lzw6fnil";
+ rev = "v${version}";
+ sha256 = "02scfscf4mdrphzrd7cbwbhpig9bhvaws8qk4zc81z8vvf3mcfv2";
};
+ postPatch = ''
+ substituteInPlace volctl/lib/xwrappers.py \
+ --replace 'libXfixes.so' "${xorg.libXfixes}/lib/libXfixes.so" \
+ --replace 'libXfixes.so.3' "${xorg.libXfixes}/lib/libXfixes.so.3"
+ '';
+
+ preBuild = ''
+ export LD_LIBRARY_PATH=${libpulseaudio}/lib
+ '';
+
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
];
- buildInputs = [
- glib
- gtk3
- libpulseaudio
- ];
-
- pythonPath = with python3.pkgs; [
+ propagatedBuildInputs = [ pango gtk3 ] ++ (with python3Packages; [
+ click
+ pycairo
pygobject3
- ];
+ pyyaml
+ ]);
+ # with strictDeps importing "gi.repository.Gtk" fails with "gi.RepositoryError: Typelib file for namespace 'Pango', version '1.0' not found"
strictDeps = false;
- preBuild = ''
- export LD_LIBRARY_PATH=${libpulseaudio}/lib
- '';
+ # no tests included
+ doCheck = false;
+
+ pythonImportsCheck = [ "volctl" ];
preFixup = ''
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
-
- gappsWrapperArgs+=(
- --prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib"
- )
+ gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib")
'';
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
index 25e72c1b88..e954163b9e 100644
--- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "blueberry";
- version = "1.3.9";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9";
+ sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
index cd6c430218..d9ae2cb746 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "android-file-transfer";
- version = "4.0";
+ version = "4.1";
src = fetchFromGitHub {
owner = "whoozle";
repo = "android-file-transfer-linux";
rev = "v${version}";
- sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
+ sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k";
};
nativeBuildInputs = [ cmake readline pkgconfig ];
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
index ee2af363a5..5b2a4e3224 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -6,13 +6,13 @@ assert fuseSupport -> fuse3 != null;
stdenv.mkDerivation {
pname = "bcachefs-tools";
- version = "2020-08-25";
+ version = "2020-11-17";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
- rev = "487ddeb03c574e902c5b749b4307e87e2150976a";
- sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";
+ rev = "41bec63b265a38dd9fa168b6042ea5bf07135048";
+ sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj";
};
postPatch = ''
@@ -22,11 +22,7 @@ stdenv.mkDerivation {
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
'';
- enableParallelBuilding = true;
-
- nativeBuildInputs = [
- pkgconfig
- ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libuuid libscrypt libsodium keyutils liburcu zlib libaio
@@ -34,22 +30,14 @@ stdenv.mkDerivation {
] ++ stdenv.lib.optional fuseSupport fuse3;
doCheck = false; # needs bcachefs module loaded on builder
-
- checkFlags = [
- "BCACHEFS_TEST_USE_VALGRIND=no"
- ];
-
- checkInputs = [
- valgrind
- ];
+ checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
+ checkInputs = [ valgrind ];
preCheck = stdenv.lib.optionalString fuseSupport ''
rm tests/test_fuse.py
'';
- installFlags = [
- "PREFIX=${placeholder "out"}"
- ];
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "Tool for managing bcachefs filesystems";
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
index 469ed6fdf3..f846bf1f20 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "e2fsprogs";
- version = "1.45.5";
+ version = "1.45.6";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1n8ffss5044j9382rlvmhyr1f6kmnfjfbv6q4jbbh8gfdwpjmrwi";
+ sha256 = "sha256-X2SsUKK2C45nxbOCuxN97Dk0QBcQPK/8OmFVRCTy1pM=";
};
outputs = [ "bin" "dev" "out" "man" "info" ];
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
index f495b56e32..a4e6bc1182 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,25 +1,17 @@
-{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
+{stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc
}:
let
- s =
- rec {
- baseName="glusterfs";
- # NOTE: On each glusterfs release, it should be checked if gluster added
- # new, or changed, Python scripts whose PYTHONPATH has to be set in
- # `postFixup` below, and whose runtime deps need to go into
- # `nativeBuildInputs`.
- # The command
- # find /nix/store/...-glusterfs-.../ -name '*.py' -executable
- # can help with finding new Python scripts.
- version = "7.6";
- name="${baseName}-${version}";
- url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
- sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih";
- };
+ # NOTE: On each glusterfs release, it should be checked if gluster added
+ # new, or changed, Python scripts whose PYTHONPATH has to be set in
+ # `postFixup` below, and whose runtime deps need to go into
+ # `nativeBuildInputs`.
+ # The command
+ # find /nix/store/...-glusterfs-.../ -name '*.py' -executable
+ # can help with finding new Python scripts.
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
@@ -60,16 +52,17 @@ let
which # which
xfsprogs # xfs_info
];
-in
-stdenv.mkDerivation
-{
- inherit (s) name version;
- inherit buildInputs propagatedBuildInputs;
+in stdenv.mkDerivation rec {
+ pname = "glusterfs";
+ version = "8.3";
- patches = [
- # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
- ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
- ];
+ src = fetchFromGitHub {
+ owner = "gluster";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az";
+ };
+ inherit buildInputs propagatedBuildInputs;
postPatch = ''
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
@@ -91,7 +84,7 @@ stdenv.mkDerivation
# but fails when the version is empty.
# See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
preConfigure = ''
- echo "v${s.version}" > VERSION
+ echo "v${version}" > VERSION
./autogen.sh
export PYTHON=${python3}/bin/python
'';
@@ -109,7 +102,7 @@ stdenv.mkDerivation
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
- '';
+ '';
postFixup = ''
# glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands.
@@ -153,7 +146,7 @@ stdenv.mkDerivation
wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
wrapProgram $out/libexec/glusterfs/glusterfind/brickfind.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
wrapProgram $out/libexec/glusterfs/glusterfind/changelog.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
- '';
+ '';
doInstallCheck = true;
@@ -187,12 +180,7 @@ stdenv.mkDerivation
rm -r $out/bin/conf.py
'';
- src = fetchurl {
- inherit (s) url sha256;
- };
-
meta = with stdenv.lib; {
- inherit (s) version;
description = "Distributed storage system";
homepage = "https://www.gluster.org";
license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
deleted file mode 100644
index f08d73cf3a..0000000000
--- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
-Date: Wed, 27 Sep 2017 21:36:41 +0200
-Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of
- localstatedir". Fixes #1489610
-
-Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f87d8a454..b4d3f5d10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then
- exec_prefix="$(eval echo $prefix)"
- fi
- GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs"
--GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
-+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd"
- prefix=$old_prefix
- exec_prefix=$old_exec_prefix
-
---
-2.12.0
-
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
index e2cb603ca3..e0bb39a6f0 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
@@ -3,7 +3,7 @@
, fetchpatch
, cmake
, makeWrapper
-, python2
+, python3
, db
, fuse
, asciidoc
@@ -16,43 +16,27 @@
, judy
, pam
, spdlog
+, fmt
+, systemdMinimal
, zlib # optional
}:
stdenv.mkDerivation rec {
pname = "lizardfs";
- version = "3.12.0";
+ version = "3.13.0-rc3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "v${version}";
- sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
+ rev = version;
+ sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
};
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
- buildInputs =
- [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
- zlib boost judy pam spdlog python2
- ];
-
- patches = [
- # Use system-provided spdlog instead of downloading an old one (next two patches)
- (fetchpatch {
- url = "https://salsa.debian.org/debian/lizardfs/raw/d003c371/debian/patches/system-spdlog.patch";
- sha256 = "1znpqqzb0k5bb7s4d7abfxzn5ry1khz8r76sb808c95cpkw91a9i";
- })
- (fetchpatch {
- url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch";
- sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md";
- })
- # Fix https://github.com/lizardfs/lizardfs/issues/655
- # (Remove upon update to 3.13)
- (fetchpatch {
- url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
- sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
- })
+ buildInputs = [
+ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
+ zlib boost judy pam spdlog fmt python3 systemdMinimal
];
meta = with stdenv.lib; {
@@ -60,6 +44,6 @@ stdenv.mkDerivation rec {
description = "A highly reliable, scalable and efficient distributed file system";
platforms = platforms.linux;
license = licenses.gpl3;
- maintainers = [ maintainers.rushmorem ];
+ maintainers = with maintainers; [ rushmorem shamilton ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
index 89516d525a..456444f3bf 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,14 +1,30 @@
-{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
+{ stdenv
+, lib
+, autoreconfHook
+, gnused
+, boost
+, fuse
+, log4cxx
+, zookeeper
+, zookeeper_mt
+}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "zkfuse";
- inherit (zookeeper) version src;
+ inherit (zookeeper_mt) version src;
- sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
+ sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook gnused ];
buildInputs = [ zookeeper_mt log4cxx boost fuse ];
+ postPatch = ''
+ # Make the async API accessible, and use the proper include path.
+ sed -i src/zkadapter.h \
+ -e '/"zookeeper\.h"/i#define THREADED' \
+ -e 's,"zookeeper\.h",,'
+ '';
+
installPhase = ''
mkdir -p $out/bin
cp -v src/zkfuse $out/bin
@@ -16,7 +32,7 @@ stdenv.mkDerivation {
meta = with lib; {
platforms = platforms.linux;
- maintainers = with maintainers; [ cstrahan ];
+ maintainers = with maintainers; [ cstrahan ztzg ];
license = licenses.asl20;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix
new file mode 100644
index 0000000000..4e74d2c443
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, cmake, python3, git }:
+
+stdenv.mkDerivation rec {
+ pname = "directx-shader-compiler";
+ version = "1.5.2010";
+
+ # Put headers in dev, there are lot of them which aren't necessary for
+ # using the compiler binary.
+ outputs = [ "out" "dev" ];
+
+ src = fetchFromGitHub {
+ owner = "microsoft";
+ repo = "DirectXShaderCompiler";
+ rev = "v${version}";
+ sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj";
+ # We rely on the side effect of leaving the .git directory here for the
+ # version-grabbing functionality of the build system.
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake git python3 ];
+
+ configurePhase = ''
+ # Requires some additional flags to cmake from a file in the repo
+ additionalCMakeFlags=$(< utils/cmake-predefined-config-params)
+ cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}"
+ cmakeConfigurePhase
+ '';
+
+ # The default install target installs heaps of LLVM stuff.
+ #
+ # Upstream issue: https://github.com/microsoft/DirectXShaderCompiler/issues/3276
+ #
+ # The following is based on the CI script:
+ # https://github.com/microsoft/DirectXShaderCompiler/blob/master/appveyor.yml#L63-L66
+ installPhase = ''
+ mkdir -p $out/bin $out/lib $dev/include
+ mv bin/dxc* $out/bin/
+ mv lib/libdxcompiler.so* lib/libdxcompiler.*dylib $out/lib/
+ cp -r $src/include/dxc $dev/include/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A compiler to compile HLSL programs into DXIL and SPIR-V";
+ homepage = "https://github.com/microsoft/DirectXShaderCompiler";
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.ncsa;
+ maintainers = with maintainers; [ expipiplus1 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
index ce2a87981e..26dec6d42c 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix
@@ -20,11 +20,11 @@ let
in
(if withQt then mkDerivation else stdenv.mkDerivation) rec {
pname = "gnuplot";
- version = "5.4.0";
+ version = "5.4.1";
src = fetchurl {
url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz";
- sha256 = "0iwwliq5a6qcawbpxk4d7l17fpkq9xxcz05kwblx37rr7bq84h7b";
+ sha256 = "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb";
};
nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
index a65f5ce455..cdec842700 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation {
--replace /usr/bin/vimdot $out/bin/vimdot \
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = "https://graphviz.org";
description = "Graph visualization tools";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix
index 945f4c61f1..6dad6173ed 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "cod";
version = "unstable-2020-09-10";
- goPackagePath = "cod";
-
src = fetchFromGitHub {
owner = "dim-an";
repo = pname;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
index 76c868f9b5..b910f3f969 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "161";
+ version = "163";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4=";
+ sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE=";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix
index 050dcf2955..185b97d727 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
- version = "2.25.0";
+ version = "2.25.1";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "00bvznswmz08s2jqpz5xxmkqggd06h6g8cwk242aaih6qajxfpsn";
+ sha256 = "0bwr7zdzjm5p6bjyzafc2n57y83f0pv2bmj99rhi8f94hhfydlsf";
};
# we have no bash at the moment for windows
diff --git a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
index 8522256c7d..e53f020fc6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
@@ -1,17 +1,17 @@
-{ buildGoPackage, fetchFromGitHub, stdenv, docker }:
+{ buildGoModule, fetchFromGitHub, stdenv, docker }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "docker-ls";
- version = "0.3.2";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "mayflower";
repo = "docker-ls";
rev = "v${version}";
- sha256 = "1hb9b0jhaf01zlmkm353mz608kwb79dzic3gvb2fhyrh8d17w2iv";
+ sha256 = "sha256-VyVrCBdIZAQ+p0leD6i4sMxD4p6nEXG9Si+nJGdUQPM=";
};
- goPackagePath = "github.com/mayflower/docker-ls";
+ vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU=";
meta = with stdenv.lib; {
description = "Tools for browsing and manipulating docker registries";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix
index 29456f54cd..ed8a11e182 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
homepage = "https://github.com/muesli/duf/";
description = "Disk Usage/Free Utility";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ petabyteboy penguwin ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix
index 465e30e761..d1d6bc1cb1 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix
@@ -2,17 +2,31 @@
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
- version = "2.7";
+ version = "3.0";
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
rev = "v${version}";
- sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31";
+ sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln";
};
- checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ];
- propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa ];
+ checkInputs = with python3.pkgs;
+ [ flake8 flake8-future-import flake8-import-order openssl ];
+ propagatedBuildInputs = with python3.pkgs;
+ [ pyserial pyaes ecdsa reedsolo bitstring cryptography ];
+
+ # wrapPythonPrograms will overwrite esptool.py with a bash script,
+ # but espefuse.py tries to import it. Since we don't add any binary paths,
+ # use patchPythonScript directly.
+ dontWrapPythonPrograms = true;
+ postFixup = ''
+ buildPythonPath "$out $pythonPath"
+ for f in $out/bin/*.py; do
+ echo "Patching $f"
+ patchPythonScript "$f"
+ done
+ '';
meta = with stdenv.lib; {
description = "ESP8266 and ESP32 serial bootloader utility";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
index d593d677cc..f84b0096d0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
@@ -1,5 +1,5 @@
{
- stdenv,
+ clangStdenv,
fetchFromGitHub,
opencl-headers,
cmake,
@@ -16,7 +16,11 @@
cli11
}:
-stdenv.mkDerivation rec {
+# Note that this requires clang < 9.0 to build, and currently
+# clangStdenv provides clang 7.1 which satisfies the requirement.
+let stdenv = clangStdenv;
+
+in stdenv.mkDerivation rec {
pname = "ethminer";
version = "0.18.0";
@@ -71,8 +75,5 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
- # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues.
- broken = true;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fbcat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fbcat/default.nix
new file mode 100644
index 0000000000..4f640f13a2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/fbcat/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub } :
+
+stdenv.mkDerivation rec {
+ pname = "fbcat";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "jwilk";
+ repo = pname;
+ rev = version;
+ sha256 = "08y79br4a4cgkjnslw0hw57441ybsapaw7wjdbak19mv9lnl5ll9";
+ };
+
+ # hardcoded because makefile target "install" depends on libxslt dependencies from network
+ # that are just too hard to monkeypatch here
+ # so this is the simple fix.
+ installPhase = ''
+ mkdir -p $out
+ install -d $out/bin
+ install -m755 fbcat $out/bin/
+ install -m755 fbgrab $out/bin/
+ install -d $out/share/man/man1
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://jwilk.net/software/fbcat";
+ description = "Framebuffer screenshot tool";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.matthiasbeyer ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
index 9c42a2c0a9..13c630718b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
- html-proofer (3.17.4)
+ html-proofer (3.18.2)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
index d4c9a5367d..49f7726fc8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wjwr7c19dr7rai44ypqghbakgav91h9swg88cddn7rxf7a6vl3b";
+ sha256 = "06vbbm8qdmw4955522zh9wqn2214ajsf70y0vymxgl7dlwjd2pz0";
type = "gem";
};
- version = "3.17.4";
+ version = "3.18.2";
};
mercenary = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix
index da6fa0a338..c3cb3200e0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lf";
- version = "17";
+ version = "18";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
+ sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
};
- vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
+ vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix
index 2acd5a789a..706b66d998 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix
@@ -7,25 +7,24 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
- sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj";
+ sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2";
};
- cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q";
+ cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}}
'';
- checkFlags = stdenv.lib.optionals stdenv.isDarwin [
- "--skip meta::filetype::test::test_socket_type"
- ];
+ # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+ doCheck = false;
passthru.tests = { inherit (nixosTests) lsd; };
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix
index ef35383211..68a2b877c9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
- sha256 = "1biahx4bji8kasqcxnixnpmfx3qwwibw1vdd172px3i75pbyybqn";
+ sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy";
};
postInstall = ''
@@ -20,11 +20,12 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish
'';
- cargoSha256 = "139pdhrqgl0ai94w2c948aal1j73qw4jxxdd4gxn4apglbnma1xz";
+ cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax";
meta = with stdenv.lib; {
homepage = "https://github.com/cantino/mcfly";
description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now";
+ changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt";
license = licenses.mit;
maintainers = [ maintainers.melkor333 ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix
index 8d71f75622..7e824cf90c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchzip }:
buildGoModule rec {
pname = "mutagen";
@@ -13,10 +13,26 @@ buildGoModule rec {
vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";
+ agents = fetchzip {
+ name = "mutagen-agents-${version}";
+ # The package architecture does not matter since all packages contain identical mutagen-agents.tar.gz.
+ url = "https://github.com/mutagen-io/mutagen/releases/download/v${version}/mutagen_linux_amd64_v${version}.tar.gz";
+ stripRoot = false;
+ extraPostFetch = ''
+ rm $out/mutagen # Keep only mutagen-agents.tar.gz.
+ '';
+ sha256 = "0k8iif09kvxfxx6qm5qmkf3lr7ar6i98ivkndimj680ah9v1hkj8";
+ };
+
doCheck = false;
subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
+ postInstall = ''
+ install -d $out/libexec
+ ln -s ${agents}/mutagen-agents.tar.gz $out/libexec/
+ '';
+
meta = with lib; {
description = "Make remote development work with your local tools";
homepage = "https://mutagen.io/";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix
new file mode 100644
index 0000000000..2c10c9fbfb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix
@@ -0,0 +1,47 @@
+{ fetchFromGitHub
+, stdenv
+, ncurses, neovim, procps
+, pandoc, lua51Packages, util-linux
+}:
+
+stdenv.mkDerivation rec {
+ pname = "nvimpager";
+ version = "0.9";
+
+ src = fetchFromGitHub {
+ owner = "lucc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va";
+ };
+
+ buildInputs = [
+ ncurses # for tput
+ procps # for nvim_get_proc() which uses ps(1)
+ ];
+ nativeBuildInputs = [ pandoc ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+ buildFlags = [ "nvimpager.configured" ];
+ preBuild = ''
+ patchShebangs nvimpager
+ substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim'
+ '';
+
+ doCheck = true;
+ checkInputs = [ lua51Packages.busted util-linux neovim ];
+ checkPhase = ''script -c "busted --lpath './?.lua' test"'';
+
+ meta = with stdenv.lib; {
+ description = "Use neovim as pager";
+ longDescription = ''
+ Use neovim as a pager to view manpages, diffs, etc with nvim's syntax
+ highlighting. Includes a cat mode to print highlighted files to stdout
+ and a ansi esc mode to highlight ansi escape sequences in neovim.
+ '';
+ homepage = "https://github.com/lucc/nvimpager";
+ license = licenses.bsd2;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.lucc ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
index ebe99eca8c..0d5adcdb52 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "osm2pgsql";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = pname;
rev = version;
- sha256 = "1dsyhcifixmcw05qxjald02pml0zfdij81pgy9yh8p00v0rqq57x";
+ sha256 = "1if76vw9jkc9jn4v0vvgwnpscjckk2cap93a8iqah8mqzx233y8s";
};
nativeBuildInputs = [ cmake ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "OpenStreetMap data to PostgreSQL converter";
- homepage = "https://github.com/openstreetmap/osm2pgsql";
+ homepage = "https://osm2pgsql.org";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ jglukasik das-g ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix b/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix
index e0b54e5608..dcd06ce1d2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix
@@ -4,8 +4,8 @@ with ocamlPackages;
janePackage {
pname = "patdiff";
- hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz";
- buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ];
+ hash = "1yslj6xxyv8rx8y5s1civ1zq8y6vvxmkszdds958zdm1p1ign54r";
+ buildInputs = [ core patience_diff ocaml_pcre ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};
diff --git a/third_party/nixpkgs/pkgs/tools/misc/picocom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/picocom/default.nix
index 5dd83c4887..1db8d00a90 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/picocom/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/picocom/default.nix
@@ -1,36 +1,48 @@
-{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }:
-
-assert stdenv.isDarwin -> IOKit != null;
-
-with stdenv.lib;
+{ stdenv
+, fetchFromGitHub
+, installShellFiles
+, lrzsz
+, IOKit
+}:
stdenv.mkDerivation rec {
pname = "picocom";
- version = "3.1";
+ # last tagged release is 3.1 but 3.2 is still considered a release
+ version = "3.2a";
+ # upstream is quiet as the original author is no longer active since March 2018
src = fetchFromGitHub {
owner = "npat-efault";
repo = "picocom";
- rev = version;
- sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n";
+ rev = "1acf1ddabaf3576b4023c4f6f09c5a3e4b086fb8";
+ sha256 = "sha256-cs2bxqZfTbnY5d+VJ257C5hssaFvYup3tBKz68ROnAo=";
};
- buildInputs = [ makeWrapper ]
- ++ optionals stdenv.isDarwin [ IOKit ];
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '.picocom_history' '.cache/picocom_history'
- installPhase = ''
- mkdir -p $out/bin $out/share/man/man1
- cp picocom $out/bin
- cp picocom.1 $out/share/man/man1
-
- wrapProgram $out/bin/picocom \
- --prefix PATH ":" "${lrzsz}/bin"
+ substituteInPlace picocom.c \
+ --replace '"rz -vv"' '"${lrzsz}/bin/rz -vv"' \
+ --replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"'
'';
- meta = {
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
+
+ installPhase = ''
+ install -Dm555 -t $out/bin picocom
+ installManPage picocom.1
+ installShellCompletion --bash bash_completion/picocom
+ '';
+
+ meta = with stdenv.lib; {
description = "Minimal dumb-terminal emulation program";
homepage = "https://github.com/npat-efault/picocom/";
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix
new file mode 100644
index 0000000000..11db08dd97
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, maven, jdk }:
+
+let
+ version = "1.2020.14";
+
+ src = fetchFromGitHub {
+ owner = "plantuml";
+ repo = "plantuml-server";
+ rev = "v${version}";
+ sha256 = "08g6ddpkly5yhjhw7gpsanyspar1752jy9cypwxsqrdzqrv738b8";
+ };
+
+ # perform fake build to make a fixed-output derivation out of the files downloaded from maven central
+ deps = stdenv.mkDerivation {
+ name = "plantuml-server-${version}-deps";
+ inherit src;
+ buildInputs = [ jdk maven ];
+ buildPhase = ''
+ while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do
+ echo "timeout, restart maven to continue downloading"
+ done
+ '';
+ # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+ installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1wwgyjalhlj5azggs9vvsrr54pg7gl8p36pgf6pk12rsszzl7a97";
+ };
+in
+
+stdenv.mkDerivation rec {
+ pname = "plantuml-server";
+ inherit version;
+ inherit src;
+
+ buildInputs = [ jdk maven ];
+
+ buildPhase = ''
+ # 'maven.repo.local' must be writable so copy it out of nix store
+ cp -R $src repo
+ chmod +w -R repo
+ cd repo
+ mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+ '';
+
+ installPhase = ''
+ mkdir -p "$out/webapps"
+ cp "target/plantuml.war" "$out/webapps/plantuml.war"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A web application to generate UML diagrams on-the-fly.";
+ homepage = "https://plantuml.com/";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ truh ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
index b5eba51a5d..742e62230d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2020.21";
+ version = "1.2020.22";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "0hf2s3k6v57d51k72jjciakdmlgdrdg4aa7z5hchy74gchsp3x17";
+ sha256 = "10s2a5z903k1nhq6zdvj4wfms5ma4ldhq9330nnnkdzhbxdp14yx";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix b/third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
index e70b8274d3..69d11ab345 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/q-text-as-data/default.nix
@@ -1,26 +1,32 @@
-{ stdenvNoCC, fetchFromGitHub, python2 }:
+{ lib, fetchFromGitHub, python3Packages }:
-stdenvNoCC.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
pname = "q-text-as-data";
- version = "1.7.4";
+ version = "2.0.19";
src = fetchFromGitHub {
owner = "harelba";
repo = "q";
rev = version;
- sha256 = "0p8rbfwwcqjyrix51v52zp9b03z4xg1fv2raf2ygqp9a4l27dca8";
+ sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv";
};
- buildInputs = [ python2 ];
- dontBuild = true;
+ propagatedBuildInputs = with python3Packages; [
+ setuptools
+ six
+ ];
- installPhase = ''
- mkdir -p $out/bin
- cp bin/q $out/bin
- chmod +x $out/bin/q
+ doCheck = false;
+
+ patchPhase = ''
+ # remove broken symlink
+ rm bin/qtextasdata.py
+
+ # not considered good practice pinning in install_requires
+ substituteInPlace setup.py --replace 'six==' 'six>='
'';
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = "Run SQL directly on CSV or TSV files";
longDescription = ''
q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix
index 64870e07a3..43a91eaca5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tagref";
- version = "1.3.3";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3R6vhevSld9IjJMsGl5Rwv0ADMjm94NeZxvl8eYHR2Y=";
+ sha256 = "0y1c0v2zjpav1n72pgf3kpqdz6ixp2mjhcvvza4gzfp865c236nc";
};
- cargoSha256 = "sha256-pLugAT8QlgxawkR2y+LIacRh4nB59qpKLJjxc81CNDY=";
+ cargoSha256 = "06ljy213x9lhvqjysz9cjhrrg0ns07qkz27pxd8rih0mk6cck45g";
meta = with lib; {
description = "Tagref helps you refer to other locations in your codebase.";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
index 04a11a9220..6a21bc5678 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "1bpq4zki98vw793rvrk9qwgh62f1qwzh0cm4a3h0bif43kg836n0";
+ sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34";
};
- cargoSha256 = "1486pfiv4lfzdz3hj5z6s7q8lhzrldffji3fsf10z50sm4fhq73q";
+ cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg";
buildInputs = lib.optional stdenv.isDarwin Foundation;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
index 9b38db5a72..e7a08877e9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
@@ -1,5 +1,6 @@
{
stdenv, lib, fetchFromGitHub, which,
+ buildPackages,
enableStatic ? false,
enableMinimal ? false,
extraConfig ? ""
@@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv";
};
+ depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ];
postPatch = "patchShebangs .";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix
index d00d737c17..889c266d28 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yad";
- version = "6.0";
+ version = "7.2";
src = fetchFromGitHub {
owner = "v1cont";
repo = "yad";
rev = "v${version}";
- sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7";
+ sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index efa39f4509..9950a46be1 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.12.07";
+ version = "2020.12.22";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0sbrwak9c0pbacg15q2wj5fcsj5k5k1sx9jm7rcjwkjdhqcjqrsi";
+ sha256 = "0v7pyrdii8yqcx9pjl6r46qj7ljjmwmwkrd5sghf1vmgfwacx5fc";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -63,6 +63,6 @@ buildPythonPackage rec {
'';
license = licenses.publicDomain;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 ];
+ maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 zowoq ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index 59149506e6..dc68923686 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- install -Dm755 z.lua $out/bin/z
- wrapProgram $out/bin/z --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1;
+ install -Dm755 z.lua $out/bin/z.lua
+ wrapProgram $out/bin/z.lua --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1;
+ # Create symlink for backwards compatibility. See: https://github.com/NixOS/nixpkgs/pull/96081
+ ln -s $out/bin/z.lua $out/bin/z
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
index c466a48434..82245f4cd2 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
@@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
pname = "curl";
- version = "7.73.0";
+ version = "7.74.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
];
- sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE=";
+ sha256 = "19bp3d91xq9vqwlbzq261j23mk9lz4lyka4gr2fm6dhnd3k66k8g";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
index a3d819e8dc..68107f1932 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
@@ -1,25 +1,29 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig
-, bind, zlib, openssl, libcap
+, openssl, ldns
}:
stdenv.mkDerivation rec {
pname = "dnsperf";
- version = "2.3.4";
+ version = "2.4.0";
# The same as the initial commit of the new GitHub repo (only readme changed).
src = fetchFromGitHub {
owner = "DNS-OARC";
repo = "dnsperf";
rev = "v${version}";
- sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1";
+ sha256 = "0q7zmzhhx71v41wf6rhyvpil43ch4a9sx21x47wgcg362lca3cbz";
};
outputs = [ "out" "man" "doc" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ bind zlib openssl ]
- ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ];
+ buildInputs = [
+ openssl
+ ldns # optional for DDNS (but cheap anyway)
+ ];
+
+ doCheck = true;
# For now, keep including the old PDFs as well.
# https://github.com/DNS-OARC/dnsperf/issues/27
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
index b2c19e2acf..e7c30551dc 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.33.2";
+ version = "0.33.3";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh";
+ sha256 = "0c7hqsb53711032svicr069gh7faacnsj2v36pj7srng266vk78p";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix
index 3e7719c40d..7e6f2c475c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
"-Wno-error=format-truncation"
"-Wno-error=pointer-compare"
"-Wno-error=stringop-truncation"
+ # The following flag allows libreswan v3.32 to work with NSS 3.22, see
+ # https://github.com/libreswan/libreswan/issues/334.
+ # This flag should not be needed for libreswan v3.33 (which is not yet released).
+ "-DNSS_PKCS11_2_0_COMPAT=1"
];
nativeBuildInputs = [ makeWrapper pkgconfig ];
@@ -82,7 +86,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://libreswan.org";
description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
- platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;
+ platforms = platforms.linux ++ platforms.freebsd;
license = licenses.gpl2;
maintainers = [ maintainers.afranchuk ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
index 2418d7e90c..746a99ede5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
@@ -38,7 +38,7 @@ buildPythonApplication rec {
checkPhase = ''
${lib.optionalString stdenv.isDarwin ''
# network tests fails on darwin
- rm tests/test_network.py
+ rm tests/test_network.py tests/checker/test_http*.py tests/checker/test_content_allows_robots.py tests/checker/test_noproxy.py
''}
pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \
-k 'not TestLoginUrl and not test_timeit2'
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix
index 7cbba9bfbf..aa0a3926b1 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openntpd/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "openntpd";
- version = "6.2p3";
+ version = "6.8p1";
src = fetchurl {
url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz";
- sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv";
+ sha256 = "0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
index f8a518ca4d..c9e75f39e9 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
@@ -66,7 +66,9 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
'';
- nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
+ nativeBuildInputs = [ pkgconfig ]
+ ++ optional (hpnSupport || withGssapiPatches) autoreconfHook
+ ++ optional withKerberos kerberos.dev;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;
@@ -75,6 +77,22 @@ stdenv.mkDerivation rec {
# Setting LD causes `configure' and `make' to disagree about which linker
# to use: `configure' wants `gcc', but `make' wants `ld'.
unset LD
+ ''
+ # Upstream build system does not support static build, so we fall back
+ # on fragile patching of configure script.
+ #
+ # libedit is found by pkgconfig, but without --static flag, required
+ # to get also transitive dependencies for static linkage, hence sed
+ # expression.
+ #
+ # Kerberos can be found either by krb5-config or by fall-back shell
+ # code in openssh's configure.ac. Neither of them support static
+ # build, but patching code for krb5-config is simpler, so to get it
+ # into PATH, kerberos.dev is added into buildInputs.
+ + optionalString stdenv.hostPlatform.isStatic ''
+ sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure
+ sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure
+ sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure
'';
# I set --disable-strip because later we strip anyway. And it fails to strip
diff --git a/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix
deleted file mode 100644
index bb62be6d3e..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage {
- pname = "qr-filetransfer-unstable";
- version = "2018-10-22";
-
- goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
-
- src = fetchFromGitHub {
- rev = "b1e5b91aa2aa469f870c62074e879d46e353edae";
- owner = "claudiodangelis";
- repo = "qr-filetransfer";
- sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1";
- };
-
- goDeps = ./deps.nix;
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/claudiodangelis/qr-filetransfer";
- description = "Transfer files over wifi by scanning a QR code from your terminal";
- longDescription = ''
- qr-filetransfer binds a web server to the address of your Wi-Fi network
- interface on a random port and creates a handler for it. The default
- handler serves the content and exits the program when the transfer is
- complete.
- '';
- license = licenses.mit;
- maintainers = with maintainers; [ fgaz ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/deps.nix b/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/deps.nix
deleted file mode 100644
index a15dd96894..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/qr-filetransfer/deps.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
- sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
- sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
- sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
- };
- }
- {
- goPackagePath = "github.com/mdp/qrterminal";
- fetch = {
- type = "git";
- url = "https://github.com/mdp/qrterminal";
- rev = "6967d3624af633162b77160078e12a4c14174470";
- sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42";
- sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
- };
- }
- {
- goPackagePath = "gopkg.in/cheggaaa/pb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/cheggaaa/pb.v1";
- rev = "007b75a044e968336a69a6c0c617251ab62ac14c";
- sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad";
- };
- }
- {
- goPackagePath = "rsc.io/qr";
- fetch = {
- type = "git";
- url = "https://github.com/rsc/qr";
- rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
- sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix
new file mode 100644
index 0000000000..0cfc78d69d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "qrcp";
+ version = "0.6.4";
+
+ src = fetchFromGitHub {
+ owner = "claudiodangelis";
+ repo = "qrcp";
+ rev = version;
+ sha256 = "08fjy9mskf6n1zldc63fjm5x617qqx987a58cjav03apzfwzvvhg";
+ };
+
+ vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ homepage = "https://claudiodangelis.com/qrcp/";
+ description = "Transfer files over wifi by scanning a QR code from your terminal";
+ longDescription = ''
+ qrcp binds a web server to the address of your Wi-Fi network
+ interface on a random port and creates a handler for it. The default
+ handler serves the content and exits the program when the transfer is
+ complete.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ fgaz ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
index ac4c1e24e3..c5026851f5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- version = "2.3.1";
+ version = "2.4.17";
pname = "swagger-codegen";
jarfilename = "${pname}-cli-${version}.jar";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}";
- sha256 = "171qr0zx7i6cykv54vqjf3mplrf7w4a1fpq47wsj861lbf8xm322";
+ url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}";
+ sha256 = "06xx42ayh4xqpr71lq1hj7kv1v6m9ld9jm1d15fhs935zqckv32a";
};
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix
index 85cdd19702..a49ab43e55 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
homepage="http://www.tinc-vpn.org/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ fpletz lassulus ];
+ maintainers = with maintainers; [ fpletz lassulus mic92 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix
index b6d9eb3448..ce27f11137 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "unbound";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
- sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv";
+ sha256 = "18dj7migq6379hps59793457l81s3z7dll3y0fj6qcmhjlx08m59";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch
new file mode 100644
index 0000000000..56bafb2f7b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/darwin.patch
@@ -0,0 +1,35 @@
+--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800
++++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800
+@@ -22,7 +22,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800
++++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800
+@@ -24,7 +24,20 @@
+ #include
+ #include
+ #include
+-#include
++
++// Darwin compatibility hacks
++typedef int auxv_t;
++#ifndef AT_HWCAP2
++#define AT_HWCAP2 26
++#endif
++#ifndef AT_HWCAP
++#define AT_HWCAP 16
++#endif
++static unsigned long getauxval(unsigned long type)
++{
++ unsigned long ret = 0;
++ return ret;
++}
+
+ // hawkey
+ #include "dnf-types.h"
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix
new file mode 100644
index 0000000000..480222a45d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix
@@ -0,0 +1,66 @@
+{ gcc9Stdenv, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check
+, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
+
+gcc9Stdenv.mkDerivation rec {
+ pname = "libdnf";
+ version = "0.55.2";
+
+ src = fetchFromGitHub {
+ owner = "rpm-software-management";
+ repo = pname;
+ rev = version;
+ sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq";
+ };
+
+ patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+
+ nativeBuildInputs = [
+ cmake
+ gettext
+ pkg-config
+ ];
+
+ buildInputs = [
+ check
+ gpgme
+ openssl
+ json_c
+ libsmartcols
+ libyaml
+ libmodulemd
+ ];
+
+ propagatedBuildInputs = [
+ sqlite
+ libsolv
+ librepo
+ rpm
+ ];
+
+ # See https://github.com/NixOS/nixpkgs/issues/107430
+ prePatch = ''
+ cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/
+ '';
+
+ # See https://github.com/NixOS/nixpkgs/issues/107428
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "enable_testing()" "" \
+ --replace "add_subdirectory(tests)" ""
+ '';
+
+ cmakeFlags = [
+ "-DWITH_GTKDOC=OFF"
+ "-DWITH_HTML=OFF"
+ "-DWITH_BINDINGS=OFF"
+ "-DWITH_ZCHUNK=OFF"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Package management library.";
+ homepage = "https://github.com/rpm-software-management/libdnf";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ rb2k ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
index 0e2cec6852..f636560844 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
@@ -35,11 +35,12 @@ stdenv.mkDerivation rec {
libxml2
glib
openssl
- zchunk
curl
check
gpgme
- ];
+ ]
+ # zchunk currently has issues compiling in darwin, fine in linux
+ ++ stdenv.lib.optional stdenv.isLinux zchunk;
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
propagatedBuildInputs = [
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
- ];
+ ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF";
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
homepage = "https://rpm-software-management.github.io/librepo/";
license = licenses.lgpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ copumpkin ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix
new file mode 100644
index 0000000000..de473cf6a8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }:
+
+stdenv.mkDerivation rec {
+ pname = "microdnf";
+ version = "3.6.0";
+
+ src = fetchFromGitHub {
+ owner = "rpm-software-management";
+ repo = pname;
+ rev = version;
+ sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h";
+ };
+
+ nativeBuildInputs = [ pkg-config cmake gettext help2man ];
+ buildInputs = [ libdnf glib libpeas libsmartcols ];
+
+ meta = with stdenv.lib; {
+ description = "Lightweight implementation of dnf in C";
+ homepage = "https://github.com/rpm-software-management/microdnf";
+ license = licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ rb2k ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
index c17a1a82d9..bfc67ccac6 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -188,10 +188,10 @@ in rec {
nix = nixStable;
nixStable = callPackage common (rec {
- name = "nix-2.3.9";
+ name = "nix-2.3.10";
src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa";
+ sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix
index 777e7292fd..667a21343e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h";
+ hash = "sha256-JaYFJL24Pgwh5CrsKjJPL8u0fx1x0beFTK+EGNT1iqA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
index 80a9c40ebc..ff855cce24 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
@@ -46,10 +46,12 @@ buildGoModule rec {
ln -s $out/bin/gopass $out/bin/pass
'';
+ # --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662
postFixup = ''
for bin in $out/bin/*; do
wrapProgram $bin \
- --prefix PATH : "${wrapperPath}"
+ --prefix PATH : "${wrapperPath}" \
+ --run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"'
done
'';
diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
index 78935040fe..a13e7214cb 100644
--- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
- version = "0.1.6";
+ version = "0.2.5";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
- sha256 = "0n83d4zvy74rn38fqq84lm58l24c3r87m2di2sw4cdr1hkjg3nbl";
+ sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w";
};
- cargoSha256 = "0kafyljn3b87k5m0wdii0gfa4wj1yfys8jqx79inj82m0w1khprk";
+ cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl";
nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
@@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec {
export HOME=$TMPDIR
'';
- checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ];
+ checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
postInstall = ''
mkdir -p $out/share/kbs2
@@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "A secret manager backed by age";
homepage = "https://github.com/woodruffw/kbs2";
+ changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/neopg/default.nix b/third_party/nixpkgs/pkgs/tools/security/neopg/default.nix
index 4f4f660e20..8c0d31853f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/neopg/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/neopg/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
'';
maintainers = with maintainers; [ erictapen ];
platforms = platforms.linux;
+ broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix
index e8c4b1f541..bd5e886637 100644
--- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix
@@ -20,15 +20,15 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchCrate {
inherit version;
crateName = pname;
- sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw";
+ sha256 = "1mxl71yz2iy5s6pbp33cwkfzzilkla4qqiskd6jsd5fdlrrwlxqm";
};
- cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063";
+ cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007";
nativeBuildInputs = [
pkgconfig
@@ -72,6 +72,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Unofficial command line client for Bitwarden";
homepage = "https://crates.io/crates/rbw";
+ changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}";
license = licenses.mit;
maintainers = with maintainers; [ albakham luc65r marsam ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
index aa2a12fc35..201b4c56f2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
@@ -23,16 +23,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
- version = "0.20.0";
+ version = "1.0.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "sequoia";
rev = "v${version}";
- sha256 = "sha256-br5GRzWprQTixNrE0WpNIB7Ayj5oEfyCg5JY4MnX5rA=";
+ sha256 = "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d";
};
- cargoSha256 = "sha256-SpCdoLCtvU9jpG/ivB/+4KhRdKZxN3/+7P/RlR6n9/c=";
+ cargoSha256 = "03ngywa5z0c7qmdmhynk13xcivhg8gpivvpzg2gxp34gfr7j438l";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
index ae29eeafd0..776823a6a2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
- version = "1.9.4";
+ version = "1.9.4p2";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
- sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb";
+ sha256 = "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix
index 8c5e283321..1a975aef39 100644
--- a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix
@@ -2,20 +2,24 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
- version = "0.5.3";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
- sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk=";
+ sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys=";
};
+ prePatch = ''
+ rm .cargo/config.toml
+ '';
+
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
- cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0=";
+ cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock
index d138a167ce..e9cd8cbf76 100644
--- a/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock
@@ -2,14 +2,16 @@ GEM
remote: https://rubygems.org/
specs:
clocale (0.0.4)
- colorls (1.4.2)
+ colorls (1.4.3)
clocale (~> 0)
filesize (~> 0)
manpages (~> 0)
rainbow (>= 2.2, < 4.0)
+ unicode-display_width (~> 1.7)
filesize (0.2.0)
manpages (0.6.1)
rainbow (3.0.0)
+ unicode-display_width (1.7.0)
PLATFORMS
ruby
diff --git a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix
index 2e4a26ff91..850aae3568 100644
--- a/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/colorls/gemset.nix
@@ -10,15 +10,15 @@
version = "0.0.4";
};
colorls = {
- dependencies = ["clocale" "filesize" "manpages" "rainbow"];
+ dependencies = ["clocale" "filesize" "manpages" "rainbow" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sw377wklld5zn1la0smxc2bg4rph2xf9d0h3zmxhmds06lb92db";
+ sha256 = "1w9d99qzgxw8wwa4z1vkdnr70fppx2g9shma6dz3ihjhajj2xvmq";
type = "gem";
};
- version = "1.4.2";
+ version = "1.4.3";
};
filesize = {
groups = ["default"];
@@ -50,4 +50,14 @@
};
version = "3.0.0";
};
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
}
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/tools/system/daemon/default.nix b/third_party/nixpkgs/pkgs/tools/system/daemon/default.nix
index 29f976998d..c419824f96 100644
--- a/third_party/nixpkgs/pkgs/tools/system/daemon/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/daemon/default.nix
@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn";
};
- makeFlags = [ "PREFIX=$(out)" ];
+ makeFlags = [
+ "PREFIX=$(out)"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ ];
+
buildInputs = [ perl ];
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix
index a36cb905d2..bf811942c3 100644
--- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "htop";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchFromGitHub {
owner = "htop-dev";
repo = pname;
rev = version;
- sha256 = "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y";
+ sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
index e5747a09f9..14b14fa9ff 100644
--- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
@@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
- version = "3.1.09-1";
+ version = "3.2.01-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5";
+ sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65";
};
buildInputs = [ perl makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
index 1ed1d91351..cd4eef8952 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "rocm-smi";
- version = "3.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix
index 438681e172..390793ffaf 100644
--- a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix
@@ -1,16 +1,32 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, git }:
buildGoModule rec {
pname = "chroma";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "alecthomas";
- repo = "chroma";
+ repo = pname;
rev = "v${version}";
- sha256 = "1gwwfn26aipzzvyy466gi6r54ypfy3ylnbi8c4xwch9pkgw16w98";
+ sha256 = "0vzxd0jvjaakwjvkkkjppakjb00z44k7gb5ng1i4924agh24n5ka";
+ leaveDotGit = true;
+ fetchSubmodules = true;
};
+ nativeBuildInputs = [ git ];
+
+ # populate values otherwise taken care of by goreleaser
+ # https://github.com/alecthomas/chroma/issues/435
+ postPatch = ''
+ commit="$(git rev-parse HEAD)"
+ date=$(git show -s --format=%aI "$commit")
+
+ substituteInPlace cmd/chroma/main.go \
+ --replace 'version = "?"' 'version = "${version}"' \
+ --replace 'commit = "?"' "commit = \"$commit\"" \
+ --replace 'date = "?"' "date = \"$date\""
+ '';
+
vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m";
subPackages = [ "cmd/chroma" ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix
index fc0ec487ad..30029d2d4e 100644
--- a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
edwtjo
];
+ platforms = jre.meta.platforms;
description = "A proofreading program for English, French German, Polish, and more";
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix
index 7bd8a74f45..c69c6fef8c 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, nixosTests
, fetchFromGitHub
, rustPlatform
, asciidoctor
@@ -34,6 +35,8 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh complete/_rg
'';
+ passthru.tests = { inherit (nixosTests) ripgrep; };
+
meta = with stdenv.lib; {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
homepage = "https://github.com/BurntSushi/ripgrep";
diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
index 353d85931a..84dc21aba3 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
- version = "3.0.6";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
- sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6";
+ sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l";
};
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
index f9329a80a8..702dabee2e 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -4,6 +4,7 @@ gem 'asciidoctor-diagram'
gem 'asciidoctor-pdf'
gem 'asciidoctor-epub3'
gem 'asciidoctor-mathematical'
+gem 'asciidoctor-revealjs'
gem 'coderay'
gem 'pygments.rb'
gem 'rouge'
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index c928e95487..06a1716251 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -28,6 +28,11 @@ GEM
safe_yaml (~> 1.0.0)
thread_safe (~> 0.3.0)
treetop (~> 1.5.0)
+ asciidoctor-revealjs (4.0.1)
+ asciidoctor (>= 2.0.0, < 3.0.0)
+ concurrent-ruby (~> 1.0)
+ thread_safe (~> 0.3.5)
+ asciimath (2.0.1)
coderay (1.1.2)
concurrent-ruby (1.1.5)
css_parser (1.7.0)
@@ -40,6 +45,9 @@ GEM
concurrent-ruby (~> 1.0)
mathematical (1.6.12)
ruby-enum (~> 0.4)
+ mime-types (3.3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2020.1104)
mini_portile2 (2.4.0)
multi_json (1.13.1)
nokogiri (1.10.3)
@@ -88,6 +96,7 @@ DEPENDENCIES
asciidoctor-epub3
asciidoctor-mathematical
asciidoctor-pdf
+ asciidoctor-revealjs
coderay
pygments.rb
rouge
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
index 7a01dc2ff0..29b2b567be 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -13,6 +13,7 @@ let
"asciidoctor"
"asciidoctor-pdf"
"asciidoctor-epub3"
+ "asciidoctor-revealjs"
];
buildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 02700962eb..db47fbf228 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -84,6 +84,27 @@
};
version = "1.5.0.alpha.18";
};
+ asciidoctor-revealjs = {
+ dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "084aq9frv4irzgd9ab3xad9i0ml9lb58w0wvg76gnwwr51plbpp4";
+ type = "gem";
+ };
+ version = "4.0.1";
+ };
+ asciimath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1aapydwwkydbwgz07n7ma3a5jy9n3v0shy6q6j8mi4wr3crhx45a";
+ type = "gem";
+ };
+ version = "2.0.1";
+ };
coderay = {
groups = ["default"];
platforms = [];
@@ -158,6 +179,27 @@
};
version = "1.6.12";
};
+ mime-types = {
+ dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+ type = "gem";
+ };
+ version = "3.3.1";
+ };
+ mime-types-data = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
+ type = "gem";
+ };
+ version = "3.2020.1104";
+ };
mini_portile2 = {
groups = ["default"];
platforms = [];
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
index 965624a509..fc4a971f23 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "tectonic";
- version = "0.3.0";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "tectonic-typesetting";
repo = "tectonic";
rev = "tectonic@${version}";
- sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE=";
+ sha256 = "1ncczcchyphprkrb8spya400gi212a6akx18fm3j4xdhmg9caj3f";
};
- cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4=";
+ cargoSha256 = "11xvq0l9xrppcplkshd5wxv90s97x4iavhzbdk9px992zl0m6ar6";
nativeBuildInputs = [ pkgconfig ];
@@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive";
homepage = "https://tectonic-typesetting.github.io/";
+ changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = [ maintainers.lluchs maintainers.doronbehar ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
index 891495c46c..0625fe1609 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -36,7 +36,7 @@ let
mkUniqueOutPaths = pkgs: uniqueStrings
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
-in buildEnv {
+in (buildEnv {
name = "texlive-${extraName}-${bin.texliveYear}";
extraPrefix = "/share/texmf";
@@ -271,6 +271,6 @@ in buildEnv {
''
+ bin.cleanBrokenLinks
;
-}
+}).overrideAttrs (_: { allowSubstitutes = true; })
# TODO: make TeX fonts visible by fontconfig: it should be enough to install an appropriate file
# similarly, deal with xe(la)tex font visibility?
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index 8009208739..ff17f73f92 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -44,7 +44,17 @@ mapAliases ({
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
ammonite-repl = ammonite; # added 2017-05-02
+ amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
+ apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
+ apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
arduino_core = arduino-core; # added 2015-02-04
arora = throw "arora has been removed."; # added 2020-09-09
asciidocFull = asciidoc-full; # added 2014-06-22
@@ -62,6 +72,7 @@ mapAliases ({
bridge_utils = bridge-utils; # added 2015-02-20
bro = zeek; # added 2019-09-29
bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
+ bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10
btrfsProgs = btrfs-progs; # added 2016-01-03
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
@@ -86,6 +97,7 @@ mapAliases ({
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
+ codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20
conntrack_tools = conntrack-tools; # added 2018-05
@@ -224,6 +236,7 @@ mapAliases ({
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
idea = jetbrains; # added 2017-04-03
+ inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools;
jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
@@ -480,6 +493,7 @@ mapAliases ({
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
+ qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02
quake3game = ioquake3; # added 2016-01-14
qvim = throw "qvim has been removed."; # added 2020-08-31
qwt6 = libsForQt5.qwt; # added 2015-12-19
@@ -604,6 +618,7 @@ mapAliases ({
systool = sysfsutils; # added 2018-04-25
tahoelafs = tahoe-lafs; # added 2018-03-26
tangogps = foxtrotgps; # added 2020-01-26
+ tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead.";
telepathy_farstream = telepathy-farstream; # added 2018-02-25
telepathy_gabble = telepathy-gabble; # added 2018-02-25
telepathy_glib = telepathy-glib; # added 2018-02-25
@@ -696,6 +711,10 @@ mapAliases ({
gnome_user_docs = gnome-user-docs; # added 2019-11-20
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
spidermonkey = spidermonkey_78; # added 2020-10-09
+ libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20
+ libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20
+ libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20
+ libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off
@@ -819,7 +838,7 @@ mapAliases ({
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
- systemsettings user-manager xdg-desktop-portal-kde
+ systemsettings xdg-desktop-portal-kde
;
inherit (plasma5.thirdParty)
plasma-applet-caffeine-plus
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 8d4fab92a5..f777a787f7 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -178,6 +178,8 @@ in
cereal = callPackage ../development/libraries/cereal { };
+ chrysalis = callPackage ../applications/misc/chrysalis { };
+
clj-kondo = callPackage ../development/tools/clj-kondo { };
cmark = callPackage ../development/libraries/cmark { };
@@ -240,6 +242,7 @@ in
archiver = callPackage ../applications/misc/archiver { };
+ # It segfaults if it uses qt5.15
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { };
gretl = callPackage ../applications/science/math/gretl { };
@@ -798,6 +801,8 @@ in
wayst = callPackage ../applications/terminal-emulators/wayst { };
+ wezterm = callPackage ../applications/terminal-emulators/wezterm { };
+
x3270 = callPackage ../applications/terminal-emulators/x3270 { };
xterm = callPackage ../applications/terminal-emulators/xterm { };
@@ -874,6 +879,8 @@ in
arduino = arduino-core.override { withGui = true; };
+ arduino-ci = callPackage ../development/arduino/arduino-ci { };
+
arduino-cli = callPackage ../development/arduino/arduino-cli { };
arduino-core = callPackage ../development/arduino/arduino-core { };
@@ -928,6 +935,8 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
+ audiowaveform = callPackage ../tools/audio/audiowaveform { };
+
autoflake = callPackage ../development/tools/analysis/autoflake { };
autospotting = callPackage ../applications/misc/autospotting { };
@@ -1338,6 +1347,8 @@ in
wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
+ waypoint = callPackage ../applications/networking/cluster/waypoint { };
+
xcodeenv = callPackage ../development/mobile/xcodeenv { };
ssh-agents = callPackage ../tools/networking/ssh-agents { };
@@ -1738,6 +1749,8 @@ in
gflags = null; # only required for examples/tests
};
+ craftos-pc = callPackage ../misc/emulators/craftos-pc { };
+
gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { };
image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { };
@@ -2000,6 +2013,8 @@ in
dlx = callPackage ../misc/emulators/dlx { };
+ dgen-sdl = callPackage ../misc/emulators/dgen-sdl { };
+
doitlive = callPackage ../tools/misc/doitlive { };
dokuwiki = callPackage ../servers/web-apps/dokuwiki { };
@@ -2570,6 +2585,8 @@ in
shell-hist = callPackage ../tools/misc/shell-hist { };
+ simdjson = callPackage ../development/libraries/simdjson { };
+
simg2img = callPackage ../tools/filesystems/simg2img { };
simplenes = callPackage ../misc/emulators/simplenes { };
@@ -2928,13 +2945,14 @@ in
circus = callPackage ../tools/networking/circus { };
- citrix_workspace = citrix_workspace_20_10_0;
+ citrix_workspace = citrix_workspace_20_12_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0
citrix_workspace_20_06_0
citrix_workspace_20_09_0
citrix_workspace_20_10_0
+ citrix_workspace_20_12_0
;
citra = libsForQt5.callPackage ../misc/emulators/citra { };
@@ -2945,9 +2963,7 @@ in
cmt = callPackage ../applications/audio/cmt {};
- codimd = callPackage ../servers/web-apps/codimd {
- nodejs = nodejs-12_x;
- };
+ hedgedoc = callPackage ../servers/web-apps/hedgedoc { };
colord = callPackage ../tools/misc/colord { };
@@ -3007,6 +3023,8 @@ in
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };
+ usbsdmux = callPackage ../development/tools/misc/usbsdmux { };
+
anthy = callPackage ../tools/inputmethods/anthy { };
evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
@@ -3315,13 +3333,13 @@ in
ddrutility = callPackage ../tools/system/ddrutility { };
- deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 {
+ deluge-2_x = callPackage ../applications/networking/p2p/deluge {
pythonPackages = python3Packages;
- libtorrentRasterbar = libtorrentRasterbar.override { python = python3; };
+ libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; };
};
- deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 {
+ deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix {
pythonPackages = python2Packages;
- libtorrentRasterbar = libtorrentRasterbar-1_1_x;
+ libtorrent-rasterbar = libtorrent-rasterbar-1_1_x;
};
deluge = deluge-2_x;
@@ -3869,6 +3887,8 @@ in
feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
+ feeds = callPackage ../applications/networking/feedreaders/feeds {};
+
fend = callPackage ../tools/misc/fend { };
ferm = callPackage ../tools/networking/ferm { };
@@ -3967,6 +3987,8 @@ in
feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };
+ fbcat = callPackage ../tools/misc/fbcat { };
+
fbv = callPackage ../tools/graphics/fbv { };
fbvnc = callPackage ../tools/admin/fbvnc {};
@@ -4595,7 +4617,7 @@ in
hal-flash = callPackage ../os-specific/linux/hal-flash { };
- hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
+ hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
half = callPackage ../development/libraries/half { };
@@ -4759,6 +4781,8 @@ in
icecast = callPackage ../servers/icecast { };
+ icemon = libsForQt5.callPackage ../applications/networking/icemon { };
+
icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak;
iceshelf = callPackage ../tools/backup/iceshelf { };
@@ -4814,8 +4838,6 @@ in
inadyn = callPackage ../tools/networking/inadyn { };
- inboxer = callPackage ../applications/networking/mailreaders/inboxer { };
-
incron = callPackage ../tools/system/incron { };
industrializer = callPackage ../applications/audio/industrializer { };
@@ -5073,6 +5095,8 @@ in
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
+ keystore-explorer = callPackage ../applications/misc/keystore-explorer { };
+
kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
enableUnfree = false;
@@ -5120,7 +5144,7 @@ in
ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { };
- kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { };
+ kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };
kytea = callPackage ../tools/text/kytea { };
@@ -5156,6 +5180,8 @@ in
libcryptui = callPackage ../development/libraries/libcryptui { };
+ libsmartcols = callPackage ../development/libraries/libsmartcols { };
+
libsmi = callPackage ../development/libraries/libsmi { };
libgen-cli = callPackage ../tools/misc/libgen-cli { };
@@ -5236,6 +5262,8 @@ in
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins;
+ matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools;
+
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
@@ -5252,7 +5280,7 @@ in
mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
- inherit (pythonPackages) ansi2html;
+ inherit (python3Packages) ansi2html;
};
medfile = callPackage ../development/libraries/medfile { };
@@ -5283,6 +5311,8 @@ in
mmv-go = callPackage ../tools/misc/mmv-go { };
+ mob = callPackage ../applications/misc/mob { };
+
most = callPackage ../tools/misc/most { };
motion = callPackage ../applications/video/motion { };
@@ -5303,6 +5333,8 @@ in
ncrack = callPackage ../tools/security/ncrack { };
+ nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
+
netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
@@ -5713,6 +5745,8 @@ in
mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
+ microdnf = callPackage ../tools/package-management/microdnf { };
+
microserver = callPackage ../servers/microserver { };
midisheetmusic = callPackage ../applications/audio/midisheetmusic { };
@@ -5993,7 +6027,7 @@ in
inherit (callPackage ../servers/nextcloud {})
nextcloud17 nextcloud18 nextcloud19 nextcloud20;
- nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { };
+ nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
@@ -6026,6 +6060,9 @@ in
nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix {
buildGoPackage = buildGo114Package;
};
+ nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix {
+ buildGoPackage = buildGo115Package;
+ };
notable = callPackage ../applications/misc/notable { };
@@ -6137,6 +6174,8 @@ in
nssmdns = callPackage ../tools/networking/nss-mdns { };
+ nvimpager = callPackage ../tools/misc/nvimpager { };
+
nwdiag = with python3Packages; toPythonApplication nwdiag;
nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
@@ -6570,6 +6609,8 @@ in
graphviz = graphviz_2_32;
};
+ plantuml-server = callPackage ../tools/misc/plantuml-server { };
+
plan9port = callPackage ../tools/system/plan9port { };
platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { });
@@ -6748,6 +6789,8 @@ in
pythonPackages = python27Packages;
};
+ py-spy = callPackage ../development/tools/py-spy { };
+
pytrainer = callPackage ../applications/misc/pytrainer { };
pywal = with python3Packages; toPythonApplication pywal;
@@ -6758,6 +6801,8 @@ in
remarshal = callPackage ../development/tools/remarshal { };
+ rehex = callPackage ../applications/editors/rehex { };
+
rig = callPackage ../tools/misc/rig {
stdenv = gccStdenv;
};
@@ -6812,9 +6857,9 @@ in
qshowdiff = callPackage ../tools/text/qshowdiff { };
- qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
+ qrcp = callPackage ../tools/networking/qrcp { };
- qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { };
+ qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
quickjs = callPackage ../development/interpreters/quickjs { };
@@ -6884,6 +6929,8 @@ in
rep = callPackage ../development/tools/rep { };
+ reicast = callPackage ../misc/emulators/reicast { };
+
reredirect = callPackage ../tools/misc/reredirect { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
@@ -7281,6 +7328,8 @@ in
sipsak = callPackage ../tools/networking/sipsak { };
+ siril = callPackage ../applications/science/astronomy/siril { };
+
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
sit = callPackage ../applications/version-management/sit {
@@ -7850,6 +7899,8 @@ in
tty-clock = callPackage ../tools/misc/tty-clock { };
+ tty-share = callPackage ../applications/misc/tty-share { };
+
ttyplot = callPackage ../tools/misc/ttyplot { };
ttyrec = callPackage ../tools/misc/ttyrec { };
@@ -8272,6 +8323,8 @@ in
xbrightness = callPackage ../tools/X11/xbrightness { };
+ xdg-launch = callPackage ../applications/misc/xdg-launch { };
+
xkbvalidate = callPackage ../tools/X11/xkbvalidate { };
xfstests = callPackage ../tools/misc/xfstests { };
@@ -8344,7 +8397,7 @@ in
vmtouch = callPackage ../tools/misc/vmtouch { };
- vncdo = callPackage ../tools/admin/vncdo { };
+ vncdo = with python3Packages; toPythonApplication vncdo;
volumeicon = callPackage ../tools/audio/volumeicon { };
@@ -8643,8 +8696,8 @@ in
any-nix-shell = callPackage ../shells/any-nix-shell { };
bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
- bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { });
- bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix {
+ bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { });
+ bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix {
interactive = true;
withDocs = true;
});
@@ -8904,7 +8957,10 @@ in
llvmPackages = llvmPackages_latest;
};
- clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };
+ clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer {
+ llvmPackages = llvmPackages_latest;
+ inherit (llvmPackages_latest) clang;
+ };
#Use this instead of stdenv to build with clang
clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
@@ -8994,6 +9050,8 @@ in
fasmg = callPackage ../development/compilers/fasmg { };
+ flasm = callPackage ../development/compilers/flasm { };
+
flyctl = callPackage ../development/web/flyctl { };
flutterPackages =
@@ -9389,6 +9447,8 @@ in
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
+ krank = haskell.lib.justStaticExecutables haskellPackages.krank;
+
# We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12.
stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal;
@@ -9696,7 +9756,6 @@ in
knightos-kimg = callPackage ../development/tools/knightos/kimg {
asciidoc = asciidoc-full;
- imagemagick = imagemagick7Big;
};
knightos-kpack = callPackage ../development/tools/knightos/kpack { };
@@ -10012,11 +10071,9 @@ in
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
};
rust_1_48 = callPackage ../development/compilers/rust/1_48.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11;
};
rust = rust_1_48;
@@ -10030,7 +10087,6 @@ in
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
- buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
cargo-web = callPackage ../development/tools/cargo-web {
@@ -10348,7 +10404,10 @@ in
clisp = callPackage ../development/interpreters/clisp { };
clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
- clojure = callPackage ../development/interpreters/clojure { };
+ clojure = callPackage ../development/interpreters/clojure {
+ # set this to an LTS version of java
+ jdk = jdk11;
+ };
clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { };
@@ -10513,19 +10572,16 @@ in
octave = callPackage ../development/interpreters/octave {
python = python3;
mkDerivation = stdenv.mkDerivation;
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octave-jit = callPackage ../development/interpreters/octave {
python = python3;
enableJIT = true;
mkDerivation = stdenv.mkDerivation;
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octaveFull = libsForQt5.callPackage ../development/interpreters/octave {
python = python3;
enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
ocropus = callPackage ../applications/misc/ocropus { };
@@ -10933,15 +10989,6 @@ in
ant = apacheAnt;
apacheKafka = apacheKafka_2_5;
- apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
- apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
- apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
- apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
- apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
- apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
- apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
- apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
- apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; };
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
@@ -12179,6 +12226,8 @@ in
universal-ctags = callPackage ../development/tools/misc/universal-ctags { };
+ unused = callPackage ../development/tools/misc/unused { };
+
vagrant = callPackage ../development/tools/vagrant {};
vala-language-server = callPackage ../development/tools/vala-language-server {};
@@ -12477,7 +12526,7 @@ in
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
- niv = haskellPackages.niv.bin;
+ niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv);
ormolu = haskellPackages.ormolu.bin;
@@ -12700,6 +12749,8 @@ in
docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
+ docopts = callPackage ../development/tools/misc/docopts { };
+
dotconf = callPackage ../development/libraries/dotconf { };
draco = callPackage ../development/libraries/draco { };
@@ -13930,6 +13981,8 @@ in
libdnet = callPackage ../development/libraries/libdnet { };
+ libdnf = callPackage ../tools/package-management/libdnf { };
+
libdrm = callPackage ../development/libraries/libdrm { };
libdv = callPackage ../development/libraries/libdv { };
@@ -14263,6 +14316,8 @@ in
librime = callPackage ../development/libraries/librime {};
+ librtprocess = callPackage ../development/libraries/librtprocess { };
+
libsamplerate = callPackage ../development/libraries/libsamplerate {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices;
};
@@ -14629,11 +14684,18 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
- libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { };
+ libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ python = python3;
+ };
- libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
+ libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ };
- libtorrentRasterbar = libtorrentRasterbar-1_2_x;
+ libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { };
+
+ libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
# this is still the new version of the old API
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
@@ -15415,7 +15477,7 @@ in
qjson = callPackage ../development/libraries/qjson { };
- qolibri = libsForQt514.callPackage ../applications/misc/qolibri { };
+ qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
qt3 = callPackage ../development/libraries/qt-3 {
libpng = libpng12;
@@ -15535,7 +15597,7 @@ in
kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
- systemsettings user-manager xdg-desktop-portal-kde
+ systemsettings xdg-desktop-portal-kde
;
inherit ((plasma5.override { libsForQt5 = self; }).thirdParty)
@@ -15968,6 +16030,8 @@ in
soapyairspy = callPackage ../applications/radio/soapyairspy { };
+ soapyaudio = callPackage ../applications/radio/soapyaudio { };
+
soapybladerf = callPackage ../applications/radio/soapybladerf { };
soapyhackrf = callPackage ../applications/radio/soapyhackrf { };
@@ -15980,6 +16044,7 @@ in
extraPackages = [
limesuite
soapyairspy
+ soapyaudio
soapybladerf
soapyhackrf
soapyremote
@@ -16135,10 +16200,6 @@ in
python = python3;
};
- sundials_2 = callPackage ../development/libraries/sundials/2.x.nix {
- python = python3;
- };
-
sutils = callPackage ../tools/misc/sutils { };
svrcore = callPackage ../development/libraries/svrcore { };
@@ -16165,7 +16226,9 @@ in
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
- talloc = callPackage ../development/libraries/talloc { };
+ talloc = callPackage ../development/libraries/talloc {
+ wafHook = wafHook.override { python = python3; };
+ };
tclap = callPackage ../development/libraries/tclap {};
@@ -16366,7 +16429,7 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
- vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix {
+ vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@@ -16381,7 +16444,7 @@ in
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
- vtkWithQt5 = vtk.override { qtLib = qt514; };
+ vtkWithQt5 = vtk.override { qtLib = qt515; };
vxl = callPackage ../development/libraries/vxl {
libpng = libpng12;
@@ -16581,8 +16644,10 @@ in
zmqpp = callPackage ../development/libraries/zmqpp { };
+ libzra = callPackage ../development/libraries/libzra { };
+
zig = callPackage ../development/compilers/zig {
- llvmPackages = llvmPackages_10;
+ llvmPackages = llvmPackages_11;
};
zimlib = callPackage ../development/libraries/zimlib { };
@@ -16768,11 +16833,13 @@ in
perlcritic = perlPackages.PerlCritic;
- sqitchPg = callPackage ../development/tools/misc/sqitch {
- name = "sqitch-pg";
- databaseModule = perlPackages.DBDPg;
- sqitchModule = perlPackages.AppSqitch;
- };
+ sqitchMysql = (callPackage ../development/tools/misc/sqitch {
+ mysqlSupport = true;
+ }).overrideAttrs (oldAttrs: { pname = "sqitch-mysql"; });
+
+ sqitchPg = (callPackage ../development/tools/misc/sqitch {
+ postgresqlSupport = true;
+ }).overrideAttrs (oldAttrs: { pname = "sqitch-pg"; });
### DEVELOPMENT / R MODULES
@@ -16959,6 +17026,8 @@ in
diod = callPackage ../servers/diod { lua = lua5_1; };
+ directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {};
+
dkimproxy = callPackage ../servers/mail/dkimproxy { };
do-agent = callPackage ../servers/monitoring/do-agent { };
@@ -17017,8 +17086,6 @@ in
firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ };
firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ };
- frab = callPackage ../servers/web-apps/frab { };
-
freeradius = callPackage ../servers/freeradius { };
freeswitch = callPackage ../servers/sip/freeswitch {
@@ -17073,6 +17140,8 @@ in
hydron = callPackage ../servers/hydron { };
+ icecream = callPackage ../servers/icecream { };
+
icingaweb2 = callPackage ../servers/icingaweb2 { };
icingaweb2Modules = {
theme-april = callPackage ../servers/icingaweb2/theme-april { };
@@ -17595,6 +17664,8 @@ in
radicale = radicale3;
+ radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {};
+
rake = callPackage ../development/tools/build-managers/rake { };
redis = callPackage ../servers/nosql/redis { };
@@ -18200,6 +18271,10 @@ in
openisns = callPackage ../os-specific/linux/open-isns { };
+ osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
+ inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
+ };
+
osxfuse = callPackage ../os-specific/darwin/osxfuse { };
osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
@@ -18313,6 +18388,7 @@ in
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
+ kernelPatches.rtl8761b_support
kernelPatches.export_kernel_fpu_functions."5.3"
];
};
@@ -18333,14 +18409,6 @@ in
];
};
- linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix {
- kernelPatches = [
- kernelPatches.bridge_stp_helper
- kernelPatches.request_key_helper
- kernelPatches.export_kernel_fpu_functions."5.3"
- ];
- };
-
linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -18349,7 +18417,7 @@ in
];
};
- linux-rt_5_9 = callPackage ../os-specific/linux/kernel/linux-rt-5.9.nix {
+ linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
@@ -18357,6 +18425,15 @@ in
];
};
+ linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ kernelPatches.export_kernel_fpu_functions."5.3"
+ kernelPatches.export-rt-sched-migrate
+ ];
+ };
+
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -18601,15 +18678,15 @@ 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_9;
+ linuxPackages_latest = linuxPackages_5_10;
linux_latest = linuxPackages_latest.kernel;
# Realtime kernel packages.
linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4;
linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6;
- linuxPackages-rt_5_9 = linuxPackagesFor pkgs.linux-rt_5_9;
+ linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10;
linuxPackages-rt = linuxPackages-rt_5_4;
- linuxPackages-rt_latest = linuxPackages-rt_5_9;
+ linuxPackages-rt_latest = linuxPackages-rt_5_10;
linux-rt = linuxPackages-rt.kernel;
linux-rt_latest = linuxPackages-rt_latest.kernel;
@@ -18624,8 +18701,8 @@ in
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
- linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8);
linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9);
+ linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version
@@ -19068,6 +19145,8 @@ in
rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };
+ rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
+
rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { };
s3ql = callPackage ../tools/backup/s3ql { };
@@ -19163,6 +19242,7 @@ in
withMachined = false;
withNetworkd = false;
withNss = false;
+ withOomd = false;
withPCRE2 = false;
withPolkit = false;
withRemote = false;
@@ -19243,6 +19323,11 @@ in
ubootWandboard
;
+ # Upstream Barebox:
+ inherit (callPackage ../misc/barebox {})
+ buildBarebox
+ bareboxTools;
+
uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = callPackage ../os-specific/linux/uclibc {
@@ -20493,10 +20578,6 @@ in
bombono = callPackage ../applications/video/bombono {};
- bomi = libsForQt5.callPackage ../applications/video/bomi {
- ffmpeg = ffmpeg_2;
- };
-
bonzomatic = callPackage ../applications/editors/bonzomatic { };
brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };
@@ -21285,7 +21366,7 @@ in
gnuradio = gnuradio3_7-unwrapped;
};
- goldendict = libsForQt514.callPackage ../applications/misc/goldendict {
+ goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
@@ -21580,6 +21661,7 @@ in
};
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
+ vmopts = config.jetbrains.vmopts or null;
jdk = jetbrains.jdk;
}) // {
jdk = callPackage ../development/compilers/jetbrains-jdk { };
@@ -21595,6 +21677,8 @@ in
linssid = libsForQt5.callPackage ../applications/networking/linssid { };
+ deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { };
+
lollypop = callPackage ../applications/audio/lollypop { };
m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
@@ -21715,11 +21799,11 @@ in
gosmore = callPackage ../applications/misc/gosmore { };
- gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel {
+ gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};
- gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { };
+ gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
@@ -21808,6 +21892,8 @@ in
gtk = gtk3;
};
+ hover = callPackage ../development/tools/hover { };
+
hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
howl = callPackage ../applications/editors/howl { };
@@ -21939,6 +22025,8 @@ in
i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };
+ i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { };
+
i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
@@ -22272,14 +22360,13 @@ in
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
- # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15
- kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { };
+ kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
kodestudio = callPackage ../applications/editors/kodestudio { };
kondo = callPackage ../applications/misc/kondo { };
- konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { };
+ konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
@@ -22289,7 +22376,7 @@ in
openjpeg = openjpeg_1;
};
- krusader = libsForQt514.callPackage ../applications/misc/krusader { };
+ krusader = libsForQt5.callPackage ../applications/misc/krusader { };
ksuperkey = callPackage ../tools/X11/ksuperkey { };
@@ -22321,6 +22408,8 @@ in
fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
+ fluxcd = callPackage ../applications/networking/cluster/fluxcd { };
+
linkerd = callPackage ../applications/networking/cluster/linkerd { };
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
@@ -22369,6 +22458,8 @@ in
legit = gitAndTools.legit;
+ lens = callPackage ../applications/networking/cluster/lens { };
+
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
libowfat = callPackage ../development/libraries/libowfat { };
@@ -22559,7 +22650,7 @@ in
mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
- mapmap = libsForQt514.callPackage ../applications/video/mapmap { };
+ mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
@@ -22591,6 +22682,8 @@ in
mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
+ mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { };
+
mediainfo = callPackage ../applications/misc/mediainfo { };
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
@@ -22605,7 +22698,7 @@ in
melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
- melonDS = callPackage ../misc/emulators/melonDS { };
+ melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { };
meme = callPackage ../applications/graphics/meme { };
@@ -22862,7 +22955,7 @@ in
if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { }
else
- libsForQt5.callPackage ../applications/audio/musescore { };
+ libsForQt514.callPackage ../applications/audio/musescore { };
mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };
@@ -23235,6 +23328,10 @@ in
owamp = callPackage ../applications/networking/owamp { };
+ vieb = callPackage ../applications/networking/browsers/vieb {
+ electron = electron_11;
+ };
+
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
@@ -23586,7 +23683,7 @@ in
qsstv = qt5.callPackage ../applications/radio/qsstv { };
- qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { };
+ qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion {
guvcview = guvcview.override {
@@ -23605,7 +23702,9 @@ in
qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
- qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
+ qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox {
+ inherit (darwin.apple_sdk.frameworks) AVFoundation;
+ };
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
@@ -23809,7 +23908,7 @@ in
inherit (gnome2) libart_lgpl;
};
- scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { };
+ scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { };
seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { };
@@ -24403,7 +24502,10 @@ in
uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
uefitool = uefitoolPackages.new-engine;
- ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {});
+ ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // {
+ ungoogled = true;
+ channel = "ungoogled-chromium";
+ });
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
@@ -24586,7 +24688,7 @@ in
vkeybd = callPackage ../applications/audio/vkeybd {};
- vlc = libsForQt514.callPackage ../applications/video/vlc {};
+ vlc = libsForQt5.callPackage ../applications/video/vlc {};
vlc_qt5 = vlc;
@@ -24674,6 +24776,14 @@ in
way-cooler = throw ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html");
+ wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
+ inherit (wayfireApplications) wayfire wcm;
+ wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { };
+ wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix {
+ inherit (wayfireApplications-unwrapped) wayfire;
+ };
+ wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
+
waypipe = callPackage ../applications/networking/remote/waypipe { };
wayv = callPackage ../tools/X11/wayv {};
@@ -25391,6 +25501,7 @@ in
anki = python3Packages.callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
+ anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };
armagetronad = callPackage ../games/armagetronad { };
@@ -25770,6 +25881,8 @@ in
mari0 = callPackage ../games/mari0 { };
+ manaplus = callPackage ../games/manaplus { };
+
mars = callPackage ../games/mars { };
megaglest = callPackage ../games/megaglest {};
@@ -25952,6 +26065,8 @@ in
quantumminigolf = callPackage ../games/quantumminigolf {};
+ r2mod_cli = callPackage ../games/r2mod_cli { };
+
racer = callPackage ../games/racer { };
redeclipse = callPackage ../games/redeclipse { };
@@ -26394,10 +26509,8 @@ in
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
- # TODO: Update these to qt515 at some point. When doing it, please remove
- # the choice of libsForQt5*.sddm in sddm's module.
- qt5 = qt514;
- libsForQt5 = libsForQt514;
+ inherit qt5;
+ inherit libsForQt5;
inherit pkgs;
inherit (lib) makeScope;
});
@@ -26942,6 +27055,7 @@ in
coqPackages_8_10 coq_8_10
coqPackages_8_11 coq_8_11
coqPackages_8_12 coq_8_12
+ coqPackages_8_13 coq_8_13
coqPackages coq
;
@@ -27235,7 +27349,7 @@ in
ecl = null;
};
maxima-ecl = maxima.override {
- ecl = ecl_16_1_2;
+ inherit ecl;
ecl-fasl = true;
sbcl = null;
};
@@ -28269,8 +28383,6 @@ in
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};
inherit (callPackage ../applications/networking/cluster/terraform { })
- terraform_0_11
- terraform_0_11-full
terraform_0_12
terraform_0_13
terraform_0_14
@@ -28778,8 +28890,6 @@ in
gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc;
};
- tdm = callPackage ../games/tdm { };
-
newlib = callPackage ../development/misc/newlib { };
newlibCross = callPackage ../development/misc/newlib {
stdenv = crossLibcStdenv;
diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
index 46b7094cb3..aa7b3c35b8 100644
--- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
@@ -123,7 +123,10 @@ in rec {
version = "8.11.2";
};
coq_8_12 = callPackage ../applications/science/logic/coq {
- version = "8.12.1";
+ version = "8.12.2";
+ };
+ coq_8_13 = callPackage ../applications/science/logic/coq {
+ version = "8.13+beta1";
};
coqPackages_8_5 = mkCoqPackages coq_8_5;
@@ -134,6 +137,7 @@ in rec {
coqPackages_8_10 = mkCoqPackages coq_8_10;
coqPackages_8_11 = mkCoqPackages coq_8_11;
coqPackages_8_12 = mkCoqPackages coq_8_12;
+ coqPackages_8_13 = mkCoqPackages coq_8_13;
coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
coqPackages_8_11
);
diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
index d044ed8004..8075b7da4f 100644
--- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
@@ -4,7 +4,7 @@
#
# Recommended: simply use `emacsWithPackages` with the packages you want.
#
-# Alterative: use `emacs`, install everything to a system or user profile
+# Alternative: use `emacs`, install everything to a system or user profile
# and then add this at the start your `init.el`:
/*
(require 'package)
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 6fe157d2ea..80c5c0a5a8 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -826,10 +826,6 @@ let
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
- sqlexpr = callPackage ../development/ocaml-modules/sqlexpr {
- ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
- };
-
tsort = callPackage ../development/ocaml-modules/tsort { };
tuntap = callPackage ../development/ocaml-modules/tuntap { };
@@ -901,8 +897,6 @@ let
ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
};
- ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {};
-
ppx_tools =
if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_tools {}
@@ -1055,29 +1049,32 @@ let
janePackage =
if lib.versionOlder "4.08" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {}
+ then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {}
else if lib.versionOlder "4.07" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}
else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet =
if lib.versionOlder "4.08" ocaml.version
- then import ../development/ocaml-modules/janestreet/0.13.nix {
- inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith;
- inherit (pkgs) openssl;
+ then import ../development/ocaml-modules/janestreet/0.14.nix {
+ inherit alcotest angstrom angstrom-async base64 cryptokit ctypes
+ dune-configurator faraday inotify janePackage js_of_ocaml
+ js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit
+ ppxlib re tyxml uri-sexp zarith;
+ inherit (pkgs) openssl zstd;
}
else if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
inherit ctypes janePackage num octavius re;
inherit (pkgs) openssl;
- ppxlib = ppxlib.override { legacy = true; };
+ ppxlib = ppxlib.override { version = "0.8.1"; };
}
else import ../development/ocaml-modules/janestreet {
inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re;
inherit (pkgs) openssl;
- ppxlib = ppxlib.override { legacy = true; };
+ ppxlib = ppxlib.override { version = "0.8.1"; };
};
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
diff --git a/third_party/nixpkgs/pkgs/top-level/packages-config.nix b/third_party/nixpkgs/pkgs/top-level/packages-config.nix
index 8ce855780c..52ad7aecd2 100644
--- a/third_party/nixpkgs/pkgs/top-level/packages-config.nix
+++ b/third_party/nixpkgs/pkgs/top-level/packages-config.nix
@@ -6,8 +6,38 @@
# Enable recursion into attribute sets that nix-env normally doesn't look into
# so that we can get a more complete picture of the available packages for the
# purposes of the index.
- packageOverrides = super: {
- haskellPackages = super.recurseIntoAttrs super.haskellPackages;
- rPackages = super.recurseIntoAttrs super.rPackages;
- };
+ packageOverrides = super:
+ let
+ recurseIntoAttrs = sets:
+ super.lib.genAttrs
+ (builtins.filter (set: builtins.hasAttr set super) sets)
+ (set: super.recurseIntoAttrs (builtins.getAttr set super));
+ in recurseIntoAttrs [
+ "roundcubePlugins"
+ "emscriptenfastcompPackages"
+ "fdbPackages"
+ "nodePackages_latest"
+ "nodePackages"
+ "platformioPackages"
+ "haskellPackages"
+ "idrisPackages"
+ "sconsPackages"
+ "gns3Packages"
+ "quicklispPackagesClisp"
+ "quicklispPackagesSBCL"
+ "rPackages"
+ "apacheHttpdPackages_2_4"
+ "zabbix50"
+ "zabbix40"
+ "zabbix30"
+ "fusePackages"
+ "nvidiaPackages"
+ "sourceHanPackages"
+ "atomPackages"
+ "emacs26Packages"
+ "emacs27Packages"
+ "steamPackages"
+ "ut2004Packages"
+ "zeroadPackages"
+ ];
}
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index bdcece18ad..39e203aa17 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -12558,10 +12558,10 @@ let
MetaCPANClient = buildPerlPackage {
pname = "MetaCPAN-Client";
- version = "2.028000";
+ version = "2.029000";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz";
- sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a";
+ url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz";
+ sha256 = "0z75qzrr6r9ijp469majavq8la2jbgn1dq02vdm5m6ip7f887n65";
};
# Most tests are online, so we only include offline tests
@@ -15752,18 +15752,31 @@ let
NetZooKeeper = buildPerlPackage {
pname = "Net-ZooKeeper";
- version = "0.41";
- src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz";
- sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
+ version = "0.42pre";
+ src = fetchFromGitHub {
+ owner = "mark-5";
+ repo = "p5-net-zookeeper";
+ rev = "66e1a360aff9c39af728c36092b540a4b6045f70";
+ sha256 = "0xl8lcv9gfv0nn8vrrxa4az359whqdhmzw4r51nn3add8pn3s9ip";
};
buildInputs = [ pkgs.zookeeper_mt ];
+ nativeBuildInputs = [ pkgs.gnused ];
# fix "error: format not a string literal and no format arguments [-Werror=format-security]"
hardeningDisable = [ "format" ];
- NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
+ # Make the async API accessible
+ NIX_CFLAGS_COMPILE = "-DTHREADED";
NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
+ # Most tests are skipped as no server is available in the sandbox.
+ # `t/35_log.t` seems to suffer from a race condition; remove it. See
+ # https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513
+ preCheck = ''
+ rm t/35_log.t
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ rm t/30_connect.t
+ rm t/45_class.t
+ '';
meta = {
- maintainers = [ maintainers.limeytexan ];
+ maintainers = with maintainers; [ limeytexan ztzg ];
homepage = "https://github.com/mark-5/p5-net-zookeeper";
license = stdenv.lib.licenses.asl20;
};
diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
index d5bebb9bd8..cc8ba346ae 100644
--- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c
+{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c
, gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
@@ -6,7 +6,7 @@
, readline, rsync, fetchpatch, valgrind
}:
-let
+lib.makeScope pkgs.newScope (self: with self; {
buildPecl = import ../build-support/build-pecl.nix {
php = php.unwrapped;
inherit lib;
@@ -21,15 +21,10 @@ let
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
- callPackage = pkgs.newScope {
- inherit mkDerivation php buildPecl pcre';
- };
-in
-{
- inherit buildPecl;
+ php = phpPackage;
# This is a set of interactive tools based on PHP.
- packages = {
+ tools = {
box = callPackage ../development/php-packages/box { };
composer = callPackage ../development/php-packages/composer { };
@@ -550,4 +545,4 @@ in
# Produce the final attribute set of all extensions defined.
in builtins.listToAttrs namedExtensions);
-}
+})
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 2ff6441631..440b53aaf2 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -504,8 +504,8 @@ in {
awesome-slugify = callPackage ../development/python-modules/awesome-slugify { };
+ awkward0 = callPackage ../development/python-modules/awkward0 { };
awkward = callPackage ../development/python-modules/awkward { };
- awkward1 = callPackage ../development/python-modules/awkward1 { };
aws-adfs = callPackage ../development/python-modules/aws-adfs { };
@@ -1175,6 +1175,8 @@ in {
cirq = callPackage ../development/python-modules/cirq { };
+ ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
+
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
citeproc-py = callPackage ../development/python-modules/citeproc-py { };
@@ -1389,12 +1391,12 @@ in {
cryptacular = callPackage ../development/python-modules/cryptacular { };
cryptography = if isPy27 then
- callPackage ../development/python-modules/cryptography/2.9.nix { }
+ callPackage ../development/python-modules/cryptography/3.3.nix { }
else
callPackage ../development/python-modules/cryptography { };
cryptography_vectors = if isPy27 then
- callPackage ../development/python-modules/cryptography/vectors-2.9.nix { }
+ callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }
else
callPackage ../development/python-modules/cryptography/vectors.nix { };
@@ -2070,7 +2072,10 @@ in {
feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; };
- feedparser = callPackage ../development/python-modules/feedparser { };
+ feedparser = if isPy3k then
+ callPackage ../development/python-modules/feedparser { }
+ else
+ callPackage ../development/python-modules/feedparser/5.nix { };
fenics = callPackage ../development/libraries/science/math/fenics {
inherit (pkgs) pkg-config;
@@ -3509,7 +3514,10 @@ in {
libtmux = callPackage ../development/python-modules/libtmux { };
- libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
+ libtorrent-rasterbar = if isPy27 then
+ (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python
+ else
+ (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python;
libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };
@@ -3646,7 +3654,24 @@ in {
macropy = callPackage ../development/python-modules/macropy { };
- maestral = callPackage ../development/python-modules/maestral { };
+ maestral = callPackage ../development/python-modules/maestral {
+
+ # https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048
+ survey = self.survey.overridePythonAttrs (old: rec {
+ version = "2.2.1";
+ src = old.src.override {
+ inherit version;
+ sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0=";
+ };
+ });
+ watchdog = self.watchdog.overridePythonAttrs (old: rec {
+ version = "0.10.3";
+ src = old.src.override {
+ inherit version;
+ sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04";
+ };
+ });
+ };
magic = callPackage ../development/python-modules/magic { };
@@ -4769,6 +4794,8 @@ in {
pre-commit = callPackage ../development/python-modules/pre-commit { };
+ pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { };
+
preggy = callPackage ../development/python-modules/preggy { };
premailer = callPackage ../development/python-modules/premailer { };
@@ -4777,7 +4804,10 @@ in {
pretend = callPackage ../development/python-modules/pretend { };
- prettytable = callPackage ../development/python-modules/prettytable { };
+ prettytable = if isPy3k then
+ callPackage ../development/python-modules/prettytable { }
+ else
+ callPackage ../development/python-modules/prettytable/1.nix { };
priority = callPackage ../development/python-modules/priority { };
@@ -5227,8 +5257,6 @@ in {
pyipp = callPackage ../development/python-modules/pyipp { };
- pyjade = callPackage ../development/python-modules/pyjade { };
-
pyjet = callPackage ../development/python-modules/pyjet { };
pyjks = callPackage ../development/python-modules/pyjks { };
@@ -5465,6 +5493,8 @@ in {
pypubsub = callPackage ../development/python-modules/pypubsub { };
+ pypugjs = callPackage ../development/python-modules/pypugjs { };
+
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };
@@ -5797,7 +5827,7 @@ in {
pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };
- pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { };
+ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
@@ -6192,7 +6222,7 @@ in {
pyzufall = callPackage ../development/python-modules/pyzufall { };
- qasm2image = callPackage ../development/python-modules/qasm2image { };
+ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
@@ -7007,6 +7037,7 @@ in {
sqlitedict = callPackage ../development/python-modules/sqlitedict { };
+ sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { };
sqlite-utils = callPackage ../development/python-modules/sqlite-utils { };
sqlmap = callPackage ../development/python-modules/sqlmap { };
@@ -7117,6 +7148,8 @@ in {
sure = callPackage ../development/python-modules/sure { };
+ survey = callPackage ../development/python-modules/survey { };
+
suseapi = callPackage ../development/python-modules/suseapi { };
svg2tikz = callPackage ../development/python-modules/svg2tikz { };
@@ -7175,7 +7208,9 @@ in {
telegram = callPackage ../development/python-modules/telegram { };
- telethon = callPackage ../development/python-modules/telethon { };
+ telethon = callPackage ../development/python-modules/telethon {
+ inherit (pkgs) openssl;
+ };
telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { };
@@ -7412,7 +7447,10 @@ in {
trackpy = callPackage ../development/python-modules/trackpy { };
- traitlets = callPackage ../development/python-modules/traitlets { };
+ traitlets = if pythonOlder "3.7" then
+ callPackage ../development/python-modules/traitlets/4.nix { }
+ else
+ callPackage ../development/python-modules/traitlets { };
traits = callPackage ../development/python-modules/traits { };
@@ -7596,9 +7634,9 @@ in {
update-dotdee = callPackage ../development/python-modules/update-dotdee { };
- uproot = callPackage ../development/python-modules/uproot { };
+ uproot3 = callPackage ../development/python-modules/uproot3 { };
- uproot-methods = callPackage ../development/python-modules/uproot-methods { };
+ uproot3-methods = callPackage ../development/python-modules/uproot3-methods { };
uptime = callPackage ../development/python-modules/uptime { };
@@ -7694,6 +7732,8 @@ in {
vmprof = callPackage ../development/python-modules/vmprof { };
+ vncdo = callPackage ../development/python-modules/vncdo { };
+
vobject = callPackage ../development/python-modules/vobject { };
voluptuous = callPackage ../development/python-modules/voluptuous { };
@@ -7805,6 +7845,8 @@ in {
wptserve = callPackage ../development/python-modules/wptserve { };
+ wrapio = callPackage ../development/python-modules/wrapio { };
+
wrapt = callPackage ../development/python-modules/wrapt { };
wrf-python = callPackage ../development/python-modules/wrf-python { };
@@ -7819,6 +7861,8 @@ in {
WSME = callPackage ../development/python-modules/WSME { };
+ wsnsimpy = callPackage ../development/python-modules/wsnsimpy { };
+
wsproto = if (pythonAtLeast "3.6") then
callPackage ../development/python-modules/wsproto { }
else
diff --git a/third_party/nixpkgs/pkgs/top-level/release-alternatives.nix b/third_party/nixpkgs/pkgs/top-level/release-alternatives.nix
index 7479377bd3..5e309a0129 100644
--- a/third_party/nixpkgs/pkgs/top-level/release-alternatives.nix
+++ b/third_party/nixpkgs/pkgs/top-level/release-alternatives.nix
@@ -9,7 +9,7 @@ let
blasUsers = [
# "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull"
"fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus"
- "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4"
+ "sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4"
"suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra"
"arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo"
"xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta"
diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix
index b8d0d16e97..6720a019cb 100644
--- a/third_party/nixpkgs/pkgs/top-level/static.nix
+++ b/third_party/nixpkgs/pkgs/top-level/static.nix
@@ -319,4 +319,6 @@ in {
configureFlags = attrs.configureFlags ++ [ "--disable-shared" ];
});
});
+
+ libcap = super.libcap.override { pam = null; };
}