diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 7c39ce48a3..211779a470 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -55,6 +55,13 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc +# Updaters +## update.nix +/maintainers/scripts/update.nix @jtojnar +/maintainers/scripts/update.py @jtojnar +## common-updater-scripts +/pkgs/common-updater/scripts/update-source-version @jtojnar + # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh @jonringer diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index f443380780..48b84f8c36 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -15,7 +15,7 @@ Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/do -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) +- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) - Built on platform(s) - [ ] NixOS - [ ] macOS diff --git a/third_party/nixpkgs/doc/contributing/quick-start.xml b/third_party/nixpkgs/doc/contributing/quick-start.xml index 8e4e914d45..09d60834ec 100644 --- a/third_party/nixpkgs/doc/contributing/quick-start.xml +++ b/third_party/nixpkgs/doc/contributing/quick-start.xml @@ -111,7 +111,7 @@ The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the chapter on writing Nix expressions. + xlink:href="https://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions. diff --git a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md new file mode 100644 index 0000000000..7a5dc767b7 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md @@ -0,0 +1,96 @@ +--- +title: Agda +author: Alex Rice (alexarice) +date: 2020-01-06 +--- +# Agda + +## How to use Agda + +Agda can be installed from `agda`: +``` +$ nix-env -iA agda +``` + +To use agda with libraries, the `agda.withPackages` function can be used. This function either takes: ++ A list of packages, ++ or a function which returns a list of packages when given the `agdaPackages` attribute set, ++ or an attribute set containing a list of packages and a GHC derivation for compilation (see below). + +For example, suppose we wanted a version of agda which has access to the standard library. This can be obtained with the expressions: + +``` +agda.withPackages [ agdaPackages.standard-library ] +``` + +or + +``` +agda.withPackages (p: [ p.standard-library ]) +``` + +or can be called as in the [Compiling Agda](#compiling-agda) section. + +If you want to use a library in your home directory (for instance if it is a development version) then typecheck it manually (using `agda.withPackages` if necessary) and then override the `src` attribute of the package to point to your local repository. + +Agda will not by default use these libraries. To tell agda to use the library we have some options: +- Call `agda` with the library flag: +``` +$ agda -l standard-library -i . MyFile.agda +``` +- Write a `my-library.agda-lib` file for the project you are working on which may look like: +``` +name: my-library +include: . +depends: standard-library +``` +- Create the file `~/.agda/defaults` and add any libraries you want to use by default. + +More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). + +## Compiling Agda +Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag. +This can be overridden by a different version of `ghc` as follows: + +``` +agda.withPackages { + pkgs = [ ... ]; + ghc = haskell.compiler.ghcHEAD; +} +``` + +## Writing Agda packages +To write a nix derivation for an agda library, first check that the library has a `*.agda-lib` file. + +A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions: ++ `everythingFile` can be used to specify the location of the `Everything.agda` file, defaulting to `./Everything.agda`. If this file does not exist then either it should be patched in or the `buildPhase` should be overridden (see below). ++ `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. ++ `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. + +The build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden (or a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file). `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. The install phase simply copies all `.agda`, `.agdai` and `.agda-lib` files to the output directory. Again, this can be overridden. + +To add an agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other agda libraries, so the top line of the `default.nix` can look like: +``` +{ mkDerivation, standard-library, fetchFromGitHub }: +``` +and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib: + +``` +mkDerivation { + version = "1.5.0"; + pname = "iowa-stdlib"; + + src = ... + + libraryFile = ""; + libraryName = "IAL-1.3"; + + buildPhase = '' + patchShebangs find-deps.sh + make + ''; +} +``` +This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. + +When writing an agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes agda to think that the nix store is a agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). diff --git a/third_party/nixpkgs/doc/languages-frameworks/android.section.md b/third_party/nixpkgs/doc/languages-frameworks/android.section.md index 6ee450eeb5..1a8924082b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/android.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/android.section.md @@ -167,7 +167,7 @@ parameters that the SDK composition function (the function shown in the previous section) supports. This build function is particularly useful when it is desired to use -[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution +[Hydra](https://nixos.org/hydra): the Nix-based continuous integration solution to build Android apps. An Android APK gets exposed as a build product and can be installed on any Android device with a web browser by navigating to the build result page. diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.xml b/third_party/nixpkgs/doc/languages-frameworks/gnome.xml index 7671714d8a..159216ca98 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.xml @@ -40,6 +40,23 @@ +
+ Packaging icon themes + + + Icon themes may inherit from other icon themes. The inheritance is specified using the Inherits key in the index.theme file distributed with the icon theme. According to the icon theme specification, icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. + + + + The package hicolor-icon-theme provides a setup hook which makes symbolic links for the parent themes into the directory share/icons of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with hicolor-icon-theme. + + + + Also make sure that icon-theme.cache is installed for each theme provided by the package, and set dontDropIconThemeCache to true so that the cache file is not removed by the gtk3 setup hook. + + +
+
GTK Themes diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.xml b/third_party/nixpkgs/doc/languages-frameworks/go.xml index 84b146532b..ff39276f64 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/go.xml @@ -36,7 +36,7 @@ pet = buildGoModule rec { sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; }; - modSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; subPackages = [ "." ]; @@ -56,7 +56,7 @@ pet = buildGoModule rec { - modSha256 is the hash of the output of the intermediate fetcher derivation. + vendorSha256 is the hash of the output of the intermediate fetcher derivation. @@ -68,12 +68,12 @@ pet = buildGoModule rec { - modSha256 can also take null as an input. + vendorSha256 can also take null as an input. - When `null` is used as a value, the derivation won't be a - fixed-output derivation but disable the build sandbox instead. This can be useful outside - of nixpkgs where re-generating the modSha256 on each mod.sum changes is cumbersome, - but will fail to build by Hydra, as builds with a disabled sandbox are discouraged. + When `null` is used as a value, rather than fetching the dependencies + and vendoring them, we use the vendoring included within the source repo. + If you'd like to not have to update this field on dependency changes, + run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
@@ -191,18 +191,6 @@ deis = buildGoPackage rec { To extract dependency information from a Go package in automated way use go2nix. It can produce complete derivation and goDeps file for Go programs. - - buildGoPackage produces where bin includes program binaries. You can test build a Go binary as follows: - -$ nix-build -A deis.bin - - or build all outputs with: - -$ nix-build -A deis.all - - bin output will be installed by default with nix-env -i or systemPackages. - - You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index b727f2fb63..cba4d0561b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -103,8 +103,8 @@ command displays the complete list of available compilers: $ nix-env -f "" -qaP -A haskell.compiler haskell.compiler.ghc8101 ghc-8.10.1 haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 -haskell.compiler.ghcHEAD ghc-8.11.20200403 -haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 +haskell.compiler.ghcHEAD ghc-8.11.20200505 +haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505 haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc863Binary ghc-8.6.3-binary diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index a6f56d791c..2414956995 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -5,6 +5,7 @@ The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. + diff --git a/third_party/nixpkgs/doc/languages-frameworks/ios.section.md b/third_party/nixpkgs/doc/languages-frameworks/ios.section.md index 5a81795c00..768e0690b9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ios.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ios.section.md @@ -18,7 +18,7 @@ The primary objective of this project is to use the Nix expression language to specify how iOS apps can be built from source code, and to automatically spawn iOS simulator instances for testing. -This component also makes it possible to use [Hydra](http://nixos.org/hydra), +This component also makes it possible to use [Hydra](https://nixos.org/hydra), the Nix-based continuous integration server to regularly build iOS apps and to do wireless ad-hoc installations of enterprise IPAs on iOS devices through Hydra. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index e6f0b64fa9..35ea480e6b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -9,7 +9,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python` refers to the default interpreter, which is currently CPython 2.7. It is also possible to refer to -specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to +specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is @@ -25,10 +25,10 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. +is `python.pkgs.toolz`, and the CPython 3.8 version is `python38.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. -`pythonPackages` refers to `python.pkgs` and `python35Packages` to -`python35.pkgs`. +`pythonPackages` refers to `python.pkgs` and `python38Packages` to +`python38.pkgs`. #### Installing Python and packages @@ -36,121 +36,191 @@ The Nix and NixOS manuals explain how packages are generally installed. In the case of Python and Nix, it is important to make a distinction between whether the package is considered an application or a library. -Applications on Nix are typically installed into your user -profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the -package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. -Dependencies such as libraries are automatically installed and should not be -installed explicitly. +Applications on Nix are typically installed into your user profile imperatively +using `nix-env -i`, and on NixOS declaratively by adding the package name to +`environment.systemPackages` in `/etc/nixos/configuration.nix`. Dependencies +such as libraries are automatically installed and should not be installed +explicitly. -The same goes for Python applications and libraries. Python applications can be -installed in your profile. But Python libraries you would like to use for -development cannot be installed, at least not individually, because they won't -be able to find each other resulting in import errors. Instead, it is possible -to create an environment with `python.buildEnv` or `python.withPackages` where -the interpreter and other executables are able to find each other and all of the -modules. +The same goes for Python applications. Python applications can be installed in +your profile, and will be wrapped to find their exact library dependencies, +without impacting other applications or polluting your user environment. -In the following examples we create an environment with Python 3.5, `numpy` and -`toolz`. As you may imagine, there is one limitation here, and that's that -you can install only one environment at a time. You will notice the complaints -about collisions when you try to install a second environment. +But Python libraries you would like to use for development cannot be installed, +at least not individually, because they won't be able to find each other +resulting in import errors. Instead, it is possible to create an environment +with `python.buildEnv` or `python.withPackages` where the interpreter and other +executables are wrapped to be able to find each other and all of the modules. -##### Environment defined in separate `.nix` file +In the following examples we will start by creating a simple, ad-hoc environment +with a nix-shell that has `numpy` and `toolz` in Python 3.8; then we will create +a re-usable environment in a single-file Python script; then we will create a +full Python environment for development with this same environment. -Create a file, e.g. `build.nix`, with the following expression -```nix -with import {}; +Philosphically, this should be familiar to users who are used to a `venv` style +of development: individual projects create their own Python environments without +impacting the global environment or each other. -python35.withPackages (ps: with ps; [ numpy toolz ]) -``` -and install it in your profile with -```shell -nix-env -if build.nix -``` -Now you can use the Python interpreter, as well as the extra packages (`numpy`, -`toolz`) that you added to the environment. +#### Ad-hoc temporary Python environment with `nix-shell` -##### Environment defined in `~/.config/nixpkgs/config.nix` +The simplest way to start playing with the way nix wraps and sets up Python +environments is with `nix-shell` at the cmdline. These environments create a +temporary shell session with a Python and a *precise* list of packages (plus +their runtime dependencies), with no other Python packages in the Python +interpreter's scope. -If you prefer you could also add the environment as a package override to the -Nixpkgs set, e.g. using `config.nix`, - -```nix -{ # ... - - packageOverrides = pkgs: with pkgs; { - myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); - }; -} -``` -and install it in your profile with - -```shell -nix-env -iA nixpkgs.myEnv -``` - -The environment is is installed by referring to the attribute, and considering -the `nixpkgs` channel was used. - -##### Environment defined in `/etc/nixos/configuration.nix` - -For the sake of completeness, here's another example how to install the -environment system-wide. - -```nix -{ # ... - - environment.systemPackages = with pkgs; [ - (python35.withPackages(ps: with ps; [ numpy toolz ])) - ]; -} -``` - -#### Temporary Python environment with `nix-shell` - -The examples in the previous section showed how to install a Python environment -into a profile. For development you may need to use multiple environments. -`nix-shell` gives the possibility to temporarily load another environment, akin -to `virtualenv`. - -There are two methods for loading a shell with Python packages. The first and -recommended method is to create an environment with `python.buildEnv` or -`python.withPackages` and load that. E.g. +To create a Python 3.8 session with `numpy` and `toolz` available, run: ```sh -$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' ``` -opens a shell from which you can launch the interpreter +By default `nix-shell` will start a `bash` session with this interpreter in our +`PATH`, so if we then run: + +``` +[nix-shell:~/src/nixpkgs]$ python3 +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import numpy; import toolz +``` + +Note that no other modules are in scope, even if they were imperatively +installed into our user environment as a dependency of a Python application: + +``` +>>> import requests +Traceback (most recent call last): + File "", line 1, in +ModuleNotFoundError: No module named 'requests' +``` + +We can add as many additional modules onto the `nix-shell` as we need, and we +will still get 1 wrapped Python interpreter. We can start the interpreter +directly like so: ```sh -[nix-shell:~] python3 +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz requests ])' --run python3 +these derivations will be built: + /nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv +building '/nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv'... +created 277 symlinks in user environment +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import requests +>>> ``` -The other method, which is not recommended, does not create an environment and -requires you to list the packages directly, +Notice that this time it built a new Python environment, which now includes +`requests`. Building an environment just creates wrapper scripts that expose the +selected dependencies to the interpreter while re-using the actual modules. This +means if any other env has installed `requests` or `numpy` in a different +context, we don't need to recompile them -- we just recompile the wrapper script +that sets up an interpreter pointing to them. This matters much more for "big" +modules like `pytorch` or `tensorflow`. + +Module names usually match their names on [pypi.org](https://pypi.org/), but +you can use the [Nixpkgs search website](https://nixos.org/nixos/packages.html) +to find them as well (along with non-python packages). + +At this point we can create throwaway experimental Python environments with +arbitrary dependencies. This is a good way to get a feel for how the Python +interpreter and dependencies work in Nix and NixOS, but to do some actual +development, we'll want to make it a bit more persistent. + +##### Running Python scripts and using `nix-shell` as shebang + +Sometimes, we have a script whose header looks like this: + +```python +#!/usr/bin/env python3 +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +Executing this script requires a `python3` that has `numpy`. Using what we learned +in the previous section, we could startup a shell and just run it like so: + +``` +nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' +The dot product of [1 2] and [3 4] is: 11 +``` + +But if we maintain the script ourselves, and if there are more dependencies, it +may be nice to encode those dependencies in source to make the script re-usable +without that bit of knowledge. That can be done by using `nix-shell` as a +[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +Then we simply execute it, without requiring any environment setup at all! ```sh -$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz +$ ./foo.py +The dot product of [1 2] and [3 4] is: 11 ``` -Again, it is possible to launch the interpreter from the shell. The Python -interpreter has the attribute `pkgs` which contains all Python libraries for -that specific interpreter. +If the dependencies are not available on the host where `foo.py` is executed, it +will build or download them from a Nix binary cache prior to starting up, prior +that it is executed on a machine with a multi-user nix installation. + +This provides a way to ship a self bootstrapping Python script, akin to a +statically linked binary, where it can be run on any machine (provided nix is +installed) without having to assume that `numpy` is installed globally on the +system. + +By default it is pulling the import checkout of Nixpkgs itself from our nix +channel, which is nice as it cache aligns with our other package builds, but we +can make it fully reproducible by pinning the `nixpkgs` import: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +#!nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/d373d80b1207d52621961b16aa4a3438e4f98167.tar.gz +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +This will execute with the exact same versions of Python 3.8, numpy, and system +dependencies a year from now as it does today, because it will always use +exactly git commit `d373d80b1207d52621961b16aa4a3438e4f98167` of Nixpkgs for all +of the package versions. + +This is also a great way to ensure the script executes identically on different +servers. ##### Load environment from `.nix` expression -As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.5, `numpy` -and `toolz`, like before, in an environment. Consider a `shell.nix` file -with + +We've now seen how to create an ad-hoc temporary shell session, and how to +create a single script with Python dependencies, but in the course of normal +development we're usually working in an entire package repository. + +As explained in the Nix manual, `nix-shell` can also load an expression from a +`.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before, +in an environment. We can add a `shell.nix` file describing our dependencies: ```nix with import {}; - -(python35.withPackages (ps: [ps.numpy ps.toolz])).env +(python38.withPackages (ps: [ps.numpy ps.toolz])).env ``` -Executing `nix-shell` gives you again a Nix shell from which you can run Python. +And then at the command line, just typing `nix-shell` produces the same +environment as before. In a normal project, we'll likely have many more +dependencies; this can provide a way for developers to share the environments +with each other and with CI builders. What's happening here? @@ -158,9 +228,9 @@ What's happening here? imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.5 environment with the `withPackages` function. +2. Then we create a Python 3.8 environment with the `withPackages` function, as before. 3. The `withPackages` function expects us to provide a function as an argument - that takes the set of all python packages and returns a list of packages to + that takes the set of all Python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. @@ -168,59 +238,106 @@ To combine this with `mkShell` you can: ```nix with import {}; - let - pythonEnv = python35.withPackages (ps: [ + pythonEnv = python38.withPackages (ps: [ ps.numpy ps.toolz ]); in mkShell { buildInputs = [ pythonEnv - hello + + black + mypy + + libffi + openssl ]; } ``` -##### Execute command with `--run` -A convenient option with `nix-shell` is the `--run` -option, with which you can execute a command in the `nix-shell`. We can -e.g. directly open a Python shell +This will create a unified environment that has not just our Python interpreter +and its Python dependencies, but also tools like `black` or `mypy` and libraries +like `libffi` the `openssl` in scope. This is generic and can span any number of +tools or languages across the Nixpkgs ecosystem. -```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" +##### Installing environments globally on the system + +Up to now, we've been creating environments scoped to an ad-hoc shell session, +or a single script, or a single project. This is generally advisable, as it +avoids pollution across contexts. + +However, sometimes we know we will often want a Python with some basic packages, +and want this available without having to enter into a shell or build context. +This can be useful to have things like vim/emacs editors and plugins or shell +tools "just work" without having to set them up, or when running other software +that expects packages to be installed globally. + +To create your own custom environment, create a file in `~/.config/nixpkgs/overlays/` +that looks like this: + +```nix +# ~/.config/nixpkgs/overlays/myEnv.nix +self: super: { + myEnv = super.buildEnv { + name = "myEnv"; + paths = [ + # A Python 3 interpreter with some packages + (self.python3.withPackages ( + ps: with ps; [ + pyflakes + pytest + python-language-server + ] + )) + + # Some other packages we'd like as part of this env + self.mypy + self.black + self.ripgrep + self.tmux + ]; + }; +} ``` -or run a script +You can then build and install this to your profile with: ```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" +nix-env -iA myEnv ``` -##### `nix-shell` as shebang -In fact, for the second use case, there is a more convenient method. You can add -a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./myscript.py`, and it will make available all dependencies -and run the script in the `python3` shell. +One limitation of this is that you can only have 1 Python env installed +globally, since they conflict on the `python` to load out of your `PATH`. -```py -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" +If you get a conflict or prefer to keep the setup clean, you can have `nix-env` +atomically *uninstall* all other imperatively installed packages and replace +your profile with just `myEnv` by using the `--replace` flag. -import numpy +##### Environment defined in `/etc/nixos/configuration.nix` -print(numpy.__version__) +For the sake of completeness, here's how to install the environment system-wide +on NixOS. + +```nix +{ # ... + + environment.systemPackages = with pkgs; [ + (python38.withPackages(ps: with ps; [ numpy toolz ])) + ]; +} ``` ### Developing with Python -Now that you know how to get a working Python environment with Nix, it is time -to go forward and start actually developing with Python. We will first have a -look at how Python packages are packaged on Nix. Then, we will look at how you -can use development mode with your code. +Above, we were mostly just focused on use cases and what to do to get started +creating working Python environments in nix. -#### Packaging a library +Now that you know the basics to be up and running, it is time to take a step +back and take a deeper look at at how Python packages are packaged on Nix. Then, +we will look at how you can use development mode with your code. + +#### Python library packages in Nixpkgs With Nix all packages are built by functions. The main function in Nix for building Python libraries is `buildPythonPackage`. Let's see how we can build the @@ -231,11 +348,11 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -260,8 +377,9 @@ information. The output of the function is a derivation. An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available -for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` -derivation corresponding to the CPython 3.5 interpreter. +for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.8 interpreter. + The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, you will want to test a Nix expression outside of the Nixpkgs tree. @@ -273,13 +391,13 @@ and adds it along with a `numpy` package to a Python environment. with import {}; ( let - my_toolz = python35.pkgs.buildPythonPackage rec { + my_toolz = python38.pkgs.buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; - src = python35.pkgs.fetchPypi { + src = python38.pkgs.fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -290,12 +408,12 @@ with import {}; }; }; - in python35.withPackages (ps: [ps.numpy my_toolz]) + in python38.withPackages (ps: [ps.numpy my_toolz]) ).env ``` Executing `nix-shell` will result in an environment in which you can use -Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +Python 3.8 and the `toolz` package. As you can see we had to explicitly mention for which Python version we want to build a package. So, what did we do here? Well, we took the Nix expression that we used earlier @@ -312,7 +430,7 @@ Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be -included as a `buildInput`, but if it is (also) a runtime dependency, then it +included in `buildInputs`, but if it is (also) a runtime dependency, then it should be added to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies and passed to `checkInputs`. @@ -423,10 +541,11 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s #### Develop local package -As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); -instead of installing the package this command creates a special link to the project code. -That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available. Let's see how you can use it. +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) +(`python setup.py develop`); instead of installing the package this command +creates a special link to the project code. That way, you can run updated code +without having to reinstall after each and every change you make. Development +mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using `src = ./path/to/source/tree;` @@ -435,7 +554,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. -In the following example we create a simple environment that has a Python 3.5 +In the following example we create a simple environment that has a Python 3.8 version of our package in it, as well as its dependencies and other packages we like to have in the environment, all specified with `propagatedBuildInputs`. Indeed, we can just add any package we like to have in our environment to @@ -443,7 +562,7 @@ Indeed, we can just add any package we like to have in our environment to ```nix with import {}; -with python35Packages; +with python38Packages; buildPythonPackage rec { name = "mypackage"; @@ -455,7 +574,6 @@ buildPythonPackage rec { It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. - ### Organising your packages So far we discussed how you can use Python on Nix, and how you can develop with @@ -481,11 +599,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; meta = with lib; { @@ -497,17 +615,17 @@ buildPythonPackage rec { } ``` -It takes an argument `buildPythonPackage`. -We now call this function using `callPackage` in the definition of our environment +It takes an argument `buildPythonPackage`. We now call this function using +`callPackage` in the definition of our environment ```nix with import {}; ( let toolz = callPackage /path/to/toolz/release.nix { - buildPythonPackage = python35Packages.buildPythonPackage; + buildPythonPackage = python38Packages.buildPythonPackage; }; - in python35.withPackages (ps: [ ps.numpy toolz ]) + in python38.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -515,8 +633,8 @@ Important to remember is that the Python version for which the package is made depends on the `python` derivation that is passed to `buildPythonPackage`. Nix tries to automatically pass arguments when possible, which is why generally you don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python35Packages`, -and in this case the `python35` interpreter is automatically used. +example we use `buildPythonPackage` that is part of the set `python38Packages`, +and in this case the `python38` interpreter is automatically used. ## Reference @@ -548,7 +666,7 @@ Each interpreter has the following attributes: - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. -- `executable`. Name of the interpreter executable, e.g. `python3.7`. +- `executable`. Name of the interpreter executable, e.g. `python3.8`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Building packages and applications @@ -643,7 +761,7 @@ following are specific to `buildPythonPackage`: appears more than once in dependency tree. Default is `true`. * `disabled` ? false: If `true`, package is not built for the particular Python interpreter version. -* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. +* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs. * `installFlags ? []`: A list of strings. Arguments to be passed to `pip @@ -662,7 +780,7 @@ following are specific to `buildPythonPackage`: variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this - defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications + defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). @@ -730,7 +848,7 @@ Another difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. -When packaging a python application with `buildPythonApplication`, it should be +When packaging a Python application with `buildPythonApplication`, it should be called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: @@ -761,7 +879,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; ``` Since the package is an application, a consumer doesn't need to care about -python versions or modules, which is why they don't go in `pythonPackages`. +Python versions or modules, which is why they don't go in `pythonPackages`. #### `toPythonApplication` function @@ -875,7 +993,7 @@ thus be also written like this: ```nix with import {}; -(python36.withPackages (ps: [ps.numpy ps.requests])).env +(python38.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the @@ -932,7 +1050,7 @@ pythonPackages.buildPythonPackage { Running `nix-shell` with no arguments should give you the environment in which the package would be built with `nix-build`. -Shortcut to setup environments with C headers/libraries and python packages: +Shortcut to setup environments with C headers/libraries and Python packages: ```shell nix-shell -p pythonPackages.pyramid zlib libjpeg git @@ -960,10 +1078,9 @@ has security implications and is relevant for those using Python in a When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` -and [PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. - ### Automatic tests It is recommended to test packages as part of the build process. @@ -976,7 +1093,7 @@ example of such a situation is when `py.test` is used. #### Common issues * Non-working tests can often be deselected. By default `buildPythonPackage` - runs `python setup.py test`. Most python modules follows the standard test + runs `python setup.py test`. Most Python modules follows the standard test protocol where the pytest runner can be used instead. `py.test` supports a `-k` parameter to ignore test methods or classes: @@ -1014,7 +1131,7 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; - in pkgs.python35.override {inherit packageOverrides;}; + in pkgs.python38.override {inherit packageOverrides;}; in python.withPackages(ps: [ps.pandas])).env ``` @@ -1036,7 +1153,7 @@ with import {}; packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) + in (pkgs.python38.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) ).env ``` @@ -1049,12 +1166,12 @@ If you want the whole of Nixpkgs to use your modifications, then you can use ```nix let pkgs = import {}; - newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { - python27 = let - packageOverrides = self: super: { - numpy = super.numpy_1_10; + newpkgs = import pkgs.path { overlays = [ (self: super: { + python38 = let + packageOverrides = python-self: python-super: { + numpy = python-super.numpy_1_18; }; - in pkgssuper.python27.override {inherit packageOverrides;}; + in super.python38.override {inherit packageOverrides;}; } ) ]; }; in newpkgs.inkscape ``` @@ -1127,14 +1244,14 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. -### How to consume python modules using pip in a virtual environment like I am used to on other Operating Systems? +### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing projects or in situations where it's not feasible or desired to write derivations for all required dependencies. This is an example of a `default.nix` for a `nix-shell`, which allows to consume -a virtual environment created by `venv`, and install python modules through +a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. Create this `default.nix` file, together with a `requirements.txt` and simply @@ -1149,7 +1266,7 @@ in pkgs.mkShell rec { name = "impurePythonEnv"; venvDir = "./.venv"; buildInputs = [ - # A python interpreter including the 'venv' module is required to bootstrap + # A Python interpreter including the 'venv' module is required to bootstrap # the environment. pythonPackages.python @@ -1163,7 +1280,7 @@ in pkgs.mkShell rec { pythonPackages.requests # In this particular example, in order to compile any binary extensions they may - # require, the python modules listed in the hypothetical requirements.txt need + # require, the Python modules listed in the hypothetical requirements.txt need # the following packages to be installed locally: taglib openssl @@ -1183,7 +1300,7 @@ in pkgs.mkShell rec { } ``` -In case the supplied venvShellHook is insufficient, or when python 2 support is +In case the supplied venvShellHook is insufficient, or when Python 2 support is needed, you can define your own shell hook and adapt to your needs like in the following example: @@ -1229,7 +1346,7 @@ in pkgs.mkShell rec { ``` Note that the `pip install` is an imperative action. So every time `nix-shell` -is executed it will attempt to download the python modules listed in +is executed it will attempt to download the Python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. @@ -1290,9 +1407,8 @@ self: super: { ### How to use Intel's MKL with numpy and scipy? -MKL can be configured using an overlay. See the section “[Using -overlays to configure -alternatives](#sec-overlays-alternatives-blas-lapack)”. +MKL can be configured using an overlay. See the section "[Using overlays to +configure alternatives](#sec-overlays-alternatives-blas-lapack)". ### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? diff --git a/third_party/nixpkgs/doc/preface.chapter.md b/third_party/nixpkgs/doc/preface.chapter.md index 7fa65ab110..549e42de7a 100644 --- a/third_party/nixpkgs/doc/preface.chapter.md +++ b/third_party/nixpkgs/doc/preface.chapter.md @@ -42,7 +42,7 @@ distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs` channel. -The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/), +The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), which also builds binary packages from the Nix expressions in Nixpkgs for `x86_64-linux`, `i686-linux` and `x86_64-darwin`. The binaries are made available via a [binary cache](https://cache.nixos.org). diff --git a/third_party/nixpkgs/doc/release-notes.xml b/third_party/nixpkgs/doc/release-notes.xml index 7575289e75..a15f546672 100644 --- a/third_party/nixpkgs/doc/release-notes.xml +++ b/third_party/nixpkgs/doc/release-notes.xml @@ -286,7 +286,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/ This release of Nixpkgs requires Nix 0.10 or higher. +xlink:href='https://nixos.org/releases/nix/nix-0.10/'>Nix 0.10 or higher. @@ -436,7 +436,7 @@ stdenv.mkDerivation { Distribution files have been moved to . + xlink:href="https://nixos.org/" />. diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml index 206203be1c..65a343d7ed 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.xml +++ b/third_party/nixpkgs/doc/stdenv/stdenv.xml @@ -145,7 +145,7 @@ genericBuild - GNU Make. It has been patched to provide nested output that can be fed into the nix-log2xml command and log2html stylesheet to create a structured, readable output of the build steps performed by Make. + GNU Make. diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index d00c4abec0..e7f59a67ab 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -141,7 +141,7 @@ let mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy - fakeSri fakeSha256 fakeSha512 + fakeHash fakeSha256 fakeSha512 nixType imap; inherit (versions) splitVersion; diff --git a/third_party/nixpkgs/lib/deprecated.nix b/third_party/nixpkgs/lib/deprecated.nix index 8c4fe9c390..be0ef904c6 100644 --- a/third_party/nixpkgs/lib/deprecated.nix +++ b/third_party/nixpkgs/lib/deprecated.nix @@ -272,7 +272,7 @@ rec { imap = imap1; # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial - fakeSri = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + fakeHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000"; fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; } diff --git a/third_party/nixpkgs/lib/kernel.nix b/third_party/nixpkgs/lib/kernel.nix index 2ce19f8cb6..8045a228d0 100644 --- a/third_party/nixpkgs/lib/kernel.nix +++ b/third_party/nixpkgs/lib/kernel.nix @@ -14,7 +14,7 @@ with lib; freeform = x: { freeform = x; }; /* - Common patterns/legacy used in common-config/hardened-config.nix + Common patterns/legacy used in common-config/hardened/config.nix */ whenHelpers = version: { whenAtLeast = ver: mkIf (versionAtLeast version ver); diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index f9f3041277..f424946c72 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -73,8 +73,8 @@ rec { lconcat [ "a" "b" "c" ] => "zabc" # different types - lstrange = foldl (str: int: str + toString (int + 1)) "" - strange [ 1 2 3 4 ] + lstrange = foldl (str: int: str + toString (int + 1)) "a" + lstrange [ 1 2 3 4 ] => "a2345" */ foldl = op: nul: list: diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 9c98d743ee..cc2ea541d6 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1662,6 +1662,12 @@ } ]; }; + cyplo = { + email = "nixos@cyplo.dev"; + github = "cyplo"; + githubId = 217899; + name = "Cyryl Płotnicki"; + }; d-goldin = { email = "dgoldin+github@protonmail.ch"; github = "d-goldin"; @@ -2038,6 +2044,12 @@ githubId = 108501; name = "David Pflug"; }; + dramaturg = { + email = "seb@ds.ag"; + github = "dramaturg"; + githubId = 472846; + name = "Sebastian Krohn"; + }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; @@ -2476,7 +2488,7 @@ }; evils = { email = "evils.devils@protonmail.com"; - github = "evils-devils"; + github = "evils"; githubId = 30512529; name = "Evils"; }; @@ -4019,12 +4031,6 @@ fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; }]; }; - kjuvi = { - email = "quentin.vaucher@pm.me"; - github = "kjuvi"; - githubId = 17534323; - name = "Quentin Vaucher"; - }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -4429,6 +4435,16 @@ fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; }]; }; + lourkeur = { + name = "Louis Bettens"; + email = "louis@bettens.info"; + github = "lourkeur"; + githubId = 15657735; + keys = [{ + longkeyid = "ed25519/0xDFE1D4A017337E2A"; + fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; + }]; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; @@ -4599,6 +4615,12 @@ githubId = 2057309; name = "Sergey Sofeychuk"; }; + lynty = { + email = "ltdong93+nix@gmail.com"; + github = "lynty"; + githubId = 39707188; + name = "Lynn Dong"; + }; lyt = { email = "wheatdoge@gmail.com"; name = "Tim Liou"; @@ -5054,6 +5076,12 @@ githubId = 3269878; name = "Miguel Madrid Mencía"; }; + mindavi = { + email = "rol3517@gmail.com"; + github = "Mindavi"; + githubId = 9799623; + name = "Rick van Schijndel"; + }; minijackson = { email = "minijackson@riseup.net"; github = "minijackson"; @@ -5780,6 +5808,12 @@ githubId = 15930073; name = "Moritz Scheuren"; }; + pablovsky = { + email = "dealberapablo07@gmail.com"; + github = "pablo1107"; + githubId = 17091659; + name = "Pablo Andres Dealbera"; + }; pacien = { email = "b4gx3q.nixpkgs@pacien.net"; github = "pacien"; @@ -5852,6 +5886,16 @@ githubId = 131844; name = "Igor Pashev"; }; + patryk27 = { + email = "wychowaniec.patryk@gmail.com"; + github = "Patryk27"; + githubId = 3395477; + name = "Patryk Wychowaniec"; + keys = [{ + longkeyid = "rsa4096/0xF62547D075E09767"; + fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; + }]; + }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; @@ -7098,6 +7142,12 @@ githubId = 1505617; name = "Sean Lee"; }; + SlothOfAnarchy = { + email = "slothofanarchy1@gmail.com"; + github = "SlothOfAnarchy"; + githubId = 12828415; + name = "Michel Weitbrecht"; + }; smakarov = { email = "setser200018@gmail.com"; github = "setser"; @@ -7136,6 +7186,12 @@ githubId = 602439; name = "Serguei Narojnyi"; }; + snicket2100 = { + email = "57048005+snicket2100@users.noreply.github.com"; + github = "snicket2100"; + githubId = 57048005; + name = "snicket2100"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -7598,12 +7654,6 @@ githubId = 1141680; name = "Thane Gill"; }; - the-kenny = { - email = "moritz@tarn-vedra.de"; - github = "the-kenny"; - githubId = 31167; - name = "Moritz Ulrich"; - }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; @@ -7656,12 +7706,24 @@ githubId = 7709; name = "Thomaz Leite"; }; + thomasdesr = { + email = "git@hive.pw"; + github = "thomasdesr"; + githubId = 681004; + name = "Thomas Desrosiers"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; githubId = 678511; name = "Thomas Mader"; }; + thomasjm = { + email = "tom@codedown.io"; + github = "thomasjm"; + githubId = 1634990; + name = "Tom McLaughlin"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -8317,6 +8379,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xiorcale = { + email = "quentin.vaucher@pm.me"; + github = "xiorcale"; + githubId = 17534323; + name = "Quentin Vaucher"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; diff --git a/third_party/nixpkgs/maintainers/scripts/build.nix b/third_party/nixpkgs/maintainers/scripts/build.nix new file mode 100644 index 0000000000..c70993cf13 --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/build.nix @@ -0,0 +1,43 @@ +{ maintainer }: + +# based on update.nix +# nix-build build.nix --argstr maintainer + +let + pkgs = import ./../../default.nix {}; + maintainer_ = pkgs.lib.maintainers.${maintainer}; + packagesWith = cond: return: set: + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval + ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [ (return name pkg) ] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [ ] + ); + in + if result.success then result.value + else [ ] + ) + set + ) + ); +in +packagesWith + (name: pkg: + ( + if builtins.hasAttr "maintainers" pkg.meta + then ( + if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer_ pkg.meta.maintainers + else maintainer_ == pkg.meta.maintainers + ) + else false + ) + ) + (name: pkg: pkg) + pkgs diff --git a/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py b/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py index 6e7ec2dbc0..0f738c5427 100755 --- a/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py +++ b/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py @@ -79,7 +79,7 @@ def cli(jobset): and print a summary of failed builds """ - url = "http://hydra.nixos.org/jobset/{}".format(jobset) + url = "https://hydra.nixos.org/jobset/{}".format(jobset) # get the last evaluation click.echo(click.style( diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix index 7c45e148e8..66ea18ddf6 100755 --- a/third_party/nixpkgs/maintainers/scripts/update.nix +++ b/third_party/nixpkgs/maintainers/scripts/update.nix @@ -9,6 +9,10 @@ # TODO: add assert statements let + pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); + + inherit (pkgs) lib; + /* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity. */ nubOn = f: list: @@ -16,43 +20,44 @@ let [] else let - x = pkgs.lib.head list; - xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list); + x = lib.head list; + xs = lib.filter (p: f x != f p) (lib.drop 1 list); in [x] ++ nubOn f xs; - pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; }); + packagesWithPath = relativePath: cond: return: pathContent: + let + result = builtins.tryEval pathContent; - packagesWith = cond: return: set: - nubOn (pkg: pkg.updateScript) - (pkgs.lib.flatten - (pkgs.lib.mapAttrsToList - (name: pkg: - let - result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [(return name pkg)] - else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false - then packagesWith cond return pkg - else [] - ); - in - if result.success then result.value - else [] - ) - set - ) - ); + dedupResults = lst: nubOn (pkg: pkg.updateScript) (lib.concatLists lst); + in + if result.success then + let + pathContent = result.value; + in + if lib.isDerivation pathContent then + lib.optional (cond relativePath pathContent) (return relativePath pathContent) + else if lib.isAttrs pathContent then + # If user explicitly points to an attrSet or it is marked for recursion, we recur. + if relativePath == [] || pathContent.recurseForDerivations or false || pathContent.recurseForRelease or false then + dedupResults (lib.mapAttrsToList (name: elem: packagesWithPath (relativePath ++ [name]) cond return elem) pathContent) + else [] + else if lib.isList pathContent then + dedupResults (lib.imap0 (i: elem: packagesWithPath (relativePath ++ [i]) cond return elem) pathContent) + else [] + else []; + + packagesWith = packagesWithPath []; packagesWithUpdateScriptAndMaintainer = maintainer': let maintainer = - if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then + if ! builtins.hasAttr maintainer' lib.maintainers then builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`." else - builtins.getAttr maintainer' pkgs.lib.maintainers; + builtins.getAttr maintainer' lib.maintainers; in - packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg && + packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg && (if builtins.hasAttr "maintainers" pkg.meta then (if builtins.isList pkg.meta.maintainers then builtins.elem maintainer pkg.meta.maintainers @@ -61,23 +66,23 @@ let else false ) ) - (name: pkg: pkg) + (relativePath: pkg: pkg) pkgs; packagesWithUpdateScript = path: let - attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs; + pathContent = lib.attrByPath (lib.splitString "." path) null pkgs; in - if attrSet == null then + if pathContent == null then builtins.throw "Attribute path `${path}` does not exists." else - packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg) - (name: pkg: pkg) - attrSet; + packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg) + (relativePath: pkg: pkg) + pathContent; packageByName = name: let - package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs; + package = lib.attrByPath (lib.splitString "." name) null pkgs; in if package == null then builtins.throw "Package with an attribute name `${name}` does not exists." @@ -125,15 +130,15 @@ let packageData = package: { name = package.name; - pname = pkgs.lib.getName package; - updateScript = map builtins.toString (pkgs.lib.toList package.updateScript); + pname = lib.getName package; + updateScript = map builtins.toString (lib.toList package.updateScript); }; packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages)); optionalArgs = - pkgs.lib.optional (max-workers != null) "--max-workers=${max-workers}" - ++ pkgs.lib.optional (keep-going == "true") "--keep-going"; + lib.optional (max-workers != null) "--max-workers=${max-workers}" + ++ lib.optional (keep-going == "true") "--keep-going"; args = [ packagesJson ] ++ optionalArgs; diff --git a/third_party/nixpkgs/nixos/README b/third_party/nixpkgs/nixos/README index 4ecf648a93..ce4dd1988d 100644 --- a/third_party/nixpkgs/nixos/README +++ b/third_party/nixpkgs/nixos/README @@ -2,4 +2,4 @@ NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at -http://nixos.org/nixos and in the manual in doc/manual. +https://nixos.org/nixos and in the manual in doc/manual. diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml index 182641055e..02cb78f47e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -11,7 +11,7 @@ the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the Nixpkgs +xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs manual. In short, you clone Nixpkgs: $ git clone https://github.com/NixOS/nixpkgs diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml index 5ef498cf9a..5526dea247 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml @@ -14,7 +14,7 @@ when managing complex systems. The syntax and semantics of the Nix language are fully described in the Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual, but here we give a short overview of the most important constructs useful in NixOS configuration files. diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml index e4c03de71b..3ac02a975e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml @@ -16,6 +16,17 @@ fsType = "ext4"; }; + This will create an entry in /etc/fstab, which will + generate a corresponding + systemd.mount + unit via + systemd-fstab-generator. + The filesystem will be mounted automatically unless + "noauto" is present in options. + "noauto" filesystems can be mounted explicitly using + systemctl e.g. systemctl start + data.mount. Mount points are created automatically if they don’t already exist. For , it’s best to use the topology-independent device aliases in diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/summary.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/summary.xml index ea980254a8..289face16d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/summary.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/summary.xml @@ -10,7 +10,7 @@ expression language. It’s not complete. In particular, there are many other built-in functions. See the Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual for the rest. diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.xml index ebf1f493c5..abcf5f648a 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.xml @@ -16,11 +16,11 @@ effects, some example settings: services.picom = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; }; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/releases.xml b/third_party/nixpkgs/nixos/doc/manual/development/releases.xml index cc0ec78cc7..8abc66dfec 100755 --- a/third_party/nixpkgs/nixos/doc/manual/development/releases.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/releases.xml @@ -57,7 +57,7 @@ - Make sure a channel is created at http://nixos.org/channels/. + Make sure a channel is created at https://nixos.org/channels/. diff --git a/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.xml b/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.xml index b4a466e229..9fc5678ca1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/replace-modules.xml @@ -37,7 +37,7 @@ imports = [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable <nixos-unstable/nixos/modules/services/databases/postgresql.nix> ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/obtaining.xml b/third_party/nixpkgs/nixos/doc/manual/installation/obtaining.xml index 56af5c0e25..3b8671782d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/obtaining.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/obtaining.xml @@ -7,7 +7,7 @@ NixOS ISO images can be downloaded from the NixOS download +xlink:href="https://nixos.org/nixos/download.html">NixOS download page. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a @@ -26,7 +26,7 @@ xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installa Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the - NixOS download + NixOS download page. diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml index 9255ce763e..84849282e9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml @@ -24,16 +24,6 @@ - - - - - - - - - - @@ -178,12 +168,6 @@ Please note that this option may be specified repeatedly. - - / - - Print the full build logs of nix build to stderr. - - diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml index 8d8cea4303..56dbb74a71 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1404.xml @@ -49,7 +49,7 @@ Nix has been updated to 1.7 (details). + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.7">details). diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml index 5c4d997017..098c8c5095 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.xml @@ -22,7 +22,7 @@ in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional @@ -555,7 +555,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc the compiler now is the haskellPackages.ghcWithPackages function. The User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure provides more information about this subject. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml index 9b512c4b1e..6d4b28825f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1603.xml @@ -54,7 +54,7 @@ xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH to a deterministic value, and Nix has gained + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that 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 78b8eee47e..341b304cb9 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 @@ -55,6 +55,34 @@ The new virtualisation.containers module manages configuration shared by the CRI-O and Podman modules. + + + Declarative Docker containers are renamed from docker-containers to virtualisation.oci-containers.containers. + This is to make it possible to use podman instead of docker. + + + + + MariaDB has been updated to 10.4, MariaDB Galera to 26.4. + Before you upgrade, it would be best to take a backup of your database. + For MariaDB Galera Cluster, see Upgrading + from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster instead. + Before doing the upgrade read Incompatible + Changes Between 10.3 and 10.4. + After the upgrade you will need to run mysql_upgrade. + MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more + intuitive. See Authentication from MariaDB 10.4. + unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are + created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use + the traditional mysql_native_password plugin method, one must run the following: + +services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' + ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); +''; + + When MariaDB data directory is just upgraded (not initialized), the users are not created or modified. + + @@ -71,7 +99,9 @@ - + + There is a new module that provides doas, a lighter alternative to sudo with many of the same features. + @@ -90,6 +120,12 @@ + + + The go-modules builder now uses vendorSha256 instead of modSha256 to pin + fetched version data. This is currently a warning, but will be removed in the next release. + + Grafana is now built without support for phantomjs by default. Phantomjs support has been @@ -181,13 +217,13 @@ environment.systemPackages = [ customizable to your liking by using php.withExtensions or php.buildEnv instead of writing config files - or changing configure flags. + or changing configure flags. The remaining configuration flags can now be set directly on - the php attribute. For example, instead of + the php attribute. For example, instead of php.override { @@ -227,7 +263,16 @@ php.override { Be aware that backwards state migrations are not supported by Deluge. - + + + Add option services.nginx.enableSandbox to starting Nginx web server with additional sandbox/hardening options. + By default, write access to services.nginx.stateDir is allowed. To allow writing to other folders, + use systemd.services.nginx.serviceConfig.ReadWritePaths + +systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; + + + The NixOS options nesting.clone and @@ -271,6 +316,13 @@ php.override { + + + The Nginx log directory has been moved to /var/log/nginx, the cache directory + to /var/cache/nginx. The option services.nginx.stateDir has + been removed. + + The httpd web server previously started its main process as root @@ -311,6 +363,24 @@ php.override { 5 for details. + + + In the picom module, several options that accepted + floating point numbers encoded as strings (for example + ) have been changed + to the (relatively) new native float type. To migrate + your configuration simply remove the quotes around the numbers. + + + + + When using buildBazelPackage from Nixpkgs, + flat hash mode is now used for dependencies + instead of recursive. This is to better allow + using hashed mirrors where needed. As a result, these hashes + will have changed. + + @@ -338,6 +408,11 @@ php.override { the notmuch.emacs output. + + + The default output of buildGoPackage is now $out instead of $bin. + + diff --git a/third_party/nixpkgs/nixos/lib/test-driver/log2html.xsl b/third_party/nixpkgs/nixos/lib/test-driver/log2html.xsl deleted file mode 100644 index 0485412b4c..0000000000 --- a/third_party/nixpkgs/nixos/lib/test-driver/log2html.xsl +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - tag. ++func (p *Policy) addDefaultSkipElementContent() { ++ p.init() ++ ++ p.setOfElementsToSkipContent["frame"] = struct{}{} ++ p.setOfElementsToSkipContent["frameset"] = struct{}{} ++ p.setOfElementsToSkipContent["iframe"] = struct{}{} ++ p.setOfElementsToSkipContent["noembed"] = struct{}{} ++ p.setOfElementsToSkipContent["noframes"] = struct{}{} ++ p.setOfElementsToSkipContent["noscript"] = struct{}{} ++ p.setOfElementsToSkipContent["nostyle"] = struct{}{} ++ p.setOfElementsToSkipContent["object"] = struct{}{} ++ p.setOfElementsToSkipContent["script"] = struct{}{} ++ p.setOfElementsToSkipContent["style"] = struct{}{} ++ p.setOfElementsToSkipContent["title"] = struct{}{} ++} +diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +new file mode 100644 +index 00000000..65ed89b7 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +@@ -0,0 +1,581 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "bytes" ++ "io" ++ "net/url" ++ "regexp" ++ "strings" ++ ++ "golang.org/x/net/html" ++) ++ ++var ( ++ dataAttribute = regexp.MustCompile("^data-.+") ++ dataAttributeXMLPrefix = regexp.MustCompile("^xml.+") ++ dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+") ++) ++ ++// Sanitize takes a string that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a HTML string that has been sanitized by the policy or an empty ++// string if an error has occurred (most likely as a consequence of extremely ++// malformed input) ++func (p *Policy) Sanitize(s string) string { ++ if strings.TrimSpace(s) == "" { ++ return s ++ } ++ ++ return p.sanitize(strings.NewReader(s)).String() ++} ++ ++// SanitizeBytes takes a []byte that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a []byte containing the HTML that has been sanitized by the policy ++// or an empty []byte if an error has occurred (most likely as a consequence of ++// extremely malformed input) ++func (p *Policy) SanitizeBytes(b []byte) []byte { ++ if len(bytes.TrimSpace(b)) == 0 { ++ return b ++ } ++ ++ return p.sanitize(bytes.NewReader(b)).Bytes() ++} ++ ++// SanitizeReader takes an io.Reader that contains a HTML fragment or document ++// and applies the given policy whitelist. ++// ++// It returns a bytes.Buffer containing the HTML that has been sanitized by the ++// policy. Errors during sanitization will merely return an empty result. ++func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer { ++ return p.sanitize(r) ++} ++ ++// Performs the actual sanitization process. ++func (p *Policy) sanitize(r io.Reader) *bytes.Buffer { ++ ++ // It is possible that the developer has created the policy via: ++ // p := bluemonday.Policy{} ++ // rather than: ++ // p := bluemonday.NewPolicy() ++ // If this is the case, and if they haven't yet triggered an action that ++ // would initiliaze the maps, then we need to do that. ++ p.init() ++ ++ var ( ++ buff bytes.Buffer ++ skipElementContent bool ++ skippingElementsCount int64 ++ skipClosingTag bool ++ closingTagToSkipStack []string ++ mostRecentlyStartedToken string ++ ) ++ ++ tokenizer := html.NewTokenizer(r) ++ for { ++ if tokenizer.Next() == html.ErrorToken { ++ err := tokenizer.Err() ++ if err == io.EOF { ++ // End of input means end of processing ++ return &buff ++ } ++ ++ // Raw tokenizer error ++ return &bytes.Buffer{} ++ } ++ ++ token := tokenizer.Token() ++ switch token.Type { ++ case html.DoctypeToken: ++ ++ // DocType is not handled as there is no safe parsing mechanism ++ // provided by golang.org/x/net/html for the content, and this can ++ // be misused to insert HTML tags that are not then sanitized ++ // ++ // One might wish to recursively sanitize here using the same policy ++ // but I will need to do some further testing before considering ++ // this. ++ ++ case html.CommentToken: ++ ++ // Comments are ignored by default ++ ++ case html.StartTagToken: ++ ++ mostRecentlyStartedToken = token.Data ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skipElementContent = true ++ skippingElementsCount++ ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 { ++ if !p.allowNoAttrs(token.Data) { ++ skipClosingTag = true ++ closingTagToSkipStack = append(closingTagToSkipStack, token.Data) ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.EndTagToken: ++ ++ if mostRecentlyStartedToken == token.Data { ++ mostRecentlyStartedToken = "" ++ } ++ ++ if skipClosingTag && closingTagToSkipStack[len(closingTagToSkipStack)-1] == token.Data { ++ closingTagToSkipStack = closingTagToSkipStack[:len(closingTagToSkipStack)-1] ++ if len(closingTagToSkipStack) == 0 { ++ skipClosingTag = false ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if _, ok := p.elsAndAttrs[token.Data]; !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skippingElementsCount-- ++ if skippingElementsCount == 0 { ++ skipElementContent = false ++ } ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.SelfClosingTagToken: ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.TextToken: ++ ++ if !skipElementContent { ++ switch mostRecentlyStartedToken { ++ case "script": ++ // not encouraged, but if a policy allows JavaScript we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ case "style": ++ // not encouraged, but if a policy allows CSS styles we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ default: ++ // HTML escape the text ++ buff.WriteString(token.String()) ++ } ++ } ++ default: ++ // A token that didn't exist in the html package when we wrote this ++ return &bytes.Buffer{} ++ } ++ } ++} ++ ++// sanitizeAttrs takes a set of element attribute policies and the global ++// attribute policies and applies them to the []html.Attribute returning a set ++// of html.Attributes that match the policies ++func (p *Policy) sanitizeAttrs( ++ elementName string, ++ attrs []html.Attribute, ++ aps map[string]attrPolicy, ++) []html.Attribute { ++ ++ if len(attrs) == 0 { ++ return attrs ++ } ++ ++ // Builds a new attribute slice based on the whether the attribute has been ++ // whitelisted explicitly or globally. ++ cleanAttrs := []html.Attribute{} ++ for _, htmlAttr := range attrs { ++ if p.allowDataAttributes { ++ // If we see a data attribute, let it through. ++ if isDataAttribute(htmlAttr.Key) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ // Is there an element specific attribute policy that applies? ++ if ap, ok := aps[htmlAttr.Key]; ok { ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ ++ // Is there a global attribute policy that applies? ++ if ap, ok := p.globalAttrs[htmlAttr.Key]; ok { ++ ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } ++ } ++ ++ if len(cleanAttrs) == 0 { ++ // If nothing was allowed, let's get out of here ++ return cleanAttrs ++ } ++ // cleanAttrs now contains the attributes that are permitted ++ ++ if linkable(elementName) { ++ if p.requireParseableURLs { ++ // Ensure URLs are parseable: ++ // - a.href ++ // - area.href ++ // - link.href ++ // - blockquote.cite ++ // - q.cite ++ // - img.src ++ // - script.src ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ switch elementName { ++ case "a", "area", "link": ++ if htmlAttr.Key == "href" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "blockquote", "q": ++ if htmlAttr.Key == "cite" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "img", "script": ++ if htmlAttr.Key == "src" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ default: ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ cleanAttrs = tmpAttrs ++ } ++ ++ if (p.requireNoFollow || ++ p.requireNoFollowFullyQualifiedLinks || ++ p.addTargetBlankToFullyQualifiedLinks) && ++ len(cleanAttrs) > 0 { ++ ++ // Add rel="nofollow" if a "href" exists ++ switch elementName { ++ case "a", "area", "link": ++ var hrefFound bool ++ var externalLink bool ++ for _, htmlAttr := range cleanAttrs { ++ if htmlAttr.Key == "href" { ++ hrefFound = true ++ ++ u, err := url.Parse(htmlAttr.Val) ++ if err != nil { ++ continue ++ } ++ if u.Host != "" { ++ externalLink = true ++ } ++ ++ continue ++ } ++ } ++ ++ if hrefFound { ++ var ( ++ noFollowFound bool ++ targetBlankFound bool ++ ) ++ ++ addNoFollow := (p.requireNoFollow || ++ externalLink && p.requireNoFollowFullyQualifiedLinks) ++ ++ addTargetBlank := (externalLink && ++ p.addTargetBlankToFullyQualifiedLinks) ++ ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ ++ var appended bool ++ if htmlAttr.Key == "rel" && addNoFollow { ++ ++ if strings.Contains(htmlAttr.Val, "nofollow") { ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } else { ++ htmlAttr.Val += " nofollow" ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if elementName == "a" && htmlAttr.Key == "target" { ++ if htmlAttr.Val == "_blank" { ++ targetBlankFound = true ++ } ++ if addTargetBlank && !targetBlankFound { ++ htmlAttr.Val = "_blank" ++ targetBlankFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noFollowFound || targetBlankFound { ++ cleanAttrs = tmpAttrs ++ } ++ ++ if addNoFollow && !noFollowFound { ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "nofollow" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if elementName == "a" && addTargetBlank && !targetBlankFound { ++ rel := html.Attribute{} ++ rel.Key = "target" ++ rel.Val = "_blank" ++ targetBlankFound = true ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if targetBlankFound { ++ // target="_blank" has a security risk that allows the ++ // opened window/tab to issue JavaScript calls against ++ // window.opener, which in effect allow the destination ++ // of the link to control the source: ++ // https://dev.to/ben/the-targetblank-vulnerability-by-example ++ // ++ // To mitigate this risk, we need to add a specific rel ++ // attribute if it is not already present. ++ // rel="noopener" ++ // ++ // Unfortunately this is processing the rel twice (we ++ // already looked at it earlier ^^) as we cannot be sure ++ // of the ordering of the href and rel, and whether we ++ // have fully satisfied that we need to do this. This ++ // double processing only happens *if* target="_blank" ++ // is true. ++ var noOpenerAdded bool ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ var appended bool ++ if htmlAttr.Key == "rel" { ++ if strings.Contains(htmlAttr.Val, "noopener") { ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } else { ++ htmlAttr.Val += " noopener" ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ ++ appended = true ++ } ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noOpenerAdded { ++ cleanAttrs = tmpAttrs ++ } else { ++ // rel attr was not found, or else noopener would ++ // have been added already ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "noopener" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ } ++ } ++ default: ++ } ++ } ++ } ++ ++ return cleanAttrs ++} ++ ++func (p *Policy) allowNoAttrs(elementName string) bool { ++ _, ok := p.setOfElementsAllowedWithoutAttrs[elementName] ++ return ok ++} ++ ++func (p *Policy) validURL(rawurl string) (string, bool) { ++ if p.requireParseableURLs { ++ // URLs are valid if when space is trimmed the URL is valid ++ rawurl = strings.TrimSpace(rawurl) ++ ++ // URLs cannot contain whitespace, unless it is a data-uri ++ if (strings.Contains(rawurl, " ") || ++ strings.Contains(rawurl, "\t") || ++ strings.Contains(rawurl, "\n")) && ++ !strings.HasPrefix(rawurl, `data:`) { ++ return "", false ++ } ++ ++ // URLs are valid if they parse ++ u, err := url.Parse(rawurl) ++ if err != nil { ++ return "", false ++ } ++ ++ if u.Scheme != "" { ++ ++ urlPolicy, ok := p.allowURLSchemes[u.Scheme] ++ if !ok { ++ return "", false ++ ++ } ++ ++ if urlPolicy == nil || urlPolicy(u) == true { ++ return u.String(), true ++ } ++ ++ return "", false ++ } ++ ++ if p.allowRelativeURLs { ++ if u.String() != "" { ++ return u.String(), true ++ } ++ } ++ ++ return "", false ++ } ++ ++ return rawurl, true ++} ++ ++func linkable(elementName string) bool { ++ switch elementName { ++ case "a", "area", "blockquote", "img", "link", "script": ++ return true ++ default: ++ return false ++ } ++} ++ ++func isDataAttribute(val string) bool { ++ if !dataAttribute.MatchString(val) { ++ return false ++ } ++ rest := strings.Split(val, "data-") ++ if len(rest) == 1 { ++ return false ++ } ++ // data-xml* is invalid. ++ if dataAttributeXMLPrefix.MatchString(rest[1]) { ++ return false ++ } ++ // no uppercase or semi-colons allowed. ++ if dataAttributeInvalidChars.MatchString(rest[1]) { ++ return false ++ } ++ return true ++} +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 0bae0d5d..ff6a5d78 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -49,6 +49,8 @@ github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d + github.com/mb0/diff ++# github.com/microcosm-cc/bluemonday v1.0.2 ++github.com/microcosm-cc/bluemonday + # github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/nu7hatch/gouuid + # github.com/pkg/errors v0.8.0 diff --git a/third_party/nixpkgs/pkgs/servers/echoip/default.nix b/third_party/nixpkgs/pkgs/servers/echoip/default.nix index a8f9ad8a91..18952d01c9 100644 --- a/third_party/nixpkgs/pkgs/servers/echoip/default.nix +++ b/third_party/nixpkgs/pkgs/servers/echoip/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; }; - modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; outputs = [ "out" "index" ]; @@ -25,4 +25,4 @@ buildGoModule { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/etcd/default.nix b/third_party/nixpkgs/pkgs/servers/etcd/default.nix index 9a2bf7ce59..bdb4b4883d 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; passthru.tests = with nixosTests; { diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix index ff59ad53ed..2b474d818a 100644 --- a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -10,14 +10,30 @@ buildGoModule rec { rev = version; sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; }; + patches = [ ./gomod.patch ]; - modSha256 = - "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + deleteVendor = true; buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make -e build${lib.optionalString enableStatic "-static"} ''; + lxd = fetchFromGitHub { + owner = "lxc"; + repo = "lxd"; + rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; + sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/lxc/lxd + cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd + ''; + }); + + vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + installPhase = '' mkdir -p $out/bin cp bin/gobetween $out/bin diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/gomod.patch b/third_party/nixpkgs/pkgs/servers/gobetween/gomod.patch new file mode 100644 index 0000000000..98181e3fe7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gobetween/gomod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 536631a..f91e862 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,7 +7,7 @@ require ( + github.com/burntsushi/toml v0.3.1 + github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 + github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect +- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect ++ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect + github.com/fsouza/go-dockerclient v1.3.6 + github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a + github.com/gin-gonic/gin v1.3.0 +@@ -20,7 +20,6 @@ require ( + github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect + github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect + github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect +- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect + github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect + github.com/julienschmidt/httprouter v1.2.0 // indirect + github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 diff --git a/third_party/nixpkgs/pkgs/servers/gortr/default.nix b/third_party/nixpkgs/pkgs/servers/gortr/default.nix index 35c6e14524..3b9ed15a84 100644 --- a/third_party/nixpkgs/pkgs/servers/gortr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gortr/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; }; - modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/default.nix b/third_party/nixpkgs/pkgs/servers/gotify/default.nix index 3f9f59a4ae..5d305c1e41 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - modSha256 = import ./mod-sha.nix; + vendorSha256 = import ./vendor-sha.nix; postPatch = '' substituteInPlace app.go \ @@ -38,6 +38,10 @@ buildGoModule rec { cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr ''; + passthru = { + updateScript = ./update.sh; + }; + # Otherwise, all other subpackages are built as well and from some reason, # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix deleted file mode 100644 index 16a3eddadb..0000000000 --- a/third_party/nixpkgs/pkgs/servers/gotify/mod-sha.nix +++ /dev/null @@ -1 +0,0 @@ -"119f249rvlvxjhwc6wh10yyk3z41488mydmvxs44b5a4p67yvjfw" \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/package.json b/third_party/nixpkgs/pkgs/servers/gotify/package.json index 00f7133707..7e8defe385 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/package.json +++ b/third_party/nixpkgs/pkgs/servers/gotify/package.json @@ -9,23 +9,23 @@ "@material-ui/icons": "^4.9.1", "axios": "^0.19.0", "codemirror": "^5.43.0", - "detect-browser": "^3.0.0", + "detect-browser": "^5.1.0", "js-base64": "^2.5.1", "mobx": "^5.1.1", - "mobx-react": "^5.2.8", + "mobx-react": "^6.2.2", "mobx-utils": "^5.0.2", "notifyjs": "^3.0.0", "prop-types": "^15.6.2", "react": "^16.4.2", - "react-codemirror2": "^5.1.0", + "react-codemirror2": "^7.1.0", "react-dom": "^16.4.2", "react-infinite": "^0.13.0", "react-markdown": "^4.0.6", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", + "react-router": "^5.1.2", + "react-router-dom": "^5.1.2", "react-timeago": "^4.1.9", "remove-markdown": "^0.3.0", - "typeface-roboto": "0.0.54" + "typeface-roboto": "0.0.75" }, "scripts": { "start": "react-scripts start", @@ -38,30 +38,30 @@ "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different" }, "devDependencies": { - "@types/codemirror": "0.0.71", - "@types/detect-browser": "^2.0.1", + "@types/codemirror": "0.0.91", + "@types/detect-browser": "^4.0.0", "@types/get-port": "^4.0.0", - "@types/jest": "^23.3.1", + "@types/jest": "^25.2.1", "@types/js-base64": "^2.3.1", - "@types/node": "^10.9.0", + "@types/node": "^13.13.5", "@types/notifyjs": "^3.0.0", - "@types/puppeteer": "^1.6.3", + "@types/puppeteer": "^2.0.1", "@types/react": "^16.4.11", "@types/react-dom": "^16.0.7", - "@types/react-infinite": "0.0.33", - "@types/react-router-dom": "^4.3.0", + "@types/react-infinite": "0.0.34", + "@types/react-router-dom": "^5.1.5", "@types/remove-markdown": "^0.1.1", - "@types/rimraf": "^2.0.2", - "get-port": "^4.0.0", - "prettier": "^1.14.2", - "puppeteer": "^1.8.0", - "react-scripts": "3.1.1", - "rimraf": "^2.6.2", + "@types/rimraf": "^3.0.0", + "get-port": "^5.1.1", + "prettier": "^2.0.5", + "puppeteer": "^3.0.4", + "react-scripts": "^3.4.1", + "rimraf": "^3.0.2", "tree-kill": "^1.2.0", - "tslint": "^5.20.0", + "tslint": "^6.1.2", "tslint-sonarts": "^1.7.0", - "typescript": "3.6.2", - "wait-on": "^3.0.1" + "typescript": "3.8.3", + "wait-on": "^5.0.0" }, "eslintConfig": { "extends": "react-app" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix index c11391fb85..ddac1b2461 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0igzgpzrxkz31njhybsap505mlr32k4qma32v5rafqdi2naz5iyl" \ No newline at end of file +"18y2kaf0v7275a0b8ab5y3qk7qwh19aqxyy0gmlflzgr2nimpmrn" \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/update.sh b/third_party/nixpkgs/pkgs/servers/gotify/update.sh index e26ffbde62..dc39a15be7 100755 --- a/third_party/nixpkgs/pkgs/servers/gotify/update.sh +++ b/third_party/nixpkgs/pkgs/servers/gotify/update.sh @@ -11,9 +11,9 @@ echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 -echo zeroing modSha256 in $dirname/mod-sha.nix +echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -28,13 +28,13 @@ echo removed yarn.lock echo running nix-build for ui nix-build -A gotify-server.ui -echo running nix-build for gotify itself in order to get modSha256 +echo running nix-build for gotify itself in order to get vendorSha256 set +e -modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 -echo got modSha256 of: $modSha256 +echo got vendorSha256 of: $vendorSha256 tput sgr0 echo running nix-build -A gotify-server which should build gotify-server normally nix-build -A gotify-server diff --git a/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix new file mode 100644 index 0000000000..0705f43631 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix @@ -0,0 +1 @@ +"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/gotify/version.nix b/third_party/nixpkgs/pkgs/servers/gotify/version.nix index fbd14b6742..fdfe425152 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/version.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.15" +"2.0.16" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix index ef9d7cedd8..798c2787e3 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix @@ -2,755 +2,875 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; - sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + 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_core___core_7.5.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; - sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha1 = "3f604c40e420131affe6f2c8052e9a275ae2049b"; }; } { - name = "_babel_generator___generator_7.5.5.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; - sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + name = "_babel_core___core_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; - sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + name = "_babel_core___core_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz"; + sha1 = "d9aa1f580abf3b2286ef40b6904d390904c63376"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + name = "_babel_generator___generator_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; - sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + name = "_babel_generator___generator_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; + sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; + sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; - sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; + sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; + sha1 = "0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; - sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; - sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha1 = "1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha1 = "965c8b0a9f051801fd9d3b372ca0ccf200a90897"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; - sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; + sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; - sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; + sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; - sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; - sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; + sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; - sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; + sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; }; } { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; - sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; - sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; - sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; + sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; - sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; + sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; - sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; + sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; - sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; + sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; }; } { - name = "_babel_helpers___helpers_7.5.5.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; - sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha1 = "03149d7e6a5586ab6764996cd31d6981a17e1444"; }; } { - name = "_babel_highlight___highlight_7.5.0.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; - sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; + sha1 = "7f8109928b4dab4654076986af575231deb639ae"; }; } { - name = "_babel_parser___parser_7.5.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; - sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; - sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; - sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; + sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + name = "_babel_helpers___helpers_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; - sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; + name = "_babel_helpers___helpers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz"; + sha1 = "092c774743471d0bb6c7de3ad465ab3d3486d580"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; - sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + name = "_babel_parser___parser_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; - sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; + sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; - sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; + sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; - sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz"; + sha1 = "2156860ab65c5abf068c3f67042184041066543e"; }; } { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; - sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; + sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; + sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; }; } { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; - sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha1 = "5d6769409699ec9b3b68684cd8116cedff93bad8"; }; } { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; - sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha1 = "7a093586fcb18b08266eb1a7177da671ac575b63"; }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; + sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; }; } { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; - sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; - sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; - sha1 = "a7cc3f66119a9f7ebe2de5383cce193473d65991"; + 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_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; - sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; + sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; - sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; - sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; + sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + 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_transform_classes___plugin_transform_classes_7.5.5.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; - sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; + sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; - sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + 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_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; - sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + 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_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; - sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + 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_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; - sha1 = "a63868289e5b4007f7054d46491af51435766008"; + 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_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; + sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; - sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; + sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; - sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; + sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; - sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; + sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; - sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; + sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; - sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; + sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; + sha1 = "800597ddb8aefc2c293ed27459c1fcc935a26c2c"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; - sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; + sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; - sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; + sha1 = "72c97cf5f38604aea3abf3b935b0e17b1db76a50"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; + sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; - sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; + sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; - sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; + sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; - sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; - sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz"; - sha1 = "4d6ae4033bc38f8a65dfca2b6235c44522a422fc"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; + sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; + sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; + sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha1 = "8539ec42c153d12ea3836e0e3ac30d5aae7b258e"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha1 = "64b7474a4279ee588cacd1906695ca721687c277"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; - sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha1 = "207f1461c78a231d5337a92140e52422510d81a4"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; - sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz"; - sha1 = "a6331afbfc59189d2135b2e09474457a8e3d28bc"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; + sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; - sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; + sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; - sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; + sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; - sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; + sha1 = "173b265746f5e15b2afe527eeda65b73623a0795"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; - sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; + sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; - sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz"; - sha1 = "6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz"; + sha1 = "70ded987c91609f78353dd76d2fb2a0bb991e8e5"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; - sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; }; } { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz"; - sha1 = "88669911053fa16b2b276ea2ede2ca603b3f307a"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; + sha1 = "86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"; }; } { - name = "_babel_runtime___runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz"; - sha1 = "74fba56d35efbeca444091c7850ccd494fd2f132"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { - name = "_babel_runtime___runtime_7.6.2.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz"; - sha1 = "c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; + sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; }; } { - name = "_babel_runtime___runtime_7.6.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz"; - sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { - name = "_babel_runtime___runtime_7.8.7.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz"; - sha1 = "8fefce9802db54881ba59f90bb28719b4996324d"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; + sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; }; } { - name = "_babel_template___template_7.4.4.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; - sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; + sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; }; } { - name = "_babel_traverse___traverse_7.5.5.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; - sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; + sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; }; } { - name = "_babel_types___types_7.5.5.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_types___types_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; - sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; + sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; }; } { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; - sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; + sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + }; + } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha1 = "2248971416a506fc78278fc0c0ea3179224af1e9"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; + sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha1 = "df063b276c6455ec6fcfc6e53aacc38da9b0aea6"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz"; + sha1 = "c6c97693ac65b6b9c0b4f25b948a8f665463014d"; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + }; + } + { + name = "_babel_runtime___runtime_7.9.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.6.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; + sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + }; + } + { + name = "_babel_types___types_7.9.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; + sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + }; + } + { + 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"; }; } { @@ -762,27 +882,35 @@ }; } { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; path = fetchurl { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz"; - sha1 = "c27b391d8457d1e893f1eddeaf5e5412d12ffbb5"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"; + sha1 = "f0950bba18819512d42f7197e56c518aa491cf18"; }; } { - name = "_emotion_hash___hash_0.7.4.tgz"; + name = "_emotion_hash___hash_0.8.0.tgz"; path = fetchurl { - name = "_emotion_hash___hash_0.7.4.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz"; - sha1 = "f14932887422c9056b15a8d222a9074a7dfa2831"; + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; }; } { - name = "_hapi_address___address_2.1.0.tgz"; + name = "_hapi_address___address_2.1.4.tgz"; path = fetchurl { - name = "_hapi_address___address_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.0.tgz"; - sha1 = "d86223d40c73942cc6151838d9f264997e6673f9"; + name = "_hapi_address___address_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz"; + sha1 = "5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"; + }; + } + { + name = "_hapi_address___address_4.0.1.tgz"; + path = fetchurl { + name = "_hapi_address___address_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz"; + sha1 = "267301ddf7bc453718377a6fb3832a2f04a721dd"; }; } { @@ -794,11 +922,27 @@ }; } { - name = "_hapi_hoek___hoek_8.2.2.tgz"; + name = "_hapi_formula___formula_2.0.0.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_8.2.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.2.tgz"; - sha1 = "6eaa2e1ec3b50dfb8dccbe705dc289094652bc2d"; + name = "_hapi_formula___formula_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz"; + sha1 = "edade0619ed58c8e4f164f233cda70211e787128"; + }; + } + { + name = "_hapi_hoek___hoek_8.5.1.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha1 = "fde96064ca446dec8c55a8c2f130957b070c6e06"; + }; + } + { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.4.tgz"; + sha1 = "e80ad4e8e8d2adc6c77d985f698447e8628b6010"; }; } { @@ -810,11 +954,35 @@ }; } { - name = "_hapi_topo___topo_3.1.3.tgz"; + name = "_hapi_joi___joi_17.1.1.tgz"; path = fetchurl { - name = "_hapi_topo___topo_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.3.tgz"; - sha1 = "c7a02e0d936596d29f184e6d7fdc07e8b5efce11"; + name = "_hapi_joi___joi_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz"; + sha1 = "9cc8d7e2c2213d1e46708c6260184b447c661350"; + }; + } + { + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; + path = fetchurl { + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz"; + sha1 = "805b40d4dbec04fc116a73089494e00f073de8df"; + }; + } + { + name = "_hapi_topo___topo_3.1.6.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz"; + sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; + }; + } + { + name = "_hapi_topo___topo_5.0.0.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz"; + sha1 = "c19af8577fa393a06e9c77b60995af959be721e7"; }; } { @@ -898,11 +1066,19 @@ }; } { - name = "_material_ui_core___core_4.9.5.tgz"; + name = "_jest_types___types_25.5.0.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.9.5.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.5.tgz"; - sha1 = "384869f2840b243241f7881a902f5ffc48360830"; + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_material_ui_core___core_4.9.13.tgz"; + path = fetchurl { + name = "_material_ui_core___core_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz"; + sha1 = "024962bcdda05139e1bad17a1815bf4088702b15"; }; } { @@ -914,35 +1090,43 @@ }; } { - name = "_material_ui_styles___styles_4.9.0.tgz"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.9.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz"; - sha1 = "10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz"; + sha1 = "92529142addb5cc179dbf42d246c7e3fe4d6104b"; }; } { - name = "_material_ui_system___system_4.9.3.tgz"; + name = "_material_ui_styles___styles_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.9.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.3.tgz"; - sha1 = "ee48990d7941237fdaf21b7b399981d614bb0875"; + name = "_material_ui_styles___styles_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz"; + sha1 = "08b3976bdd21c38bc076693d95834f97539f3b15"; }; } { - name = "_material_ui_types___types_5.0.0.tgz"; + name = "_material_ui_system___system_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_types___types_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz"; - sha1 = "26d6259dc6b39f4c2e1e9aceff7a11e031941741"; + name = "_material_ui_system___system_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz"; + sha1 = "adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"; }; } { - name = "_material_ui_utils___utils_4.7.1.tgz"; + name = "_material_ui_types___types_5.0.1.tgz"; path = fetchurl { - name = "_material_ui_utils___utils_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz"; - sha1 = "dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"; + name = "_material_ui_types___types_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz"; + sha1 = "c4954063cdc196eb327ee62c041368b1aebb6d61"; + }; + } + { + name = "_material_ui_utils___utils_4.9.12.tgz"; + path = fetchurl { + name = "_material_ui_utils___utils_4.9.12.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz"; + sha1 = "0d639f1c1ed83fffb2ae10c21d15a938795d9e65"; }; } { @@ -994,11 +1178,11 @@ }; } { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz"; - sha1 = "646c2f5b5770c2fe318d6e51492344c3d62ddb63"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz"; + sha1 = "2cdedd747e5b1b29ed4c241e46256aac8110dd93"; }; } { @@ -1026,19 +1210,19 @@ }; } { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.1.tgz"; - sha1 = "62ffcb85d756580e8ce608e9d2ac3b9063be9e28"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.3.tgz"; + sha1 = "a75d8c2f202ac0e5774e6bfc165d028b39a1316c"; }; } { - name = "_svgr_core___core_4.3.2.tgz"; + name = "_svgr_core___core_4.3.3.tgz"; path = fetchurl { - name = "_svgr_core___core_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.2.tgz"; - sha1 = "939c89be670ad79b762f4c063f213f0e02535f2e"; + name = "_svgr_core___core_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.3.tgz"; + sha1 = "b37b89d5b757dc66e8c74156d00c368338d24293"; }; } { @@ -1050,11 +1234,11 @@ }; } { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; path = fetchurl { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz"; - sha1 = "ce9ddafc8cdd74da884c9f7af014afcf37f93d3c"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz"; + sha1 = "e2ba913dbdfbe85252a34db101abc7ebd50992fa"; }; } { @@ -1066,27 +1250,27 @@ }; } { - name = "_svgr_webpack___webpack_4.3.2.tgz"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; path = fetchurl { - name = "_svgr_webpack___webpack_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz"; - sha1 = "319d4471c8f3d5c3af35059274834d9b5b8fb956"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz"; + sha1 = "13cc2423bf3dff2d494f16b17eb7eacb86895017"; }; } { - name = "_types_babel__core___babel__core_7.1.2.tgz"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz"; - sha1 = "608c74f55928033fce18b99b213c16be4b3d114f"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz"; + sha1 = "1dacad8840364a57c98d0dd4855c6dd3752c6b89"; }; } { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz"; - sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; }; } { @@ -1098,27 +1282,35 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; - sha1 = "2496e9ff56196cc1429c72034e07eab6121b6f3f"; + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha1 = "1ae3010e8bf8851d324878b42acec71986486d18"; }; } { - name = "_types_codemirror___codemirror_0.0.71.tgz"; + name = "_types_codemirror___codemirror_0.0.91.tgz"; path = fetchurl { - name = "_types_codemirror___codemirror_0.0.71.tgz"; - url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.71.tgz"; - sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7"; + name = "_types_codemirror___codemirror_0.0.91.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz"; + sha1 = "4cb9832388726e57e747f0e3a8ab69105ad02a66"; }; } { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; + name = "_types_color_name___color_name_1.1.1.tgz"; path = fetchurl { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-2.0.1.tgz"; - sha1 = "ae49b3b3f5fae163f0988487fe76fb121b56ac53"; + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; + path = fetchurl { + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-4.0.0.tgz"; + sha1 = "5672576f9621aad8773489593fca2e4c57c29fb5"; }; } { @@ -1130,11 +1322,11 @@ }; } { - name = "_types_estree___estree_0.0.39.tgz"; + name = "_types_estree___estree_0.0.44.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_estree___estree_0.0.44.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; + sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; }; } { @@ -1162,11 +1354,11 @@ }; } { - name = "_types_history___history_4.7.3.tgz"; + name = "_types_history___history_4.7.5.tgz"; path = fetchurl { - name = "_types_history___history_4.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz"; - sha1 = "856c99cdc1551d22c22b18b5402719affec9839a"; + name = "_types_history___history_4.7.5.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; + sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; }; } { @@ -1178,11 +1370,11 @@ }; } { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; - sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; + 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"; }; } { @@ -1194,11 +1386,11 @@ }; } { - name = "_types_jest___jest_23.3.14.tgz"; + name = "_types_jest___jest_25.2.1.tgz"; path = fetchurl { - name = "_types_jest___jest_23.3.14.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz"; - sha1 = "37daaf78069e7948520474c87b80092ea912520a"; + name = "_types_jest___jest_25.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz"; + sha1 = "9544cd438607955381c1bdbdb97767a249297db5"; }; } { @@ -1210,11 +1402,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.3.tgz"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz"; - sha1 = "bdfd69d61e464dcc81b25159c270d75a73c1a636"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; }; } { @@ -1226,19 +1418,11 @@ }; } { - name = "_types_node___node_12.7.4.tgz"; + name = "_types_node___node_13.13.5.tgz"; path = fetchurl { - name = "_types_node___node_12.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz"; - sha1 = "64db61e0359eb5a8d99b55e05c729f130a678b04"; - }; - } - { - name = "_types_node___node_10.14.17.tgz"; - path = fetchurl { - name = "_types_node___node_10.14.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz"; - sha1 = "b96d4dd3e427382482848948041d3754d40fd5ce"; + name = "_types_node___node_13.13.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz"; + sha1 = "96ec3b0afafd64a4ccea9107b75bf8489f0e5765"; }; } { @@ -1249,6 +1433,14 @@ sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755"; }; } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } { name = "_types_prop_types___prop_types_15.7.3.tgz"; path = fetchurl { @@ -1258,11 +1450,11 @@ }; } { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-1.19.1.tgz"; - sha1 = "942ca62288953a0f5fbbc25c103b5f2ba28b60ab"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.1.tgz"; + sha1 = "83a1d7f0a1c2e0edbbb488b4d8fb54b14ec9d455"; }; } { @@ -1274,59 +1466,51 @@ }; } { - name = "_types_react_dom___react_dom_16.9.0.tgz"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "ba6ddb00bf5de700b0eb91daa452081ffccbfdea"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz"; + sha1 = "60844d48ce252d7b2dccf0c7bb937130e27c0cd2"; }; } { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; path = fetchurl { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.33.tgz"; - sha1 = "08724d4a7095f3fa1d4e6cb5d05bcbe42ce135da"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.34.tgz"; + sha1 = "0b514f65c4ba80ad22dea079075e04345ddcaae2"; }; } { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; path = fetchurl { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.5.tgz"; - sha1 = "72f229967690c890d00f96e6b85e9ee5780db31f"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz"; + sha1 = "7c334a2ea785dbad2b2dcdd83d2cf3d9973da090"; }; } { - name = "_types_react_router___react_router_5.0.3.tgz"; + name = "_types_react_router___react_router_5.1.7.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.3.tgz"; - sha1 = "855a1606e62de3f4d69ea34fb3c0e50e98e964d5"; + name = "_types_react_router___react_router_5.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz"; + sha1 = "e9d12ed7dcfc79187e4d36667745b69a5aa11556"; }; } { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.2.tgz"; - sha1 = "8c851c4598a23a3a34173069fb4c5c9e41c02e3f"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.4.tgz"; + sha1 = "c7416225987ccdb719262766c1483da8f826838d"; }; } { - name = "_types_react___react_16.9.3.tgz"; + name = "_types_react___react_16.9.34.tgz"; path = fetchurl { - name = "_types_react___react_16.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.3.tgz"; - sha1 = "6d13251e441a3e67fb60d719d1fc8785b984a2ec"; - }; - } - { - name = "_types_react___react_16.9.2.tgz"; - path = fetchurl { - name = "_types_react___react_16.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.2.tgz"; - sha1 = "6d1765431a1ad1877979013906731aae373de268"; + name = "_types_react___react_16.9.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz"; + sha1 = "f7d5e331c468f53affed17a8a4d488cd44ea9349"; }; } { @@ -1338,11 +1522,11 @@ }; } { - name = "_types_rimraf___rimraf_2.0.2.tgz"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; path = fetchurl { - name = "_types_rimraf___rimraf_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz"; - sha1 = "7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz"; + sha1 = "b9d03f090ece263671898d57bb7bb007023ac19f"; }; } { @@ -1362,51 +1546,67 @@ }; } { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz"; - sha1 = "453743c5bbf9f1bed61d959baab5b06be029b2d0"; + 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_13.0.2.tgz"; + name = "_types_yargs___yargs_13.0.8.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz"; - sha1 = "a64674fc0149574ecd90ba746e932b5a5f7b3653"; + name = "_types_yargs___yargs_13.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; + sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; + name = "_types_yargs___yargs_15.0.4.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz"; - sha1 = "22fed9b16ddfeb402fd7bcde56307820f6ebc49f"; + name = "_types_yargs___yargs_15.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz"; + sha1 = "7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz"; - sha1 = "b08c60d780c0067de2fb44b04b432f540138301e"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; }; } { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz"; - sha1 = "61ac7811ea52791c47dc9fd4dd4a184fae9ac355"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha1 = "942c921fec5e200b79593c71fafb1e3f57aa2e36"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz"; - sha1 = "8140f17d0f60c03619798f1d628b8434913dc32e"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha1 = "a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"; + }; + } + { + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha1 = "beddd4e8efe64995108b229b2862cd5752d40d6f"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha1 = "ac536c2d46672aa1f27ba0ec2140d53670635cfd"; }; } { @@ -1570,19 +1770,11 @@ }; } { - name = "abab___abab_2.0.1.tgz"; + name = "abab___abab_2.0.3.tgz"; path = fetchurl { - name = "abab___abab_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.1.tgz"; - sha1 = "3fa17797032b71410ec372e11668f4b4ffc86a82"; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + name = "abab___abab_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; + sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } { @@ -1594,19 +1786,19 @@ }; } { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; path = fetchurl { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.3.tgz"; - sha1 = "a86f75b69680b8780d30edd21eee4e0ea170c05e"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha1 = "9fa1926addc11c97308c4e66d7add0d40c3272e7"; }; } { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; - sha1 = "84b68ea44b373c4f8686023a551f61a21b7c4a4f"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1618,35 +1810,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.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_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.3.0.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; - sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.0.0.tgz"; + name = "acorn___acorn_7.1.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz"; - sha1 = "26b8d1cd9a9b700350b71c0905546f64d1284e7a"; - }; - } - { - name = "address___address_1.1.0.tgz"; - path = fetchurl { - name = "address___address_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz"; - sha1 = "ef8e047847fcd2c5b6f50c16965f924fd99fe709"; + name = "acorn___acorn_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1666,11 +1850,19 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_5.1.1.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + }; + } + { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; }; } { @@ -1698,11 +1890,11 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; + name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } { @@ -1729,6 +1921,14 @@ sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; }; } + { + 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_html___ansi_html_0.0.7.tgz"; path = fetchurl { @@ -1761,6 +1961,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 { @@ -1777,6 +1985,14 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { @@ -1785,6 +2001,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 { @@ -1793,14 +2017,6 @@ sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; }; } - { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; - }; - } { name = "argparse___argparse_1.0.10.tgz"; path = fetchurl { @@ -1857,14 +2073,6 @@ sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; }; } - { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } { name = "array_flatten___array_flatten_1.1.1.tgz"; path = fetchurl { @@ -1882,27 +2090,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; - }; - } - { - name = "array_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; - path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -1930,11 +2122,19 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.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"; }; } { @@ -2034,11 +2234,11 @@ }; } { - name = "async___async_1.5.2.tgz"; + name = "async___async_2.6.3.tgz"; path = fetchurl { - name = "async___async_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; }; } { @@ -2058,11 +2258,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz"; - sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz"; + sha1 = "63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"; }; } { @@ -2074,27 +2274,27 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; }; } { - name = "axios___axios_0.19.0.tgz"; + name = "axios___axios_0.19.2.tgz"; path = fetchurl { - name = "axios___axios_0.19.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz"; - sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"; + name = "axios___axios_0.19.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz"; + sha1 = "3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"; }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -2106,11 +2306,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz"; - sha1 = "182d5ac204579ff0881684b040560fdcc1558456"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -2130,19 +2330,19 @@ }; } { - name = "babel_loader___babel_loader_8.0.6.tgz"; + name = "babel_loader___babel_loader_8.1.0.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; - sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; + name = "babel_loader___babel_loader_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz"; + sha1 = "c611d5112bd5209abe8b9fa84c3e4da25275f1c3"; }; } { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; }; } { @@ -2162,19 +2362,19 @@ }; } { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz"; - sha1 = "41f7ead616fc36f6a93180e89697f69f51671181"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; }; } { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz"; - sha1 = "9ba2f3ac4dc78b042651654f07e847adfe50667c"; + 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"; }; } { @@ -2210,11 +2410,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz"; - sha1 = "16a2cf84363045b530b6a03460527a5c6eac42ba"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2234,11 +2434,11 @@ }; } { - name = "bail___bail_1.0.4.tgz"; + name = "bail___bail_1.0.5.tgz"; path = fetchurl { - name = "bail___bail_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz"; - sha1 = "7181b66d508aa3055d3f6c13f0a0c720641dde9b"; + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; }; } { @@ -2298,11 +2498,35 @@ }; } { - name = "bluebird___bluebird_3.5.5.tgz"; + name = "binary_extensions___binary_extensions_2.0.0.tgz"; path = fetchurl { - name = "bluebird___bluebird_3.5.5.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz"; - sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f"; + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bl___bl_4.0.2.tgz"; + path = fetchurl { + name = "bl___bl_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; + sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + }; + } + { + 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"; }; } { @@ -2313,6 +2537,14 @@ sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; }; } + { + name = "bn.js___bn.js_5.1.1.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz"; + sha1 = "48efc4031a9c4041b9c99c6941d903463ab62eb5"; + }; + } { name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { @@ -2353,6 +2585,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 { @@ -2362,11 +2602,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"; }; } { @@ -2410,11 +2650,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; + name = "browserify_sign___browserify_sign_4.1.0.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.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz"; + sha1 = "4fe971b379a5aeb4925e06779f9fa1f41d249d70"; }; } { @@ -2426,27 +2666,35 @@ }; } { - name = "browserslist___browserslist_4.6.6.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.6.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz"; - sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453"; + name = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { - name = "browserslist___browserslist_4.7.0.tgz"; + name = "browserslist___browserslist_4.12.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz"; - sha1 = "9ee89225ffc07db03409f2fee524dc8227458a17"; + name = "browserslist___browserslist_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; + sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; }; } { - name = "bser___bser_2.1.0.tgz"; + name = "bser___bser_2.1.1.tgz"; path = fetchurl { - name = "bser___bser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz"; - sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5"; + 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"; }; } { @@ -2474,11 +2722,19 @@ }; } { - name = "buffer___buffer_4.9.1.tgz"; + name = "buffer___buffer_4.9.2.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"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "buffer___buffer_5.6.0.tgz"; + path = fetchurl { + name = "buffer___buffer_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; + sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } { @@ -2514,11 +2770,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_13.0.1.tgz"; + path = fetchurl { + name = "cacache___cacache_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; + sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; }; } { @@ -2570,11 +2834,11 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "camel_case___camel_case_4.1.1.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "camel_case___camel_case_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; + sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; }; } { @@ -2585,14 +2849,6 @@ sha1 = "03295527d58bd3cd4aa75363f35b2e8d97be2f42"; }; } - { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { @@ -2610,11 +2866,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz"; - sha1 = "b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz"; + sha1 = "7e82fc42d927980b0ce1426c4813df12381e1a75"; }; } { @@ -2626,11 +2882,11 @@ }; } { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz"; - sha1 = "3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"; }; } { @@ -2658,27 +2914,35 @@ }; } { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; + name = "chalk___chalk_3.0.0.tgz"; path = fetchurl { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; - sha1 = "3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"; + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } { - name = "character_entities___character_entities_1.2.3.tgz"; + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { - name = "character_entities___character_entities_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz"; - sha1 = "bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"; + 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_reference_invalid___character_reference_invalid_1.1.3.tgz"; + name = "character_entities___character_entities_1.2.4.tgz"; path = fetchurl { - name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; - sha1 = "1647f4f726638d3ea4a750cf5d1975c1c7919a85"; + 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"; }; } { @@ -2698,11 +2962,19 @@ }; } { - name = "chownr___chownr_1.1.2.tgz"; + name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz"; - sha1 = "a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"; + name = "chokidar___chokidar_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; + sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -2738,27 +3010,35 @@ }; } { - name = "clean_css___clean_css_4.2.1.tgz"; + name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz"; - sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"; + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + 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_width___cli_width_2.2.0.tgz"; + name = "cli_cursor___cli_cursor_3.1.0.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_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { @@ -2794,11 +3074,11 @@ }; } { - name = "clsx___clsx_1.0.4.tgz"; + name = "clsx___clsx_1.1.0.tgz"; path = fetchurl { - name = "clsx___clsx_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clsx/-/clsx-1.0.4.tgz"; - sha1 = "0c0171f6d5cb2fe83848463c15fcc26b4df8c2ec"; + name = "clsx___clsx_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz"; + sha1 = "62937c6adfea771247c34b54d320fb99624f5702"; }; } { @@ -2826,19 +3106,19 @@ }; } { - name = "codemirror___codemirror_5.48.4.tgz"; + name = "codemirror___codemirror_5.53.2.tgz"; path = fetchurl { - name = "codemirror___codemirror_5.48.4.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.4.tgz"; - sha1 = "4210fbe92be79a88f0eea348fab3ae78da85ce47"; + name = "codemirror___codemirror_5.53.2.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; + sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; }; } { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; path = fetchurl { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; - sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; + 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"; }; } { @@ -2857,6 +3137,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 { @@ -2898,27 +3186,19 @@ }; } { - name = "commander___commander_2.17.1.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { - name = "commander___commander_2.20.0.tgz"; + name = "commander___commander_4.1.1.tgz"; path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; - }; - } - { - name = "commander___commander_2.19.0.tgz"; - path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; }; } { @@ -2954,11 +3234,11 @@ }; } { - name = "compressible___compressible_2.0.17.tgz"; + name = "compressible___compressible_2.0.18.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.17.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; - sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; }; } { @@ -2986,11 +3266,11 @@ }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz"; - sha1 = "93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"; + 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"; }; } { @@ -3002,19 +3282,11 @@ }; } { - name = "console_browserify___console_browserify_1.1.0.tgz"; + name = "console_browserify___console_browserify_1.2.0.tgz"; path = fetchurl { - name = "console_browserify___console_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; }; } { @@ -3050,11 +3322,11 @@ }; } { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz"; - sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20"; + 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"; }; } { @@ -3098,19 +3370,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz"; - sha1 = "0cbdbc2e386e8e00d3b85dc81c848effec5b8150"; + 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___core_js_3.1.4.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz"; - sha1 = "3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"; + 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"; }; } { @@ -3122,11 +3394,19 @@ }; } { - name = "core_js___core_js_2.6.9.tgz"; + name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz"; - sha1 = "6b4b214620c834152e179323727fc19741b084f2"; + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_js___core_js_3.6.5.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"; }; } { @@ -3145,6 +3425,14 @@ sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; }; } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } { name = "create_ecdh___create_ecdh_4.0.3.tgz"; path = fetchurl { @@ -3169,6 +3457,14 @@ sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; }; } + { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + }; + } { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { @@ -3218,11 +3514,11 @@ }; } { - name = "css_loader___css_loader_2.1.1.tgz"; + name = "css_loader___css_loader_3.4.2.tgz"; path = fetchurl { - name = "css_loader___css_loader_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz"; - sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea"; + name = "css_loader___css_loader_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz"; + sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202"; }; } { @@ -3250,43 +3546,35 @@ }; } { - name = "css_select___css_select_2.0.2.tgz"; + name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { - name = "css_select___css_select_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz"; - sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede"; + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; - sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz"; - sha1 = "970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"; + 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_unit_converter___css_unit_converter_1.1.1.tgz"; + name = "css_vendor___css_vendor_2.0.8.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_vendor___css_vendor_2.0.7.tgz"; - path = fetchurl { - name = "css_vendor___css_vendor_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz"; - sha1 = "4e6d53d953c187981576d6a542acc9fb57174bda"; + name = "css_vendor___css_vendor_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz"; + sha1 = "e47f91d3bd3117d49180a3c935e62e3d9f7f449d"; }; } { @@ -3297,6 +3585,14 @@ sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; }; } + { + name = "css_what___css_what_3.2.1.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 = "css___css_2.2.4.tgz"; path = fetchurl { @@ -3378,11 +3674,11 @@ }; } { - name = "csso___csso_3.5.1.tgz"; + name = "csso___csso_4.0.3.tgz"; path = fetchurl { - name = "csso___csso_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz"; - sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b"; + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; }; } { @@ -3402,19 +3698,19 @@ }; } { - name = "csstype___csstype_2.6.6.tgz"; + name = "csstype___csstype_2.6.10.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz"; - sha1 = "c34f8226a94bbb10c32cc0d714afdf942291fc41"; + name = "csstype___csstype_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; + sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; }; } { - name = "cyclist___cyclist_0.2.2.tgz"; + name = "cyclist___cyclist_1.0.1.tgz"; path = fetchurl { - name = "cyclist___cyclist_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; }; } { @@ -3426,11 +3722,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz"; - sha1 = "780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -3449,14 +3745,6 @@ sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; }; } - { - name = "date_now___date_now_0.1.4.tgz"; - path = fetchurl { - name = "date_now___date_now_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - } { name = "debug___debug_2.6.9.tgz"; path = fetchurl { @@ -3465,6 +3753,14 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } + { + 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_3.1.0.tgz"; path = fetchurl { @@ -3481,14 +3777,6 @@ sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; }; } - { - 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 { @@ -3497,14 +3785,6 @@ sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; } - { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; path = fetchurl { @@ -3514,19 +3794,11 @@ }; } { - name = "deep_equal___deep_equal_1.1.0.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz"; - sha1 = "3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"; - }; - } - { - 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_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -3578,11 +3850,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -3593,14 +3865,6 @@ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } { name = "depd___depd_1.1.2.tgz"; path = fetchurl { @@ -3610,11 +3874,11 @@ }; } { - name = "des.js___des.js_1.0.0.tgz"; + name = "des.js___des.js_1.0.1.tgz"; path = fetchurl { - name = "des.js___des.js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; }; } { @@ -3626,19 +3890,11 @@ }; } { - name = "detect_browser___detect_browser_3.0.1.tgz"; + name = "detect_browser___detect_browser_5.1.0.tgz"; path = fetchurl { - name = "detect_browser___detect_browser_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-3.0.1.tgz"; - sha1 = "39beead014347a8a2be1f3c4cb30a0aef2127c44"; - }; - } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + name = "detect_browser___detect_browser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz"; + sha1 = "0c51c66b747ad8f98a6832bf3026a5a23a7850ff"; }; } { @@ -3674,11 +3930,19 @@ }; } { - name = "diff___diff_4.0.1.tgz"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; path = fetchurl { - name = "diff___diff_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; - sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; + 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___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; }; } { @@ -3754,19 +4018,19 @@ }; } { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.0.tgz"; - sha1 = "57a726de04abcc2a8bbfe664b3e21c584bde514e"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz"; + sha1 = "4609680ab5c79a45f2531441f1949b79d6587f4b"; }; } { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz"; - sha1 = "13650c850daffea35d8b626a4cfc4d3a17643fdb"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } { @@ -3842,27 +4106,35 @@ }; } { - name = "dot_prop___dot_prop_4.2.0.tgz"; + name = "dot_case___dot_case_3.0.3.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; - sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + 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 = "dotenv_expand___dotenv_expand_4.2.0.tgz"; + name = "dot_prop___dot_prop_5.2.0.tgz"; path = fetchurl { - name = "dotenv_expand___dotenv_expand_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz"; - sha1 = "def1f1ca5d6059d24a766e587942c21106ce1275"; + 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 = "dotenv___dotenv_6.2.0.tgz"; + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz"; - sha1 = "941c0410535d942c8becf28d3f357dbd9d476064"; + 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"; }; } { @@ -3898,19 +4170,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.252.tgz"; - sha1 = "5b6261965b564a0f4df0f1c86246487897017f52"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz"; + sha1 = "705dd8ef46200415ba837b31d927cdc1e43db303"; }; } { - name = "elliptic___elliptic_6.5.1.tgz"; + name = "elliptic___elliptic_6.5.2.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz"; - sha1 = "c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"; + name = "elliptic___elliptic_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; + sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; }; } { @@ -3921,6 +4193,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 = "emojis_list___emojis_list_2.1.0.tgz"; path = fetchurl { @@ -3929,6 +4209,14 @@ sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } { name = "encodeurl___encodeurl_1.0.2.tgz"; path = fetchurl { @@ -3946,19 +4234,19 @@ }; } { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.1.1.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"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; + sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; }; } { @@ -3986,11 +4274,11 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz"; - sha1 = "96e3730d76b872f593e54ce1c51fa3a451422d93"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; + sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; }; } { @@ -4010,27 +4298,27 @@ }; } { - name = "es_abstract___es_abstract_1.14.1.tgz"; + name = "es_abstract___es_abstract_1.17.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.1.tgz"; - sha1 = "6e8d84b445ec9c610781e74a6d52cc31aac5b4ca"; + name = "es_abstract___es_abstract_1.17.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; + sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { - name = "es5_ext___es5_ext_0.10.51.tgz"; + name = "es5_ext___es5_ext_0.10.53.tgz"; path = fetchurl { - name = "es5_ext___es5_ext_0.10.51.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.51.tgz"; - sha1 = "ed2d7d9d48a12df86e0299287e93a09ff478842f"; + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; }; } { @@ -4042,27 +4330,11 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; + name = "es6_symbol___es6_symbol_3.1.3.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_promisify___es6_promisify_5.0.0.tgz"; - path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } { @@ -4073,6 +4345,14 @@ sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; } + { + 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_1.0.5.tgz"; path = fetchurl { @@ -4082,59 +4362,59 @@ }; } { - name = "escodegen___escodegen_1.12.0.tgz"; + name = "escodegen___escodegen_1.14.1.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz"; - sha1 = "f763daf840af172bb3a2b6dd7219c0e17f7ff541"; + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.1.tgz"; - sha1 = "5f3d666ba3ee3cb384eb943e260e868f6c72251b"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + 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_loader___eslint_loader_2.2.1.tgz"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; path = fetchurl { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz"; - sha1 = "28b9c12da54057af0845e2a6112701a2f6bf8337"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz"; + sha1 = "e018e3d2722381d982b1201adb56819c73b480ca"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; - sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; + 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"; }; } { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz"; - sha1 = "e241ebd39c0ce519345a3f074ec1ebde4cf80f2c"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz"; + sha1 = "82b2bd6f21770e0e5deede0228e456cb35308451"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; - sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; + 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"; }; } { @@ -4154,19 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz"; - sha1 = "911030dd7e98ba49e1b2208599571846a66bdf13"; - }; - } - { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4186,11 +4458,19 @@ }; } { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; - sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + }; + } + { + name = "eslint_utils___eslint_utils_2.0.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; }; } { @@ -4202,27 +4482,19 @@ }; } { - name = "eslint___eslint_6.3.0.tgz"; + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.3.0.tgz"; - sha1 = "1f1a902f67bfd4c354e7288b81e40654d927eb6a"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "espree___espree_6.1.1.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz"; - sha1 = "7f80e5f7257fc47db450022d723e356daeb1e5de"; - }; - } - { - name = "esprima___esprima_3.1.3.tgz"; - path = fetchurl { - name = "esprima___esprima_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4234,11 +4506,11 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { @@ -4257,6 +4529,14 @@ sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } + { + name = "estraverse___estraverse_5.1.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { @@ -4274,19 +4554,19 @@ }; } { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha1 = "2d3d48f9c346698fce83a85d7d664e98535df6e7"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; }; } { - name = "events___events_3.0.0.tgz"; + name = "events___events_3.1.0.tgz"; path = fetchurl { - name = "events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; - sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + name = "events___events_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; + sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; }; } { @@ -4306,11 +4586,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.2.tgz"; + name = "exec_sh___exec_sh_0.3.4.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; - sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; }; } { @@ -4353,6 +4633,14 @@ sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; }; } + { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } { name = "extend_shallow___extend_shallow_2.0.1.tgz"; path = fetchurl { @@ -4394,11 +4682,11 @@ }; } { - name = "extract_zip___extract_zip_1.6.7.tgz"; + name = "extract_zip___extract_zip_2.0.0.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 = "extract_zip___extract_zip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz"; + sha1 = "f53b71d44f4ff5a4527a2259ade000fb8b303492"; }; } { @@ -4418,11 +4706,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + 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"; }; } { @@ -4434,11 +4722,11 @@ }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + 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.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + 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"; }; } { @@ -4466,11 +4754,11 @@ }; } { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; - sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; }; } { @@ -4482,27 +4770,27 @@ }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fd_slicer___fd_slicer_1.1.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 = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } { - 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"; }; } { - name = "figures___figures_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -4514,19 +4802,27 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.3.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_loader___file_loader_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz"; + sha1 = "780f040f729b3d18019f20605f723e844b8a58af"; }; } { - name = "filesize___filesize_3.6.1.tgz"; + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filesize___filesize_6.0.1.tgz"; + path = fetchurl { + name = "filesize___filesize_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz"; + sha1 = "f850b509909c7c86f7e450ea19006c31c2ed3d2f"; }; } { @@ -4537,6 +4833,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 { @@ -4562,11 +4866,19 @@ }; } { - name = "find_up___find_up_3.0.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_up___find_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + name = "find_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_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"; }; } { @@ -4585,6 +4897,14 @@ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; }; } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { @@ -4594,19 +4914,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 = "flatten___flatten_1.0.2.tgz"; + name = "flatten___flatten_1.0.3.tgz"; path = fetchurl { - name = "flatten___flatten_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz"; - sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; + name = "flatten___flatten_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz"; + sha1 = "c1283ac9f27b368abc1e36d1ff7b04501a30356b"; }; } { @@ -4626,11 +4946,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.8.1.tgz"; - sha1 = "24804f9eaab67160b0e840c085885d606371a35b"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz"; + sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb"; }; } { @@ -4666,11 +4986,11 @@ }; } { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; path = fetchurl { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz"; - sha1 = "ce1d77190b44d81a761b10b6284a373795e41f0c"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha1 = "a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"; }; } { @@ -4714,11 +5034,11 @@ }; } { - name = "fs_extra___fs_extra_7.0.1.tgz"; + name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; }; } { @@ -4730,11 +5050,27 @@ }; } { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; + name = "fs_extra___fs_extra_7.0.1.tgz"; path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"; + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + 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_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"; }; } { @@ -4754,19 +5090,27 @@ }; } { - name = "fsevents___fsevents_2.0.7.tgz"; + name = "fsevents___fsevents_2.1.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; - sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + name = "fsevents___fsevents_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz"; + sha1 = "4c0a1fb34bc68e543b4b82a9ec392bfbda840805"; }; } { - name = "fsevents___fsevents_1.2.9.tgz"; + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.9.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; - sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; + 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"; }; } { @@ -4778,11 +5122,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz"; - sha1 = "6d252350803085abc2ad423d4fe3be2f9cbda392"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; + sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; }; } { @@ -4794,19 +5138,19 @@ }; } { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.1.1.tgz"; - sha1 = "79d35927f07b8e7103d819fed475b64ccf7225ea"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; + sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; }; } { - name = "gauge___gauge_2.7.4.tgz"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } { @@ -4826,27 +5170,19 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz"; - sha1 = "b877b49a5c16aefac3655f2ed2ea5b684df8d203"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { - name = "get_port___get_port_5.0.0.tgz"; + name = "get_port___get_port_5.1.1.tgz"; path = fetchurl { - name = "get_port___get_port_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-5.0.0.tgz"; - sha1 = "aa22b6b86fd926dd7884de3e23332c9f70c031a6"; - }; - } - { - name = "get_port___get_port_4.2.0.tgz"; - path = fetchurl { - name = "get_port___get_port_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; - sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; + name = "get_port___get_port_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz"; + sha1 = "0469ed07563479de6efb986baf053dcd7d4e3193"; }; } { @@ -4857,6 +5193,14 @@ sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; }; } + { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { @@ -4882,11 +5226,11 @@ }; } { - name = "glob_parent___glob_parent_5.0.0.tgz"; + name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz"; - sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954"; + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } { @@ -4898,11 +5242,11 @@ }; } { - name = "glob___glob_7.1.4.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.4.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz"; - sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -4929,6 +5273,14 @@ 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 = "globby___globby_8.0.2.tgz"; path = fetchurl { @@ -4946,11 +5298,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz"; - sha1 = "6f0952605d0140c1cfdb138ed005775b92d67b02"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -4961,6 +5313,14 @@ sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; } + { + name = "gud___gud_1.0.0.tgz"; + path = fetchurl { + name = "gud___gud_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz"; + sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0"; + }; + } { name = "gzip_size___gzip_size_5.1.1.tgz"; path = fetchurl { @@ -4970,19 +5330,11 @@ }; } { - name = "handle_thing___handle_thing_2.0.0.tgz"; + name = "handle_thing___handle_thing_2.0.1.tgz"; path = fetchurl { - name = "handle_thing___handle_thing_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz"; - sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754"; - }; - } - { - name = "handlebars___handlebars_4.2.0.tgz"; - path = fetchurl { - name = "handlebars___handlebars_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz"; - sha1 = "57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"; + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; }; } { @@ -5026,19 +5378,19 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + 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_unicode___has_unicode_2.0.1.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -5082,11 +5434,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"; }; } { @@ -5114,11 +5466,11 @@ }; } { - name = "history___history_4.9.0.tgz"; + name = "history___history_4.10.1.tgz"; path = fetchurl { - name = "history___history_4.9.0.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz"; - sha1 = "84587c2068039ead8af769e9d6a6860a14fa1bca"; + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; }; } { @@ -5129,22 +5481,6 @@ sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; } - { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; - sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz"; - sha1 = "b09178f0122184fb95acf525daaecb4d8f45958b"; - }; - } { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { @@ -5154,11 +5490,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; - sha1 = "44119abaf4bc64692a16ace34700fed9c03e2546"; + 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"; }; } { @@ -5202,35 +5538,43 @@ }; } { - name = "html_entities___html_entities_1.2.1.tgz"; + name = "html_entities___html_entities_1.3.1.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + name = "html_entities___html_entities_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; + sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; }; } { - name = "html_minifier___html_minifier_3.5.21.tgz"; + name = "html_escaper___html_escaper_2.0.2.tgz"; path = fetchurl { - name = "html_minifier___html_minifier_3.5.21.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz"; - sha1 = "d0040e054730e354db008463593194015212d20c"; + 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 = "html_to_react___html_to_react_1.4.1.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; path = fetchurl { - name = "html_to_react___html_to_react_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.1.tgz"; - sha1 = "64f67657c6335056866e334c097556f25894dd47"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; + sha1 = "95d3df037f04835e9d1a09d1767c0e361a7de916"; }; } { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; + name = "html_to_react___html_to_react_1.4.2.tgz"; path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz"; - sha1 = "2c53083c1151bfec20479b1f8aaf0039e77b5513"; + name = "html_to_react___html_to_react_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.2.tgz"; + sha1 = "7b628ab56cd63a52f2d0b79d0fa838a51f088a57"; + }; + } + { + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.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"; }; } { @@ -5242,11 +5586,11 @@ }; } { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.0.0.tgz"; - sha1 = "6034658db65b7713a572a9ebf79f650832dceec8"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; }; } { @@ -5298,11 +5642,11 @@ }; } { - name = "http_proxy___http_proxy_1.17.0.tgz"; + name = "http_proxy___http_proxy_1.18.0.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz"; - sha1 = "7ad38494658f84605e2f6db4436df410f4e5be9a"; + name = "http_proxy___http_proxy_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; + sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; }; } { @@ -5322,11 +5666,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; - sha1 = "271ea8e90f836ac9f119daccd39c19ff7dfb0793"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; }; } { @@ -5345,14 +5689,6 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } - { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - path = fetchurl { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; - sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; - }; - } { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { @@ -5385,14 +5721,6 @@ sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; } - { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8"; - }; - } { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { @@ -5442,11 +5770,11 @@ }; } { - name = "import_fresh___import_fresh_3.1.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz"; - sha1 = "6d33fa1dcef6df930fae003446f33415af905118"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -5473,6 +5801,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 { @@ -5530,19 +5866,19 @@ }; } { - name = "inquirer___inquirer_6.5.0.tgz"; + name = "inquirer___inquirer_7.0.4.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz"; - sha1 = "2303317efc9a4ea7ec2e2df6f86569b734accf42"; + name = "inquirer___inquirer_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; + sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } { - name = "inquirer___inquirer_6.5.2.tgz"; + name = "inquirer___inquirer_7.1.0.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; }; } { @@ -5553,6 +5889,14 @@ sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; }; } + { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + }; + } { name = "invariant___invariant_2.2.4.tgz"; path = fetchurl { @@ -5585,14 +5929,6 @@ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; } - { - name = "ipaddr.js___ipaddr.js_1.9.0.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"; path = fetchurl { @@ -5609,6 +5945,14 @@ sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; }; } + { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { @@ -5626,19 +5970,19 @@ }; } { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; - sha1 = "eb04cc47219a8895d8450ace4715abff2258a1f8"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; }; } { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; path = fetchurl { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; - sha1 = "57ae21c374277b3defe0274c640a5704b8f6657c"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; }; } { @@ -5673,6 +6017,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_buffer___is_buffer_1.1.6.tgz"; path = fetchurl { @@ -5682,19 +6034,11 @@ }; } { - name = "is_buffer___is_buffer_2.0.3.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; - sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; - }; - } - { - name = "is_callable___is_callable_1.1.4.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -5730,19 +6074,19 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { - name = "is_decimal___is_decimal_1.0.3.tgz"; + name = "is_decimal___is_decimal_1.0.4.tgz"; path = fetchurl { - name = "is_decimal___is_decimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz"; - sha1 = "381068759b9dc807d8c0dc0bfbae2b68e1da48b7"; + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; }; } { @@ -5769,6 +6113,14 @@ sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; } + { + name = "is_docker___is_docker_2.0.0.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; + sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + }; + } { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { @@ -5809,6 +6161,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_generator_fn___is_generator_fn_2.1.0.tgz"; path = fetchurl { @@ -5834,11 +6194,11 @@ }; } { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; path = fetchurl { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; - sha1 = "e8a426a69b6d31470d3a33a47bb825cda02506ee"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; }; } { @@ -5857,6 +6217,14 @@ 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_1.0.1.tgz"; path = fetchurl { @@ -5866,27 +6234,35 @@ }; } { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + name = "is_obj___is_obj_2.0.0.tgz"; path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + 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_in_cwd___is_path_in_cwd_1.0.1.tgz"; + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52"; + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; }; } { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; }; } { @@ -5906,19 +6282,11 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_regex___is_regex_1.0.5.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_regex___is_regex_1.0.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -5953,6 +6321,14 @@ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; } + { + name = "is_string___is_string_1.0.5.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } { name = "is_svg___is_svg_3.0.0.tgz"; path = fetchurl { @@ -5962,11 +6338,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -5978,11 +6354,11 @@ }; } { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; path = fetchurl { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; - sha1 = "b3ad9546d916d7d3ffa78204bca0c26b56257fac"; + 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"; }; } { @@ -5994,11 +6370,11 @@ }; } { - name = "is_word_character___is_word_character_1.0.3.tgz"; + name = "is_word_character___is_word_character_1.0.4.tgz"; path = fetchurl { - name = "is_word_character___is_word_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz"; - sha1 = "264d15541cbad0ba833d3992c34e6b40873b08aa"; + 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"; }; } { @@ -6009,6 +6385,14 @@ sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; } + { + 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 = "isarray___isarray_0.0.1.tgz"; path = fetchurl { @@ -6098,11 +6482,11 @@ }; } { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; - sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; }; } { @@ -6137,6 +6521,14 @@ sha1 = "931b7d0d5778a1baf7452cb816e325e3724055da"; }; } + { + name = "jest_diff___jest_diff_25.5.0.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_docblock___jest_docblock_24.9.0.tgz"; path = fetchurl { @@ -6154,11 +6546,11 @@ }; } { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz"; - sha1 = "aad6393a9d4b565b69a609109bf469f62bf18ccc"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz"; + sha1 = "4cd0042f58b4ab666950d96532ecb2fc188f96fb"; }; } { @@ -6185,6 +6577,14 @@ sha1 = "1684a0c8a50f2e4901b6644ae861f579eed2ef0e"; }; } + { + name = "jest_get_type___jest_get_type_25.2.6.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_haste_map___jest_haste_map_24.9.0.tgz"; path = fetchurl { @@ -6257,14 +6657,6 @@ sha1 = "ad055198959c4cfba8a4f066c673a3f0786507ab"; }; } - { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - path = fetchurl { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz"; - sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f"; - }; - } { name = "jest_resolve___jest_resolve_24.9.0.tgz"; path = fetchurl { @@ -6322,11 +6714,11 @@ }; } { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; path = fetchurl { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.3.1.tgz"; - sha1 = "47701024b64b444aa325d801b4b3a6d61ed70701"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz"; + sha1 = "e5be959698a7fa2302229a5082c488c3c8780a4a"; }; } { @@ -6346,27 +6738,27 @@ }; } { - name = "jest___jest_24.8.0.tgz"; + name = "jest_worker___jest_worker_25.5.0.tgz"; path = fetchurl { - name = "jest___jest_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz"; - sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081"; + name = "jest_worker___jest_worker_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz"; + sha1 = "2611d071b79cea0f43ee57a3d118593ac1547db1"; }; } { - name = "js_base64___js_base64_2.5.1.tgz"; + name = "jest___jest_24.9.0.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz"; - sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121"; + name = "jest___jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz"; + sha1 = "987d290c05a08b52c56188c1002e368edb007171"; }; } { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; + name = "js_base64___js_base64_2.5.2.tgz"; path = fetchurl { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d"; + name = "js_base64___js_base64_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz"; + sha1 = "313b6274dda718f714d00b3330bbae6e38e90209"; }; } { @@ -6498,11 +6890,11 @@ }; } { - name = "json5___json5_2.1.0.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "json5___json5_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; - sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -6530,75 +6922,75 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz"; - sha1 = "3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz"; + sha1 = "8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz"; - sha1 = "df03885de20f20a1fc1c21bdb7c62e865ee400d9"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz"; + sha1 = "2df86016dfe73085eead843f5794e3890e9c5c47"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz"; - sha1 = "412245b56133cc88bec654a70d82d5922619f4c5"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz"; + sha1 = "36b0d6d9facb74dfd99590643708a89260747d14"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz"; - sha1 = "4d15ad13995fb6e4125618006473a096d2475d75"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz"; + sha1 = "5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz"; - sha1 = "43c880ff8dfcf858f809f663ece5e65a1d945b5a"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz"; + sha1 = "34bddcbfaf9430ec8ccdf92729f03bb10caf1785"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz"; - sha1 = "2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz"; + sha1 = "be00dac6fc394aaddbcef5860b9eca6224d96382"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz"; - sha1 = "1626ef612a4541cff17cf96815e1740155214ed2"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz"; + sha1 = "8348b20749f790beebab3b6a8f7075b07c2cfcfd"; }; } { - name = "jss___jss_10.0.4.tgz"; + name = "jss___jss_10.1.1.tgz"; path = fetchurl { - name = "jss___jss_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz"; - sha1 = "46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"; + name = "jss___jss_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz"; + sha1 = "450b27d53761af3e500b43130a54cdbe157ea332"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz"; - sha1 = "4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -6642,11 +7034,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -6705,6 +7097,14 @@ sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; }; } + { + name = "levenary___levenary_1.1.1.tgz"; + path = fetchurl { + name = "levenary___levenary_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz"; + sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77"; + }; + } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -6713,6 +7113,14 @@ sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } { name = "load_json_file___load_json_file_2.0.0.tgz"; path = fetchurl { @@ -6730,11 +7138,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -6753,6 +7161,14 @@ sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7"; }; } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -6769,6 +7185,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._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; path = fetchurl { @@ -6833,14 +7257,6 @@ sha1 = "e481310f049d3cf6d47e912ad09313b154f0fb33"; }; } - { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - path = fetchurl { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; - sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; - }; - } { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { @@ -6858,11 +7274,11 @@ }; } { - name = "loglevel___loglevel_1.6.3.tgz"; + name = "loglevel___loglevel_1.6.8.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz"; - sha1 = "77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"; + name = "loglevel___loglevel_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; + sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; }; } { @@ -6874,11 +7290,11 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.1.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; + sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; }; } { @@ -6897,6 +7313,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 = "makeerror___makeerror_1.0.11.tgz"; path = fetchurl { @@ -6938,11 +7362,11 @@ }; } { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; path = fetchurl { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; - sha1 = "6155e10416efaafab665d466ce598216375195f5"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; + sha1 = "c95415ef451499d7602b91095f3c8e8975f78535"; }; } { @@ -6970,11 +7394,11 @@ }; } { - name = "mdn_data___mdn_data_1.1.4.tgz"; + name = "mdn_data___mdn_data_2.0.6.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz"; - sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01"; + name = "mdn_data___mdn_data_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; + sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; }; } { @@ -7001,6 +7425,14 @@ sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; } + { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } { name = "merge_deep___merge_deep_3.0.2.tgz"; path = fetchurl { @@ -7026,11 +7458,11 @@ }; } { - name = "merge2___merge2_1.2.4.tgz"; + name = "merge2___merge2_1.3.0.tgz"; path = fetchurl { - name = "merge2___merge2_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz"; - sha1 = "c9269589e6885a60cf80605d9522d4b67ca646e3"; + name = "merge2___merge2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; + sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; }; } { @@ -7066,27 +7498,19 @@ }; } { - name = "mime_db___mime_db_1.40.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.40.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; - sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; + 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_db___mime_db_1.41.0.tgz"; + name = "mime_types___mime_types_2.1.27.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.41.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.41.0.tgz"; - sha1 = "9110408e1f6aa1b34aef51f2c9df3caddf46b6a0"; - }; - } - { - name = "mime_types___mime_types_2.1.24.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.24.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; - sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -7098,19 +7522,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.4.5.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; - }; - } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; + name = "mime___mime_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz"; + sha1 = "d8de2ecb92982dedbb6541c9b6841d7f218ea009"; }; } { @@ -7122,11 +7538,19 @@ }; } { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha1 = "ac0059b02b9692515a637115b0cc9fed3a35c7b0"; + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz"; + sha1 = "79fc598f283dd623da8e088b05db8cddab250189"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha1 = "47f2cf07aa165ab35733b1fc97d4c46c0564339e"; }; } { @@ -7154,43 +7578,43 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + 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 = "minimist___minimist_0.0.10.tgz"; + name = "minipass_flush___minipass_flush_1.0.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + 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___minipass_2.5.0.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; path = fetchurl { - name = "minipass___minipass_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.5.0.tgz"; - sha1 = "dddb1d001976978158a05badfcbef4a771612857"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } { - name = "minizlib___minizlib_1.2.1.tgz"; + name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { - name = "minizlib___minizlib_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz"; - sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614"; + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; }; } { @@ -7218,35 +7642,51 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; }; } { - name = "mobx_react___mobx_react_5.4.4.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "mobx_react___mobx_react_5.4.4.tgz"; - url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz"; - sha1 = "b3de9c6eabcd0ed8a40036888cb0221ab9568b80"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; path = fetchurl { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.4.1.tgz"; - sha1 = "18ff5f9723b27e1ff50ae0b362938a4792eb077a"; + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.6.tgz"; + sha1 = "e1307a2b271c6a6016c8ad815a25014b7f95997d"; }; } { - name = "mobx___mobx_5.13.0.tgz"; + name = "mobx_react___mobx_react_6.2.2.tgz"; path = fetchurl { - name = "mobx___mobx_5.13.0.tgz"; - url = "https://registry.yarnpkg.com/mobx/-/mobx-5.13.0.tgz"; - sha1 = "0fd68f10aa5ff2d146a4ed9e145b53337cfbca59"; + name = "mobx_react___mobx_react_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.2.tgz"; + sha1 = "45e8e7c4894cac8399bba0a91060d7cfb8ea084b"; + }; + } + { + name = "mobx_utils___mobx_utils_5.5.7.tgz"; + path = fetchurl { + name = "mobx_utils___mobx_utils_5.5.7.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.5.7.tgz"; + sha1 = "0ef58f2d5e05ca0e59ba2322f84f9c763de6ce14"; + }; + } + { + name = "mobx___mobx_5.15.4.tgz"; + path = fetchurl { + name = "mobx___mobx_5.15.4.tgz"; + url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz"; + sha1 = "9da1a84e97ba624622f4e55a0bf3300fb931c2ab"; }; } { @@ -7298,19 +7738,19 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; + name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; }; } { - name = "nan___nan_2.14.0.tgz"; + name = "nan___nan_2.14.1.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.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } { @@ -7329,14 +7769,6 @@ sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; } - { - name = "needle___needle_2.4.0.tgz"; - path = fetchurl { - name = "needle___needle_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; - sha1 = "6833e74975c444642590e15a750288c5f939b57c"; - }; - } { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { @@ -7370,11 +7802,11 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "no_case___no_case_3.0.3.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "no_case___no_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; + sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; }; } { @@ -7386,11 +7818,11 @@ }; } { - name = "node_forge___node_forge_0.7.5.tgz"; + name = "node_forge___node_forge_0.9.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz"; - sha1 = "6c152c345ce11c52f465c2abd957e8639cd674df"; + name = "node_forge___node_forge_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz"; + sha1 = "d624050edbb44874adca12bb9a52ec63cb782579"; }; } { @@ -7426,27 +7858,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + name = "node_releases___node_releases_1.1.55.tgz"; path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; - }; - } - { - name = "node_releases___node_releases_1.1.29.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.29.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.29.tgz"; - sha1 = "86a57c6587a30ecd6726449e5d293466b0a0bb86"; - }; - } - { - name = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.55.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz"; + sha1 = "8af23b7c561d8e2e6e36a46637bab84633b07cee"; }; } { @@ -7481,6 +7897,14 @@ sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; } + { + name = "normalize_url___normalize_url_1.9.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + } { name = "normalize_url___normalize_url_3.3.0.tgz"; path = fetchurl { @@ -7497,22 +7921,6 @@ sha1 = "7418c9d6c0533aebaa643414214af53b521d1b28"; }; } - { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz"; - sha1 = "866224233850ac534b63d1a6e76050092b5d2f44"; - }; - } { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { @@ -7521,14 +7929,6 @@ sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; } - { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { @@ -7554,11 +7954,11 @@ }; } { - name = "nwsapi___nwsapi_2.1.4.tgz"; + name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz"; - sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f"; + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } { @@ -7594,27 +7994,27 @@ }; } { - name = "object_hash___object_hash_1.3.1.tgz"; + name = "object_hash___object_hash_2.0.3.tgz"; path = fetchurl { - name = "object_hash___object_hash_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz"; - sha1 = "fde452098a951cb145f039bb7d455449ddc126df"; + name = "object_hash___object_hash_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; + sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; }; } { - name = "object_inspect___object_inspect_1.6.0.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz"; - sha1 = "c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"; + 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_is___object_is_1.0.1.tgz"; + name = "object_is___object_is_1.1.2.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + name = "object_is___object_is_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; + sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; }; } { @@ -7650,27 +8050,27 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz"; - sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; }; } { @@ -7682,11 +8082,11 @@ }; } { - name = "object.values___object.values_1.1.0.tgz"; + name = "object.values___object.values_1.1.1.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz"; - sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9"; + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; }; } { @@ -7722,19 +8122,19 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { - name = "open___open_6.4.0.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz"; - sha1 = "5c13e96d0dc894686164f18965ecfe889ecfc8a9"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -7745,14 +8145,6 @@ sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; }; } - { - name = "optimist___optimist_0.6.1.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 { @@ -7762,11 +8154,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -7785,14 +8177,6 @@ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; } - { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { @@ -7809,14 +8193,6 @@ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; } - { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { @@ -7858,11 +8234,11 @@ }; } { - name = "p_limit___p_limit_2.2.1.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; - sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -7882,11 +8258,27 @@ }; } { - name = "p_map___p_map_1.2.0.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b"; + 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_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_3.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; + sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; }; } { @@ -7897,6 +8289,14 @@ sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; } + { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { @@ -7914,27 +8314,27 @@ }; } { - name = "pako___pako_1.0.10.tgz"; + name = "pako___pako_1.0.11.tgz"; path = fetchurl { - name = "pako___pako_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz"; - sha1 = "4328badb5086a426aa90f541977d4955da5c9732"; + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; path = fetchurl { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.3.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; + sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; }; } { @@ -7946,11 +8346,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz"; - sha1 = "37f6628f823fbdeb2273b4d540434a22f3ef1fcc"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; }; } { @@ -7977,6 +8377,14 @@ sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; } + { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { @@ -8001,6 +8409,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 { @@ -8041,6 +8457,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 { @@ -8065,6 +8489,14 @@ 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 { @@ -8082,11 +8514,11 @@ }; } { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; path = fetchurl { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; }; } { @@ -8105,6 +8537,14 @@ sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; }; } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } { name = "pbkdf2___pbkdf2_3.0.17.tgz"; path = fetchurl { @@ -8129,6 +8569,14 @@ 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_2.3.0.tgz"; path = fetchurl { @@ -8201,6 +8649,22 @@ sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; }; } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_up___pkg_up_3.1.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; + }; + } { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { @@ -8218,27 +8682,27 @@ }; } { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz"; - sha1 = "62a1cd3068f46d564bb33c56eb250e4d586676eb"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; + sha1 = "c9711ac4dc48a685dabafc86f8b6dd9f8df84149"; }; } { - name = "popper.js___popper.js_1.15.0.tgz"; + name = "popper.js___popper.js_1.16.1.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz"; - sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2"; + name = "popper.js___popper.js_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; + sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; }; } { - name = "portfinder___portfinder_1.0.23.tgz"; + name = "portfinder___portfinder_1.0.26.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.23.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.23.tgz"; - sha1 = "894db4bcc5daf02b6614517ce89cd21a38226b82"; + name = "portfinder___portfinder_1.0.26.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz"; + sha1 = "475658d56ca30bed72ac7f1378ed350bd1b64e70"; }; } { @@ -8250,27 +8714,27 @@ }; } { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; path = fetchurl { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz"; - sha1 = "b2a721a0d279c2f9103a36331c88981526428cc7"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"; + sha1 = "d93e46b504589e94ac7277b0463226c68041a880"; }; } { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; path = fetchurl { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz"; - sha1 = "dc48d6a8ddbff188a80a000b7393436cb18aed88"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz"; + sha1 = "1248d2d935fb72053c8e1f61a84a57292d9f65e9"; }; } { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; + name = "postcss_calc___postcss_calc_7.0.2.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.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; }; } { @@ -8458,11 +8922,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz"; - sha1 = "99d319669a13d6c06ef8e70d852f68cb1b399b61"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; + sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; }; } { @@ -8562,27 +9026,27 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz"; - sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63"; + 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_scope___postcss_modules_scope_2.1.0.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz"; - sha1 = "ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz"; - sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10"; }; } { @@ -8666,11 +9130,11 @@ }; } { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; path = fetchurl { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-7.0.1.tgz"; - sha1 = "eb51568d962b8aa61a8318383c8bb7e54332282e"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz"; + sha1 = "90e80a7763d7fdf2da6f2f0f82be832ce4f66776"; }; } { @@ -8770,11 +9234,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; }; } { @@ -8818,11 +9282,11 @@ }; } { - 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"; }; } { @@ -8834,19 +9298,19 @@ }; } { - name = "postcss___postcss_7.0.14.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.14.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz"; - sha1 = "4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { - name = "postcss___postcss_7.0.17.tgz"; + name = "postcss___postcss_7.0.29.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.17.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; - sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + name = "postcss___postcss_7.0.29.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz"; + sha1 = "d3a903872bd52280b83bce38cdc83ce55c06129e"; }; } { @@ -8858,11 +9322,19 @@ }; } { - name = "prettier___prettier_1.18.2.tgz"; + name = "prepend_http___prepend_http_1.0.4.tgz"; path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prettier___prettier_2.0.5.tgz"; + path = fetchurl { + name = "prettier___prettier_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; + sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } { @@ -8889,6 +9361,14 @@ sha1 = "12fac31b37019a4eea3c11aa9a959eb7628aa7c9"; }; } + { + name = "pretty_format___pretty_format_25.5.0.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 = "private___private_0.1.8.tgz"; path = fetchurl { @@ -8929,14 +9409,6 @@ sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; } - { - name = "promise___promise_8.0.3.tgz"; - path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; - }; - } { name = "promise___promise_7.3.1.tgz"; path = fetchurl { @@ -8946,11 +9418,19 @@ }; } { - name = "prompts___prompts_2.2.1.tgz"; + name = "promise___promise_8.1.0.tgz"; path = fetchurl { - name = "prompts___prompts_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz"; - sha1 = "f901dd2a2dfee080359c0e20059b24188d75ad35"; + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; + }; + } + { + name = "prompts___prompts_2.3.2.tgz"; + path = fetchurl { + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -8970,19 +9450,19 @@ }; } { - 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"; }; } { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; }; } { @@ -8994,11 +9474,11 @@ }; } { - name = "psl___psl_1.3.1.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.3.1.tgz"; - sha1 = "d5aa3873a35ec450bc7db9012ad5a7246f6fc8bd"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { @@ -9058,11 +9538,11 @@ }; } { - name = "puppeteer___puppeteer_1.19.0.tgz"; + name = "puppeteer___puppeteer_3.0.4.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.19.0.tgz"; - sha1 = "e3b7b448c2c97933517078d7a2c53687361bebea"; + name = "puppeteer___puppeteer_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz"; + sha1 = "f445aae0a6732c65bbb90e963dcd6fd8fde0d780"; }; } { @@ -9089,6 +9569,14 @@ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } + { + name = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { @@ -9162,51 +9650,43 @@ }; } { - name = "rc___rc_1.2.8.tgz"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.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_app_polyfill___react_app_polyfill_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz"; + sha1 = "890f8d7f2842ce6073f030b117de9130a5f385f0"; }; } { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; path = fetchurl { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.2.tgz"; - sha1 = "2a51175885c88245a2a356dc46df29f38ec9f060"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz"; + sha1 = "b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"; }; } { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-5.1.0.tgz"; - sha1 = "62de4460178adea40eb52eabf7491669bf3794b8"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.3.tgz"; - sha1 = "7607455587abb84599451460eb37cef0b684131a"; + 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.9.0.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "5e65527a5e26f22ae3701131bcccaee9fb0d3962"; - }; - } - { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; - path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.1.tgz"; - sha1 = "b8d3cf9bb991c02883225c48044cb3ee20413e0f"; + 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"; }; } { @@ -9218,43 +9698,19 @@ }; } { - name = "react_is___react_is_16.9.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz"; - sha1 = "21ca9561399aad0ff1a7701c01683e8ca981edcb"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { - name = "react_is___react_is_16.13.0.tgz"; + name = "react_markdown___react_markdown_4.3.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.13.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; - sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; - }; - } - { - name = "react_is___react_is_16.10.0.tgz"; - path = fetchurl { - name = "react_is___react_is_16.10.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.10.0.tgz"; - sha1 = "3d6a031e57fff73c3cfa0347feb3e8f40c5141e5"; - }; - } - { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - path = fetchurl { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; - }; - } - { - name = "react_markdown___react_markdown_4.2.2.tgz"; - path = fetchurl { - name = "react_markdown___react_markdown_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.2.2.tgz"; - sha1 = "b378774fcffb354653db8749153fc8740f9ed2f1"; + name = "react_markdown___react_markdown_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.3.1.tgz"; + sha1 = "39f0633b94a027445b86c9811142d05381300f2f"; }; } { @@ -9266,35 +9722,35 @@ }; } { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; - sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz"; + sha1 = "06701b834352f44d37fbb6311f870f84c76b9c18"; }; } { - name = "react_router___react_router_4.3.1.tgz"; + name = "react_router___react_router_5.1.2.tgz"; path = fetchurl { - name = "react_router___react_router_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; - sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + name = "react_router___react_router_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz"; + sha1 = "6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"; }; } { - name = "react_scripts___react_scripts_3.1.1.tgz"; + name = "react_scripts___react_scripts_3.4.1.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.1.1.tgz"; - sha1 = "1796bc92447f3a2d3072c3b71ca99f88d099c48d"; + name = "react_scripts___react_scripts_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz"; + sha1 = "f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"; }; } { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz"; - sha1 = "7ed657a374af47af88f66f33a3ef99c9610c8ae9"; + 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"; }; } { @@ -9306,19 +9762,19 @@ }; } { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; }; } { - name = "react___react_16.9.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz"; - sha1 = "40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9354,19 +9810,19 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + 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.4.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -9377,6 +9833,14 @@ sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; }; } + { + name = "readdirp___readdirp_3.4.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 = "realpath_native___realpath_native_1.1.0.tgz"; path = fetchurl { @@ -9402,11 +9866,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.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_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9417,14 +9881,6 @@ sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; }; } - { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; - }; - } { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; path = fetchurl { @@ -9442,11 +9898,11 @@ }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9466,19 +9922,11 @@ }; } { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz"; - sha1 = "5b19ab9377edc68bc3679256840bb29afc158d7f"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; }; } { @@ -9490,27 +9938,35 @@ }; } { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; + name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz"; - sha1 = "aaffe61c2af58269b3e516b61a73790376326411"; + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; }; } { - name = "regjsgen___regjsgen_0.5.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; - sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { - name = "regjsparser___regjsparser_0.6.0.tgz"; + name = "regjsgen___regjsgen_0.5.1.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; - sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + }; + } + { + name = "regjsparser___regjsparser_0.6.4.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -9578,27 +10034,27 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha1 = "339f6aababcafdb31c799ff158700336301d3346"; + 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_native___request_promise_native_1.0.7.tgz"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz"; - sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59"; + 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___request_2.88.0.tgz"; + name = "request___request_2.88.2.tgz"; path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } { @@ -9658,19 +10114,19 @@ }; } { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; path = fetchurl { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; - sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz"; - sha1 = "54d8181d33cd1b66a59544d05cadf8e4aa7d37cc"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; + sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; }; } { @@ -9690,19 +10146,27 @@ }; } { - name = "resolve___resolve_1.12.0.tgz"; + name = "resolve___resolve_1.15.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; - sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + name = "resolve___resolve_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; + sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -9713,6 +10177,14 @@ sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; }; } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { @@ -9761,6 +10233,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 = "ripemd160___ripemd160_2.0.2.tgz"; path = fetchurl { @@ -9778,11 +10258,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.1.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_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -9794,19 +10274,11 @@ }; } { - name = "rx___rx_4.1.0.tgz"; + name = "rxjs___rxjs_6.5.5.tgz"; path = fetchurl { - name = "rx___rx_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - } - { - name = "rxjs___rxjs_6.5.3.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; - sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + name = "rxjs___rxjs_6.5.5.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; + sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; }; } { @@ -9850,11 +10322,19 @@ }; } { - name = "sass_loader___sass_loader_7.2.0.tgz"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz"; - sha1 = "e34115239309d15b2527cb62b5dfefb62a96ff7f"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz"; + sha1 = "b5cb2547e96d8629a60947544665243b1dc3657a"; + }; + } + { + name = "sass_loader___sass_loader_8.0.2.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz"; + sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } { @@ -9874,11 +10354,11 @@ }; } { - name = "scheduler___scheduler_0.15.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.15.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz"; - sha1 = "6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -9890,11 +10370,11 @@ }; } { - name = "schema_utils___schema_utils_2.2.0.tgz"; + name = "schema_utils___schema_utils_2.6.6.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; - sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + name = "schema_utils___schema_utils_2.6.6.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz"; + sha1 = "299fe6bd4a3365dc23d99fd446caff8f1d6c330c"; }; } { @@ -9906,11 +10386,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.4.tgz"; + name = "selfsigned___selfsigned_1.10.7.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.4.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz"; - sha1 = "cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"; + name = "selfsigned___selfsigned_1.10.7.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz"; + sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"; }; } { @@ -9921,14 +10401,6 @@ sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } - { - name = "semver___semver_5.5.0.tgz"; - path = fetchurl { - name = "semver___semver_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz"; - sha1 = "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"; - }; - } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -9937,6 +10409,14 @@ sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -9946,11 +10426,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.0.tgz"; - sha1 = "5b77019d7c3b85fe91b33ae424c53dcbfb6618bd"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; }; } { @@ -10041,6 +10521,14 @@ 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 { @@ -10050,11 +10538,19 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + 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 = "shell_quote___shell_quote_1.7.2.tgz"; + path = fetchurl { + name = "shell_quote___shell_quote_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz"; + sha1 = "67a7d02c76c9da24f99d20808fcaded0e0e04be2"; }; } { @@ -10066,11 +10562,19 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "side_channel___side_channel_1.0.2.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 = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + }; + } + { + 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"; }; } { @@ -10082,11 +10586,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.3.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz"; - sha1 = "98168d62b79e3a5e758e27ae63c4a053d748f4eb"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10105,6 +10609,14 @@ sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44"; }; } + { + 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 { @@ -10138,11 +10650,11 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; }; } { @@ -10153,6 +10665,14 @@ sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; }; } + { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } { name = "source_list_map___source_list_map_2.0.1.tgz"; path = fetchurl { @@ -10162,19 +10682,19 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + 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.13.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; + 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"; }; } { @@ -10210,11 +10730,11 @@ }; } { - 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"; }; } { @@ -10242,11 +10762,11 @@ }; } { - name = "spdy___spdy_4.0.1.tgz"; + name = "spdy___spdy_4.0.2.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; - sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; }; } { @@ -10281,6 +10801,14 @@ sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; }; } + { + name = "ssri___ssri_7.1.0.tgz"; + path = fetchurl { + name = "ssri___ssri_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz"; + sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d"; + }; + } { name = "stable___stable_0.1.8.tgz"; path = fetchurl { @@ -10298,11 +10826,11 @@ }; } { - name = "state_toggle___state_toggle_1.0.2.tgz"; + name = "state_toggle___state_toggle_1.0.3.tgz"; path = fetchurl { - name = "state_toggle___state_toggle_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz"; - sha1 = "75e93a61944116b4959d665c8db2d243631d6ddc"; + name = "state_toggle___state_toggle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz"; + sha1 = "e123b16a88e143139b09c6852221bc9815917dfe"; }; } { @@ -10354,11 +10882,19 @@ }; } { - name = "stream_shift___stream_shift_1.0.0.tgz"; + name = "stream_shift___stream_shift_1.0.1.tgz"; path = fetchurl { - name = "stream_shift___stream_shift_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; } { @@ -10369,6 +10905,14 @@ sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; }; } + { + name = "string_length___string_length_3.1.0.tgz"; + path = fetchurl { + name = "string_length___string_length_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz"; + sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; + }; + } { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { @@ -10394,19 +10938,51 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; + name = "string_width___string_width_4.2.0.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.0.0.tgz"; - sha1 = "68b6aa8e162c6a80e76e3a8a0c2e747186e271ff"; + 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.0.0.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.0.0.tgz"; - sha1 = "ab4a56d802a01fbe7293e11e84f24dc8164661dd"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.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.trimleft___string.prototype.trimleft_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.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"; }; } { @@ -10434,11 +11010,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.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"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } { @@ -10457,6 +11033,14 @@ sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; } + { + 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_bom___strip_bom_3.0.0.tgz"; path = fetchurl { @@ -10482,27 +11066,19 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha1 = "7638d31422129ecf4457440009fba03f9f9ac180"; }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + name = "style_loader___style_loader_0.23.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 = "style_loader___style_loader_1.0.0.tgz"; - path = fetchurl { - name = "style_loader___style_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; - sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; + name = "style_loader___style_loader_0.23.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; + sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } { @@ -10538,19 +11114,27 @@ }; } { - name = "svg_parser___svg_parser_2.0.2.tgz"; + name = "supports_color___supports_color_7.1.0.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz"; - sha1 = "d134cc396fa2681dc64f518330784e98bd801ec8"; + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; }; } { - name = "svgo___svgo_1.3.0.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svgo___svgo_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz"; - sha1 = "bae51ba95ded9a33a36b7c46ce9c359ae9154313"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; }; } { @@ -10578,27 +11162,43 @@ }; } { - name = "tar___tar_4.4.10.tgz"; + name = "tar_fs___tar_fs_2.0.1.tgz"; path = fetchurl { - name = "tar___tar_4.4.10.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz"; - sha1 = "946b2810b9a5e0b26140cf78bea6b0b0d689eba1"; + name = "tar_fs___tar_fs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz"; + sha1 = "e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + name = "tar_stream___tar_stream_2.1.2.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; + name = "tar_stream___tar_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; + sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; }; } { - name = "terser___terser_4.2.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; path = fetchurl { - name = "terser___terser_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz"; - sha1 = "1052cfe17576c66e7bc70fcc7119f22b155bdac1"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz"; + sha1 = "5ad971acce5c517440ba873ea4f09687de2f4a81"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.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___terser_4.6.13.tgz"; + path = fetchurl { + name = "terser___terser_4.6.13.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz"; + sha1 = "e879a7364a5e0db52ba4891ecde007422c56a916"; }; } { @@ -10642,11 +11242,11 @@ }; } { - name = "thunky___thunky_1.0.3.tgz"; + name = "thunky___thunky_1.1.0.tgz"; path = fetchurl { - name = "thunky___thunky_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz"; - sha1 = "f5df732453407b09191dae73e2a8cc73f381a826"; + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; }; } { @@ -10666,11 +11266,11 @@ }; } { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; path = fetchurl { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz"; - sha1 = "b3f9b38835e36a41c843a3b0907a5a7b3755de73"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; }; } { @@ -10729,6 +11329,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 { @@ -10753,14 +11361,6 @@ sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; }; } - { - name = "tough_cookie___tough_cookie_2.4.3.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 = "tr46___tr46_1.0.1.tgz"; path = fetchurl { @@ -10770,27 +11370,19 @@ }; } { - name = "tree_kill___tree_kill_1.2.1.tgz"; + name = "tree_kill___tree_kill_1.2.2.tgz"; path = fetchurl { - name = "tree_kill___tree_kill_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz"; - sha1 = "5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"; + name = "tree_kill___tree_kill_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz"; + sha1 = "4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"; }; } { - name = "trim_right___trim_right_1.0.1.tgz"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - } - { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - path = fetchurl { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; - sha1 = "d2f1e153161152e9f02fabc670fb40bec2ea2e3a"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz"; + sha1 = "7f0739881ff76657b7776e10874128004b625a94"; }; } { @@ -10802,35 +11394,35 @@ }; } { - name = "trough___trough_1.0.4.tgz"; + name = "trough___trough_1.0.5.tgz"; path = fetchurl { - name = "trough___trough_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz"; - sha1 = "3b52b1f13924f460c3fbfd0df69b587dbcbc762e"; + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; }; } { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz"; - sha1 = "be8e4bfce5d00f0f58e0666a82260c34a57af552"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; + sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; }; } { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz"; - sha1 = "ae27126960ebaefb874c6d7fa4729729ab200d90"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_1.11.2.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz"; + sha1 = "9c79d83272c9a7aaf166f73915c9667ecdde3cc9"; }; } { @@ -10842,11 +11434,11 @@ }; } { - name = "tslint___tslint_5.20.0.tgz"; + name = "tslint___tslint_6.1.2.tgz"; path = fetchurl { - name = "tslint___tslint_5.20.0.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz"; - sha1 = "fac93bfa79568a5a24e7be9cdde5e02b02d00ec1"; + name = "tslint___tslint_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz"; + sha1 = "2433c248512cc5a7b2ab88ad44a6b1b34c6911cf"; }; } { @@ -10898,11 +11490,19 @@ }; } { - name = "type_fest___type_fest_0.3.1.tgz"; + name = "type_fest___type_fest_0.11.0.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz"; - sha1 = "63d00d204e059474fe5e1b7c011112bbd1dc29e1"; + 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.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"; }; } { @@ -10914,11 +11514,19 @@ }; } { - name = "type___type_1.0.3.tgz"; + name = "type___type_1.2.0.tgz"; path = fetchurl { - name = "type___type_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.0.3.tgz"; - sha1 = "16f5d39f27a2d28d86e48f8981859e9d3296c179"; + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.0.0.tgz"; + path = fetchurl { + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; }; } { @@ -10930,51 +11538,43 @@ }; } { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; path = fetchurl { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; - url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz"; - sha1 = "8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; + url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz"; + sha1 = "98d5ba35ec234bbc7172374c8297277099cc712b"; }; } { - name = "typescript___typescript_3.6.2.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "typescript___typescript_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz"; - sha1 = "105b0f1934119dde543ac8eb71af3a91009efe54"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; - sha1 = "7527178b82f6a62a0f243d1f94fd30e3e3c21098"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz"; + sha1 = "853cf9ce93f642f67174273cc34565ae6f308777"; }; } { - name = "uglify_js___uglify_js_3.4.10.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.4.10.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz"; - sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha1 = "84eb9e783b186d8fb397515fbb656f312f1a7dbf"; }; } { - name = "uglify_js___uglify_js_3.6.0.tgz"; + name = "unherit___unherit_1.1.3.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz"; - sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5"; - }; - } - { - name = "unherit___unherit_1.1.2.tgz"; - path = fetchurl { - name = "unherit___unherit_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz"; - sha1 = "14f1f397253ee4ec95cec167762e77df83678449"; + name = "unherit___unherit_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz"; + sha1 = "6c9b503f2b41b262330c80e91c8614abdaa69c22"; }; } { @@ -10994,19 +11594,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.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 = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11066,11 +11666,11 @@ }; } { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; path = fetchurl { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; - sha1 = "d91aa8b89b30cb38bad2924da11072faa64fd972"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz"; + sha1 = "ec037348b6102c897703eee6d0294ca4755a2020"; }; } { @@ -11145,14 +11745,6 @@ sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; }; } - { - name = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; - }; - } { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { @@ -11170,11 +11762,11 @@ }; } { - name = "url_loader___url_loader_2.1.0.tgz"; + name = "url_loader___url_loader_2.3.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; - sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; + name = "url_loader___url_loader_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz"; + sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"; }; } { @@ -11217,6 +11809,14 @@ sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; }; } + { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } { name = "util___util_0.10.3.tgz"; path = fetchurl { @@ -11250,11 +11850,11 @@ }; } { - name = "uuid___uuid_3.3.3.tgz"; + name = "uuid___uuid_3.4.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; - sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; }; } { @@ -11274,11 +11874,11 @@ }; } { - name = "value_equal___value_equal_0.4.0.tgz"; + name = "value_equal___value_equal_1.0.1.tgz"; path = fetchurl { - name = "value_equal___value_equal_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; - sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; }; } { @@ -11290,11 +11890,11 @@ }; } { - name = "vendors___vendors_1.0.3.tgz"; + name = "vendors___vendors_1.0.4.tgz"; path = fetchurl { - name = "vendors___vendors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz"; - sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0"; + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; }; } { @@ -11306,11 +11906,11 @@ }; } { - name = "vfile_location___vfile_location_2.0.5.tgz"; + name = "vfile_location___vfile_location_2.0.6.tgz"; path = fetchurl { - name = "vfile_location___vfile_location_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz"; - sha1 = "c83eb02f8040228a8d2b3f10e485be3e3433e0a2"; + name = "vfile_location___vfile_location_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz"; + sha1 = "8a274f39411b8719ea5728802e10d9e0dff1519e"; }; } { @@ -11330,19 +11930,19 @@ }; } { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; - sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; }; } { - name = "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"; }; } { @@ -11354,11 +11954,11 @@ }; } { - name = "wait_on___wait_on_3.3.0.tgz"; + name = "wait_on___wait_on_5.0.0.tgz"; path = fetchurl { - name = "wait_on___wait_on_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/wait-on/-/wait-on-3.3.0.tgz"; - sha1 = "9940981d047a72a9544a97b8b5fca45b2170a082"; + name = "wait_on___wait_on_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz"; + sha1 = "72e554b338490bbc7131362755ca1af04f46d029"; }; } { @@ -11370,19 +11970,11 @@ }; } { - name = "warning___warning_4.0.3.tgz"; + name = "watchpack___watchpack_1.6.1.tgz"; path = fetchurl { - name = "warning___warning_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; - sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; - }; - } - { - name = "watchpack___watchpack_1.6.0.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___watchpack_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz"; + sha1 = "280da0a8718592174010c078c7585a74cd8cd0e2"; }; } { @@ -11402,19 +11994,19 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; - sha1 = "1167aea02afa034489869b8368fe9fed1aea7d09"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; }; } { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz"; - sha1 = "1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"; + name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; + sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0"; }; } { @@ -11426,11 +12018,11 @@ }; } { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; path = fetchurl { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz"; - sha1 = "e4ca2999b09557716b8ba4475fb79fab5986f0cd"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; + sha1 = "19ca69b435b0baec7e29fbe90fb4015de2de4f16"; }; } { @@ -11442,11 +12034,11 @@ }; } { - name = "webpack___webpack_4.39.1.tgz"; + name = "webpack___webpack_4.42.0.tgz"; path = fetchurl { - name = "webpack___webpack_4.39.1.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.39.1.tgz"; - sha1 = "60ed9fb2b72cd60f26ea526c404d2a4cc97a1bd8"; + name = "webpack___webpack_4.42.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz"; + sha1 = "b901635dd6179391d90740a63c93f76f39883eb8"; }; } { @@ -11498,11 +12090,11 @@ }; } { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; }; } { @@ -11522,27 +12114,19 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; + name = "which___which_2.0.2.tgz"; path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; }; } { - name = "wordwrap___wordwrap_0.0.3.tgz"; + name = "word_wrap___word_wrap_1.2.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"; - path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -11745,6 +12329,14 @@ sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; }; } + { + name = "ws___ws_7.2.5.tgz"; + path = fetchurl { + name = "ws___ws_7.2.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz"; + sha1 = "abb1370d4626a5a9cd79d8de404aa18b3465d10d"; + }; + } { name = "x_is_string___x_is_string_0.1.0.tgz"; path = fetchurl { @@ -11762,19 +12354,19 @@ }; } { - name = "xmlchars___xmlchars_2.1.1.tgz"; + name = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { - name = "xmlchars___xmlchars_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz"; - sha1 = "ef1a81c05bff629c2280007f12daca21bd6f6c93"; + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; }; } { - name = "xregexp___xregexp_4.0.0.tgz"; + name = "xregexp___xregexp_4.3.0.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; }; } { @@ -11794,51 +12386,67 @@ }; } { - name = "yallist___yallist_3.0.3.tgz"; + name = "yallist___yallist_3.1.1.tgz"; path = fetchurl { - name = "yallist___yallist_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz"; - sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9"; + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; }; } { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; + name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + 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_13.1.1.tgz"; + name = "yaml___yaml_1.9.2.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 = "yaml___yaml_1.9.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz"; + sha1 = "f0cfa865f003ab707663e4f04b3956957ea564ed"; }; } { - name = "yargs___yargs_12.0.2.tgz"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; }; } { - name = "yargs___yargs_13.3.0.tgz"; + name = "yargs_parser___yargs_parser_13.1.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_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yargs___yargs_12.0.5.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_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; + sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "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"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/servers/hasura/ci-info.nix b/third_party/nixpkgs/pkgs/servers/hasura/ci-info.nix new file mode 100644 index 0000000000..53c85a2e5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/ci-info.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable +, hpack, stdenv, template-haskell, text, th-lift-instances +, unordered-containers +}: +mkDerivation { + pname = "ci-info"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/ci-info-hs.git"; + sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; + rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing base hashable template-haskell text + th-lift-instances unordered-containers + ]; + libraryToolDepends = [ hpack ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/ci-info-hs#readme"; + license = stdenv.lib.licenses.mit; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix new file mode 100644 index 0000000000..a4d8d147fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix @@ -0,0 +1,33 @@ +{ buildGoModule, hasura-graphql-engine }: + +buildGoModule rec { + name = "hasura-${version}"; + version = hasura-graphql-engine.version; + + src = hasura-graphql-engine.src; + modRoot = "./cli"; + + goPackagePath = "github.com/hasura/graphql-engine/cli"; + subPackages = [ "cmd/hasura" ]; + + vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; + + buildFlagsArray = [''-ldflags= + -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} + -s + -w + '']; + + postInstall = '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + + export HOME=$PWD + $out/bin/hasura completion bash > $out/share/bash-completion/completions/hasura + $out/bin/hasura completion zsh > $out/share/zsh/site-functions/_hasura + ''; + + meta = { + inherit (hasura-graphql-engine.meta) license homepage maintainers; + description = "Hasura GraphQL Engine CLI"; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/hasura/default.nix b/third_party/nixpkgs/pkgs/servers/hasura/default.nix new file mode 100644 index 0000000000..0852746603 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/default.nix @@ -0,0 +1,63 @@ +{ haskell }: + +with haskell.lib; + +let + # version in cabal file is invalid + version = "1.2.1"; + + pkgs = haskell.packages.ghc865.override { + overrides = self: super: { + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + hasura-graphql-engine = justStaticExecutables + ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { + name = "graphql-engine-${version}"; + + inherit version; + + # hasura needs VERSION env exported during build + preBuild = "export VERSION=${version}"; + })); + + hasura-cli = self.callPackage ./cli.nix { + hasura-graphql-engine = self.hasura-graphql-engine // { + inherit version; + }; + }; + + # internal dependencies, non published on hackage (find revisions in cabal.project file) + # cabal2nix --revision https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ./ci-info.nix { }; + # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ./graphql-parser.nix { }; + # cabal2nix --revision https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ./pg-client.nix { }; + + # version constrained dependencies, without these hasura will not build, + # find versions in graphql-engine.cabal + # cabal2nix cabal://dependent-map-0.2.4.0 + dependent-map = self.callPackage ./dependent-map.nix { }; + # cabal2nix cabal://dependent-sum-0.4 + dependent-sum = self.callPackage ./dependent-sum.nix { }; + # cabal2nix cabal://these-0.7.6 + these = doJailbreak (self.callPackage ./these.nix { }); + # cabal2nix cabal://immortal-0.2.2.1 + immortal = self.callPackage ./immortal.nix { }; + # cabal2nix cabal://network-uri-2.6.1.0 + network-uri = self.callPackage ./network-uri.nix { }; + # cabal2nix cabal://ghc-heap-view-0.6.0 + ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); + + # unmark broewn packages and do required modifications + stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); + superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); + Spock-core = dontCheck (unmarkBroken super.Spock-core); + stm-containers = dontCheck (unmarkBroken super.stm-containers); + ekg-json = unmarkBroken super.ekg-json; + list-t = dontCheck (unmarkBroken super.list-t); + primitive-extras = unmarkBroken super.primitive-extras; + }; + }; +in { + inherit (pkgs) hasura-graphql-engine hasura-cli; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix b/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix new file mode 100644 index 0000000000..68ebb616b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix @@ -0,0 +1,13 @@ +{ mkDerivation, base, containers, dependent-sum, stdenv }: +mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix b/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix new file mode 100644 index 0000000000..90717b8736 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, stdenv }: +mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix b/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix new file mode 100644 index 0000000000..54c873baee --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, binary, bytestring, Cabal, containers +, deepseq, filepath, ghc-heap, stdenv, template-haskell +, transformers +}: +mkDerivation { + pname = "ghc-heap-view"; + version = "0.6.0"; + sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + base binary bytestring containers ghc-heap template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix b/third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix new file mode 100644 index 0000000000..05ba895be0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix @@ -0,0 +1,71 @@ +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base64-bytestring, byteorder, bytestring, case-insensitive +, ci-info, containers, criterion, cryptonite, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary +, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core +, hspec-expectations-lifted, http-client, http-client-tls +, http-types, immortal, insert-ordered-containers, jose, lens +, lifted-async, lifted-base, list-t, mime-types, monad-control +, monad-time, monad-validate, mtl, mustache, mwc-probability +, mwc-random, natural-transformation, network, network-uri +, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, process, profunctors, psqueues, QuickCheck +, regex-tdfa, safe, scientific, semver, shakespeare, split +, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, text-builder, text-conversions, th-lift-instances, these, time +, transformers, transformers-base, unix, unordered-containers +, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets +, wreq, x509, yaml, zlib +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; + rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base64-bytestring + byteorder bytestring case-insensitive ci-info containers cryptonite + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json fast-logger file-embed filepath generic-arbitrary + ghc-heap-view graphql-parser hashable http-client http-client-tls + http-types immortal insert-ordered-containers jose lens + lifted-async lifted-base list-t mime-types monad-control monad-time + monad-validate mtl mustache network network-uri + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa + scientific semver shakespeare split Spock-core stm stm-containers + template-haskell text text-builder text-conversions + th-lift-instances these time transformers transformers-base unix + unordered-containers uri-encode uuid vector wai wai-websockets warp + websockets wreq x509 yaml zlib + ]; + executableHaskellDepends = [ + base bytestring pg-client text text-conversions + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-expectations-lifted + http-client http-client-tls lifted-base monad-control mtl + natural-transformation optparse-applicative pg-client process + QuickCheck safe split text time transformers-base + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion deepseq mwc-probability mwc-random + split text vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ offline ]; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix b/third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix new file mode 100644 index 0000000000..8066bb83dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix @@ -0,0 +1,35 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter +, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, text-builder, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; + rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + libraryToolDepends = [ hpack ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers criterion filepath + hedgehog prettyprinter protolude regex-tdfa scientific + template-haskell text text-builder th-lift-instances + unordered-containers vector + ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/graphql-parser-hs#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix b/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix new file mode 100644 index 0000000000..c53f0f1870 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix @@ -0,0 +1,17 @@ +{ mkDerivation, base, lifted-base, monad-control, stdenv, stm +, tasty, tasty-hunit, transformers, transformers-base +}: +mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix b/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix new file mode 100644 index 0000000000..45016d470a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, deepseq, HUnit, parsec, stdenv +, test-framework, test-framework-hunit, test-framework-quickcheck2 +}: +mkDerivation { + pname = "network-uri"; + version = "2.6.1.0"; + sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; + revision = "1"; + editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; + libraryHaskellDepends = [ base deepseq parsec ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell/network-uri"; + description = "URI manipulation"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/pg-client.nix b/third_party/nixpkgs/pkgs/servers/hasura/pg-client.nix new file mode 100644 index 0000000000..725e5e7f64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/pg-client.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, criterion, fetchgit, file-embed, hashable, hashtables, hasql +, hasql-pool, hasql-transaction, monad-control, mtl +, postgresql-binary, postgresql-libpq, resource-pool, retry +, scientific, stdenv, template-haskell, text, text-builder, th-lift +, th-lift-instances, time, transformers-base, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; + rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring hashable hashtables + monad-control mtl postgresql-binary postgresql-libpq resource-pool + retry scientific template-haskell text text-builder th-lift + th-lift-instances time transformers-base uuid vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/these.nix b/third_party/nixpkgs/pkgs/servers/hasura/these.nix new file mode 100644 index 0000000000..396f9e2a28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/hasura/these.nix @@ -0,0 +1,25 @@ +{ mkDerivation, aeson, base, base-compat, bifunctors, binary +, containers, data-default-class, deepseq, hashable, keys, lens +, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv +, tasty, tasty-quickcheck, transformers, transformers-compat +, unordered-containers, vector, vector-instances +}: +mkDerivation { + pname = "these"; + version = "0.7.6"; + sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; +} 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 28c0322720..96ca0c8389 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.109.0"; + version = "0.109.6"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 03805344ae..9471a5faad 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.109.0"; + hassVersion = "0.109.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn"; + sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns"; }; propagatedBuildInputs = [ @@ -98,6 +98,9 @@ in with py.pkgs; buildPythonApplication rec { sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; + # upstream only tests on Linux, so do we. + doCheck = stdenv.isLinux; + checkInputs = [ asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; @@ -118,6 +121,10 @@ in with py.pkgs; buildPythonApplication rec { makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; + passthru = { + inherit (py.pkgs) hass-frontend; + }; + meta = with lib; { homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index bcb770b8dc..9fb543d06c 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 = "20200427.1"; + version = "20200505.0"; src = fetchPypi { inherit pname version; - sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7"; + sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll"; }; # no Python tests implemented diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index 99dd63c7ce..f8c4b80020 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -4,6 +4,7 @@ , doxygen , fetchurl , fuse +, libevent , lzma , openssl , pkgconfig @@ -14,15 +15,15 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.2"; + version = "3.5"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0"; + sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; - buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with stdenv.lib; { description = "A caching proxy specialized for linux distribution files"; diff --git a/third_party/nixpkgs/pkgs/servers/http/gatling/default.nix b/third_party/nixpkgs/pkgs/servers/http/gatling/default.nix index bf69d902aa..9157c09cbe 100644 --- a/third_party/nixpkgs/pkgs/servers/http/gatling/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/gatling/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix index 67a914b6a9..80bc1458ad 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -68,6 +68,14 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withStream [ @@ -99,26 +107,28 @@ stdenv.mkDerivation { preConfigure = preConfigure + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; - patches = map fixPatch - (singleton (substituteAll { + patches = map fixPatch ([ + (substituteAll { src = ./nix-etag-1.15.4.patch; preInstall = '' export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" ''; - }) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; - sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; - sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; - sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; - }) - ] ++ mapModules "patches"); + }) + ./nix-skip-check-logs-path.patch + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; + sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; + sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; + sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; + }) + ] ++ mapModules "patches"); hardeningEnable = optional (!stdenv.isDarwin) "pie"; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 1678296694..1111990435 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -140,6 +140,7 @@ in export LUAJIT_LIB="${pkgs.luajit}/lib" export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" ''; + allowMemoryWriteExecute = true; }; lua-upstream = { @@ -150,6 +151,7 @@ in sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk"; }; inputs = [ pkgs.luajit ]; + allowMemoryWriteExecute = true; }; modsecurity = { @@ -246,6 +248,7 @@ in in { src = ngx_pagespeed; inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps + allowMemoryWriteExecute = true; }; pam = { diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch b/third_party/nixpkgs/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch new file mode 100644 index 0000000000..a823660cc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch @@ -0,0 +1,27 @@ +diff --git a/auto/install b/auto/install +index d884487..dccc411 100644 +--- a/auto/install ++++ b/auto/install +@@ -148,12 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES + || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' + cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' + +- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' +- +- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' +- + test -d '\$(DESTDIR)$NGX_PREFIX/html' \\ + || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX' + END +@@ -161,9 +155,6 @@ END + + if test -n "$NGX_ERROR_LOG_PATH"; then + cat << END >> $NGX_MAKEFILE +- +- test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' + END + + fi diff --git a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix index 0e87b97198..9c01cfb19e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -16,10 +16,11 @@ callPackage ../nginx/generic.nix args rec { sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; }; - fixPatch = patch: - runCommand "openresty-${patch.name}" { src = patch; } '' + fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ - --replace "src/" "bundle/nginx-${nginxVersion}/src/" + --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ + --replace "b/" "b/bundle/nginx-${nginxVersion}/" ''; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index 1593ad0c06..f3cae597ef 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false , withStream ? false @@ -24,8 +24,14 @@ stdenv.mkDerivation rec { [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; - patches = [ + patches = singleton (substituteAll { + src = ../nginx/nix-etag-1.15.4.patch; + preInstall = '' + export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" + ''; + }) ++ [ ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch ]; configureFlags = [ @@ -53,6 +59,14 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withMail [ diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix index 57ab2a96b4..17c4367866 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.23"; + version = "1.2.24"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee"; + sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 0779a31f10..c161566d32 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, which +{ stdenv, fetchFromGitHub, nixosTests, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP72 ? false, php72 -, withPHP73 ? true, php73 +, withPHP73 ? false, php73 +, withPHP74 ? true, php74 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -28,22 +29,19 @@ let php72-unit = php72.override phpConfig; php73-unit = php73.override phpConfig; + php74-unit = php74.override phpConfig; + in stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; + sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh"; }; - patches = [ - # https://github.com/nginx/unit/issues/357 - ./drop_cap.patch - ]; - nativeBuildInputs = [ which ]; buildInputs = [ ] @@ -51,6 +49,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit + ++ optional withPHP73 php74-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -73,6 +72,7 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; + passthru.tests.unit-php = nixosTests.unit-php; + meta = { description = "Dynamic web and application server, designed to run applications in multiple languages."; homepage = "https://unit.nginx.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/drop_cap.patch b/third_party/nixpkgs/pkgs/servers/http/unit/drop_cap.patch deleted file mode 100644 index 87caf77904..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/unit/drop_cap.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -r ed17ce89119f src/nxt_capability.c ---- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000 -@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t * - return NXT_OK; - } - -+ -+nxt_int_t -+nxt_capability_drop_all(nxt_task_t *task) -+{ -+ struct __user_cap_header_struct hdr; -+ struct __user_cap_data_struct data[2]; -+ -+ hdr.version = nxt_capability_linux_get_version(); -+ hdr.pid = nxt_pid; -+ -+ nxt_memset(data, 0, sizeof(data)); -+ -+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) { -+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno); -+ return NXT_ERROR; -+ } -+ -+ return NXT_OK; -+} -+ - #else - - static nxt_int_t -diff -r ed17ce89119f src/nxt_capability.h ---- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000 -@@ -14,4 +14,6 @@ typedef struct { - NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task, - nxt_capabilities_t *cap); - -+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task); -+ - #endif /* _NXT_CAPABILITY_INCLUDED_ */ -diff -r ed17ce89119f src/nxt_process.c ---- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000 -@@ -264,7 +264,7 @@ cleanup: - static void - nxt_process_start(nxt_task_t *task, nxt_process_t *process) - { -- nxt_int_t ret, cap_setid; -+ nxt_int_t ret, cap_setid, drop_caps; - nxt_port_t *port, *main_port; - nxt_thread_t *thread; - nxt_runtime_t *rt; -@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - - cap_setid = rt->capabilities.setid; - -+ drop_caps = cap_setid; -+ - #if (NXT_HAVE_CLONE_NEWUSER) -- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) { -+ if (NXT_CLONE_USER(init->isolation.clone.flags)) { - cap_setid = 1; -+ drop_caps = 0; - } - #endif - -@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - if (nxt_slow_path(ret != NXT_OK)) { - goto fail; - } -+ -+#if (NXT_HAVE_LINUX_CAPABILITY) -+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) { -+ goto fail; -+ } -+#endif - } - - rt->type = init->type; \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/http/yaws/default.nix b/third_party/nixpkgs/pkgs/servers/http/yaws/default.nix index 301aec5c34..1d57a951dc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/yaws/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/yaws/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://yaws.hyber.org"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu the-kenny ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix b/third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix index e0ff9f8de3..46a26a659a 100644 --- a/third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/identd/oidentd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oidentd"; - version = "2.4.0"; + version = "2.5.0"; nativeBuildInputs = [ bison flex ]; src = fetchurl { url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li"; + sha256 = "1d5mqlknfywbx2bgj7ap7x6qzvz257hhqcqhy6zk45dqpsirdn7a"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 21caebec0f..9203f405a7 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg"; + vendorSha256 = "069if1ifsmdn5hrwybiifhnq6xzmdccq85mzi9v98iii18pzfwqx"; nativeBuildInputs = [ pkg-config ]; @@ -27,4 +27,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index 932081ad22..35476db921 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.4"; + version = "10.5.5"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y"; + sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix index 803ba0ee6c..6c29de8cdd 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "opensmtpd-extras"; - version = "6.4.0"; + version = "6.7.1"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; + sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 9af470f831..7de8cd858a 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -13,13 +13,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/helper-validator-identifier-7.9.5" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; + }; + }; + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; "@slack/logger-1.1.1" = { @@ -31,31 +40,31 @@ let sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.3" = { + "@slack/rtm-api-5.0.4" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; - sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; + sha512 = "5xXOjLPb4H8a+URLrCjnFXA62Kf4IrvSfp9KtuOxv6vTtFVvxNW4WqhWgAcxwXolD43xRuB/pikxLu76vLDTfw=="; }; }; - "@slack/types-1.5.0" = { + "@slack/types-1.6.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; - sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; + sha512 = "SrrAD/ZxDN4szQ35V/mY2TvKSyGsUWP8def1C8NMg9AvdYG0VyaL5f+Dd6jw8STosMFXd3zqjekMowT9LB9/IQ=="; }; }; - "@slack/web-api-5.8.0" = { + "@slack/web-api-5.8.1" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; - sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; + sha512 = "MONzkjWOXV39Dejo8B9WSl/F0dxcVh9wyeW6R0jf6T6BhwN4f24iErYtTh19g+MRhb0oiyeKfnFsJTSKQulfDA=="; }; }; "@types/body-parser-1.19.0" = { @@ -103,22 +112,22 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.6" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.6.tgz"; + sha512 = "U2oynuRIB17GIbEdvjFrrEACOy7GQkzsX7bPEBz1H41vZYEU4j0fLL97sawmHDwHUXpUQDBMHIyM9vejqP9o1A=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,13 +148,13 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/mocha-5.2.7" = { + "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "5.2.7"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz"; - sha512 = "NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -157,13 +166,13 @@ let sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; - "@types/node-12.12.30" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.30"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz"; - sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk"; }; }; "@types/node-emoji-1.8.1" = { @@ -184,6 +193,15 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; + "@types/qs-6.9.2" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; + sha512 = "a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A=="; + }; + }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -238,22 +256,22 @@ let sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; - "@types/tough-cookie-2.3.6" = { + "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.6"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-3.4.8" = { + "@types/uuid-7.0.3" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "3.4.8"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz"; - sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; + sha512 = "PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw=="; }; }; "@types/ws-5.1.2" = { @@ -311,13 +329,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -365,6 +383,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "anymatch-3.1.1" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -410,13 +437,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.0" = { + "assert-options-0.6.2" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.0.tgz"; - sha512 = "xmBFb5sY0AO8SNihIfavR6uMhOyzq6D7RoFKJxxAditMQc876szBBQ9RQVwLi6Bm3zUoG0nexZK11Gy5TBX69A=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -545,6 +572,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "binary-search-tree-0.2.5" = { name = "binary-search-tree"; packageName = "binary-search-tree"; @@ -599,6 +635,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "browser-request-0.3.3" = { name = "browser-request"; packageName = "browser-request"; @@ -707,6 +752,15 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -950,6 +1004,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1040,13 +1103,13 @@ let sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1094,15 +1157,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1202,6 +1256,15 @@ let sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; @@ -1301,6 +1364,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -1364,6 +1436,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; "growl-1.10.5" = { name = "growl"; packageName = "growl"; @@ -1499,6 +1580,15 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-2.0.4" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1526,6 +1616,15 @@ let sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1535,6 +1634,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -1553,6 +1661,15 @@ let sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -1751,13 +1868,13 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "log-symbols-2.2.0" = { + "log-symbols-3.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1778,13 +1895,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1796,15 +1913,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "manakin-0.5.2" = { - name = "manakin"; - packageName = "manakin"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz"; - sha512 = "pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ=="; - }; - }; "matrix-appservice-0.4.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; @@ -1814,13 +1922,13 @@ let sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; - "matrix-appservice-bridge-1.11.1" = { + "matrix-appservice-bridge-1.12.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.11.1.tgz"; - sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1868,22 +1976,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -1895,15 +2003,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1913,49 +2012,40 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; - "mocha-6.2.2" = { + "mocha-7.1.2" = { name = "mocha"; packageName = "mocha"; - version = "6.2.2"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz"; - sha512 = "FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; }; - "moment-2.24.0" = { + "moment-2.25.3" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2012,13 +2102,13 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; - "node-environment-flags-1.0.5" = { + "node-environment-flags-1.0.6" = { name = "node-environment-flags"; packageName = "node-environment-flags"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz"; - sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2030,6 +2120,15 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -2138,13 +2237,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2165,13 +2264,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2273,13 +2372,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-7.12.1" = { + "pg-8.0.3" = { name = "pg"; packageName = "pg"; - version = "7.12.1"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz"; - sha512 = "l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA=="; + url = "https://registry.npmjs.org/pg/-/pg-8.0.3.tgz"; + sha512 = "fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg=="; }; }; "pg-connection-string-0.1.3" = { @@ -2300,31 +2399,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.5.1" = { + "pg-minify-1.5.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.1.tgz"; - sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.2.tgz"; + sha512 = "uZn/gXkGmO5JBdopxNLSpFMS1lXr+KJqynI8Di1Qyr8ZVXt67ruh+XNfzLMVdLzYv+MQRdNYQdVwWPSs0qM7xQ=="; }; }; - "pg-pool-2.0.10" = { + "pg-pool-3.1.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "2.0.10"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz"; - sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.1.1.tgz"; + sha512 = "kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A=="; }; }; - "pg-promise-9.3.6" = { + "pg-promise-10.5.3" = { name = "pg-promise"; packageName = "pg-promise"; - version = "9.3.6"; + version = "10.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-9.3.6.tgz"; - sha512 = "b64UalKAkUImn01z7LeG2NtTTsp0TYfqMzo1vXjO2bDAshL+kXJ2HvCyHstJ4Nj8hLeqtCe0Tar5TbB4QGUHfw=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.3.tgz"; + sha512 = "cfHgFpcqOc0IIRDABre//k1eda7s94Wys67P9r3q590nmvO0AzZucqWTVmgRUzNTIrDChUwY4hVOMBTIsU/ZiA=="; + }; + }; + "pg-protocol-1.2.2" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; + sha512 = "r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg=="; }; }; "pg-types-2.2.0" = { @@ -2345,6 +2453,15 @@ let sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; }; }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -2363,13 +2480,13 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.4" = { + "postgres-date-1.0.5" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz"; - sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2408,13 +2525,13 @@ let sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2444,13 +2561,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-4.0.1" = { + "quick-lru-5.1.0" = { name = "quick-lru"; packageName = "quick-lru"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; + sha512 = "WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ=="; }; }; "randomstring-1.1.5" = { @@ -2498,6 +2615,15 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2552,13 +2678,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.15.1" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2678,22 +2804,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "spex-3.0.0" = { + "spex-3.0.1" = { name = "spex"; packageName = "spex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.0.tgz"; - sha512 = "JoMfgbrJcEPn53JCLkSNH1o7fZ9rzkb24UKEt5LTcsp0YsaN+yxtb5MEmibbMRltj9CdXDNGitPrYi11JY2hog=="; + url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2768,22 +2894,40 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.1"; + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimleft-2.1.2" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; + }; + }; + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2876,6 +3020,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -2903,31 +3056,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; - "tslib-1.11.1" = { + "tslib-1.11.2" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; + sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; }; }; - "tslint-5.20.1" = { + "tslint-6.1.2" = { name = "tslint"; packageName = "tslint"; - version = "5.20.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; - sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3047,6 +3200,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -3173,15 +3335,6 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -3191,15 +3344,6 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -3230,26 +3374,27 @@ let }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd"; - sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157"; + rev = "2967f02484a3cdb386336b328438ec65fa8be382"; + sha256 = "bc7f87744046561d8dcd5b75d2469950f11ceac9d6d69a49eac4e05354f34834"; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.3" // { + (sources."@slack/rtm-api-5.0.4" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.5.0" - (sources."@slack/web-api-5.8.0" // { + sources."@slack/types-1.6.0" + (sources."@slack/web-api-5.8.1" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3259,40 +3404,42 @@ in sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-4.17.6" + sources."@types/express-serve-static-core-4.17.6" sources."@types/is-stream-1.1.0" sources."@types/mime-2.0.1" - sources."@types/mocha-5.2.7" + sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" - sources."@types/node-12.12.30" + sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" sources."@types/p-queue-2.3.2" + sources."@types/qs-6.9.2" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.4" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.3" - sources."@types/tough-cookie-2.3.6" - sources."@types/uuid-3.4.8" + sources."@types/tough-cookie-4.0.0" + sources."@types/uuid-7.0.3" sources."@types/ws-5.1.2" sources."@types/yargs-13.0.8" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."another-json-0.2.0" sources."ansi-colors-3.2.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" sources."asn1-0.2.4" - sources."assert-options-0.6.0" + sources."assert-options-0.6.2" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" sources."async-0.2.10" @@ -3306,6 +3453,7 @@ in sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-2.0.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."bluebird-2.11.0" @@ -3315,6 +3463,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" @@ -3331,6 +3480,7 @@ in ]; }) sources."check-error-1.0.2" + sources."chokidar-3.3.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -3365,12 +3515,11 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."env-variable-0.0.6" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" (sources."express-4.17.1" // { @@ -3385,6 +3534,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" sources."file-stream-rotator-0.4.1" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -3399,6 +3549,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" @@ -3406,6 +3557,7 @@ in sources."get-func-name-2.0.0" sources."getpass-0.1.7" sources."glob-7.1.3" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -3421,12 +3573,16 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" + sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" + sources."is-number-7.0.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -3449,17 +3605,16 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.1.2" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."make-error-1.3.6" - sources."manakin-0.5.2" sources."matrix-appservice-0.4.1" - sources."matrix-appservice-bridge-1.11.1" + sources."matrix-appservice-bridge-1.12.2" (sources."matrix-js-sdk-2.4.6" // { dependencies = [ sources."bluebird-3.5.5" @@ -3469,39 +3624,37 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" - (sources."mocha-6.2.2" // { + sources."mkdirp-0.5.5" + (sources."mocha-7.1.2" // { dependencies = [ sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."supports-color-6.0.0" - sources."yargs-13.3.0" - sources."yargs-parser-13.1.1" ]; }) - sources."moment-2.24.0" - (sources."morgan-1.9.1" // { + sources."moment-2.25.3" + (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" + sources."depd-2.0.0" ]; }) sources."ms-2.0.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" - (sources."node-environment-flags-1.0.5" // { + (sources."node-environment-flags-1.0.6" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."nopt-3.0.6" + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" sources."object-inspect-1.7.0" @@ -3514,9 +3667,9 @@ in sources."one-time-0.0.4" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" - (sources."p-queue-6.3.0" // { + (sources."p-queue-6.4.0" // { dependencies = [ sources."eventemitter3-4.0.0" ]; @@ -3532,41 +3685,45 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-7.12.1" + sources."pg-8.0.3" sources."pg-connection-string-0.1.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.5.1" - sources."pg-pool-2.0.10" - sources."pg-promise-9.3.6" + sources."pg-minify-1.5.2" + sources."pg-pool-3.1.1" + sources."pg-promise-10.5.3" + sources."pg-protocol-1.2.2" sources."pg-types-2.2.0" sources."pgpass-1.0.2" + sources."picomatch-2.2.2" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.4" + sources."postgres-date-1.0.5" sources."postgres-interval-1.2.0" sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" + sources."readdirp-3.2.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" sources."qs-6.5.2" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."retry-0.12.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3586,8 +3743,8 @@ in sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" sources."source-map-0.6.1" - sources."source-map-support-0.5.16" - sources."spex-3.0.0" + sources."source-map-support-0.5.19" + sources."spex-3.0.1" sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -3595,8 +3752,10 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.0" @@ -3608,16 +3767,17 @@ in sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."through-2.3.8" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.7.0" // { + (sources."ts-node-8.10.1" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.11.1" - (sources."tslint-5.20.1" // { + sources."tslib-1.11.2" + (sources."tslint-6.1.2" // { dependencies = [ sources."diff-4.0.2" sources."semver-5.7.1" @@ -3635,7 +3795,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-7.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -3689,4 +3849,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 8fb44891dd..a197abdda2 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" } ] diff --git a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix index 1f39278de6..7f1868af4c 100644 --- a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.17.1"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij"; + vendorSha256 = null; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index c0d01855be..dea3d7b1b2 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,5 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: +let +webp = fetchFromGitHub { + owner = "chai2010"; + repo = "webp"; + rev = "19c584e49a98c31e2138c82fd0108435cd80d182"; + sha256 = "1bqf1ifsfw5dwvnc9vl3dhp775qv5hgl34219lvnja0bj6pq5zks"; +}; +in buildGoModule { pname = "mautrix-whatsapp-unstable"; version = "2020-04-21-1"; @@ -11,7 +19,14 @@ buildGoModule { sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; }; - modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7"; + vendorSha256 = "0j397zyjs7v5q2jjd3l0wz4lh1fh45whgxjp7cwgc332ch9j2010"; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/chai2010/webp + cp -r --reflink=auto ${webp} vendor/github.com/chai2010/webp + ''; + }); meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; @@ -19,4 +34,4 @@ buildGoModule { license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/meguca/default.nix b/third_party/nixpkgs/pkgs/servers/meguca/default.nix index 3088ee190e..4c5521e97b 100644 --- a/third_party/nixpkgs/pkgs/servers/meguca/default.nix +++ b/third_party/nixpkgs/pkgs/servers/meguca/default.nix @@ -35,9 +35,9 @@ buildGoPackage { ''; installPhase = '' - mkdir -p $bin/bin $bin/share/meguca - cp meguca $bin/bin - cp -r www $bin/share/meguca + mkdir -p $out/bin $out/share/meguca + cp meguca $out/bin + cp -r www $out/share/meguca ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index 89d3220aa6..fb284970af 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.5"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w"; + sha256 = "1pr7igk7ic9wc2yax26wy3ar223vilf2qyzrknz36g61dxqa6k8z"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index b2e040748a..5d50f8c9b0 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.1"; + version = "0.35.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226"; + sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/meteor/default.nix b/third_party/nixpkgs/pkgs/servers/meteor/default.nix index b6abec241a..ddf7a972c2 100644 --- a/third_party/nixpkgs/pkgs/servers/meteor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.9.3"; + version = "1.10.2"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb"; + sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw"; }; #dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index bb841da74d..43c4125097 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/miniflux.app $bin/bin/miniflux + mv $out/bin/miniflux.app $out/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 953cc9fb77..9f9796b3a5 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -1,24 +1,26 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; - version = "2020-03-25T07-03-04Z"; + version = "2020-05-01T22-19-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5"; + sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k"; + vendorSha256 = "15yx5nkyf424v42glg3cx0gkqckdfv1xn25570s9cwf8zid0zlxd"; subPackages = [ "." ]; buildFlagsArray = [''-ldflags= - -X github.com/minio/minio/cmd.Version=${version} + -s -w -X github.com/minio/minio/cmd.Version=${version} '']; + passthru.tests.minio = nixosTests.minio; + meta = with stdenv.lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; @@ -26,4 +28,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix b/third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix index 2c529ef7b3..852b5350bb 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.5.0"; + version = "10.6.2"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0nja33x3qh8zylqc7dn6x8j1wyxf7pzf9vdg9rzaq1hl6mi573jq"; + sha256 = "0q3qnqymj3gaa6n79pvbyidn1ga99lpngp5wvhlw1aarg1m7vccl"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index b738e36cf8..1d6bb7198e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { -X main.version=${version} ''; - modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d"; + vendorSha256 = null; meta = with lib; { description = "DigitalOcean droplet system metrics agent"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix index 24756cc8bd..d6f3c28d82 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; postInstall = '' - wrapProgram $bin/bin/grafana-reporter \ + wrapProgram $out/bin/grafana-reporter \ --prefix PATH : ${makeBinPath [ tetex ]} ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 66e534a0f9..7fdd9c70d9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' tar -xvf $srcStatic - mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,tools} $bin/share/grafana/ + mkdir -p $out/share/grafana + mv grafana-*/{public,conf,tools} $out/share/grafana/ '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs + ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index a4117d923e..e8804702f0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $bin/bin/promtail \ + wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index 64966e183f..d701a7ca00 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; }; - modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; + vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; subPackages = [ "cmd/mtail" ]; preBuild = '' @@ -27,4 +27,4 @@ buildGoModule rec { homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 02a81bfe33..ecbed520bb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.59"; + version = "2.0.61"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97"; + sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index dc0ad6ae2c..b8246c27b4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz"; + sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; }; patches = [ ./nagios.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 3c8005a16d..160907d58f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = let fetchAlpinePatch = name: sha256: fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; + url = "https://git.alpinelinux.org/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; inherit name sha256; }; in [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9074c19e10..9402fa44ee 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/amtool --completion-script-bash > amtool.bash + $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index e43e625e44..c0b161954b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.17.2"; + version = "2.18.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "1q89c98rdypfcw8sqzipwlmxg8vrm4b9vdryygnacxv4am7bxsia"; + sha256 = "0ixgjp3j9dkdb0vv5n83h8w48xgi70m83im660z97y7mflr5s2cf"; }; webui = mkYarnPackage { @@ -54,9 +54,9 @@ in buildGoPackage rec { ''; preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus" + cp -a $src/documentation/* $out/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc1..43c63e24df 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; + vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ma27 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee91..0c357a768b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; }; - modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 8202a8c8c2..b5a9334325 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -43,7 +43,7 @@ buildGoPackage rec { ]; postInstall = optionalString withSystemdSupport '' - wrapProgram $bin/bin/postfix_exporter \ + wrapProgram $out/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0cb41f099c..1425fccdca 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,7 +29,7 @@ buildGoPackage rec { doInstallCheck = true; installCheckPhase = '' - export PATH=$PATH:$bin/bin + export PATH=$PATH:$out/bin pushgateway --help diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 03656470b9..640730e3ca 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "1vb720axjziiqcba4bdi528r6mc97ci0pfsk0ny50isrkh0s3jzz"; + vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; nativeBuildInputs = [ makeWrapper ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json index 5ae33ae62d..64ac8689bb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json @@ -34,7 +34,7 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^4.2.1", - "react-scripts": "^3.4.0", + "react-scripts": "3.4.0", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", @@ -71,7 +71,6 @@ "@types/sinon": "^7.5.0", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", - "babel-eslint": "10.x", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.15.1", "eslint": "6.x", 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 0d8652982c..5eed837c91 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,11 +10,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz"; - sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz"; + sha1 = "04815556fc90b0c174abd2c0c1bb966faa036a6c"; }; } { @@ -26,11 +26,27 @@ }; } { - name = "_babel_generator___generator_7.8.4.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz"; - sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; + }; + } + { + name = "_babel_generator___generator_7.9.0.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz"; + sha1 = "0f67adea4ec39dad6e63345f70eec33014d78c89"; + }; + } + { + name = "_babel_generator___generator_7.9.4.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz"; + sha1 = "12441e90c3b3c4159cdecf312075bf1a8ce2dbce"; }; } { @@ -50,43 +66,51 @@ }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; - sha1 = "dee98d7d79cc1f003d80b76fe01c7f8945665ff6"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; + sha1 = "066d80262ade488f9c1b1823ce5db88a4cedaa43"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz"; - sha1 = "de82619898aa605d409c42be6ffb8d7204579692"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz"; - sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; + sha1 = "28a279c2e6c622a6233da548127f980751324cab"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz"; - sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; + sha1 = "dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz"; - sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; + sha1 = "243a5b46e2f8f0f674dc1387631eb6b28b851de0"; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { @@ -146,11 +170,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz"; - sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { @@ -186,11 +210,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz"; - sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; + sha1 = "5ada744fd5ad73203bf1d67459a27dcba67effc8"; }; } { @@ -209,6 +233,14 @@ sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha1 = "ad53562a7fc29b3b9a91bbf7d10397fd146346ed"; + }; + } { name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { @@ -218,27 +250,35 @@ }; } { - name = "_babel_helpers___helpers_7.8.4.tgz"; + name = "_babel_helpers___helpers_7.9.2.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz"; - sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73"; + name = "_babel_helpers___helpers_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz"; + sha1 = "b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"; }; } { - name = "_babel_highlight___highlight_7.8.3.tgz"; + name = "_babel_highlight___highlight_7.9.0.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_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_parser___parser_7.8.4.tgz"; + name = "_babel_parser___parser_7.9.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz"; - sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8"; + name = "_babel_parser___parser_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz"; + sha1 = "68a35e6b0319bbc014465be43828300113f2f2e8"; + }; + } + { + name = "_babel_parser___parser_7.9.2.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz"; + sha1 = "4e767f424b479c514077544484d1f9bdba7f1158"; }; } { @@ -298,11 +338,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha1 = "a28993699fc13df165995362693962ba6b061d6f"; }; } { @@ -314,19 +354,19 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz"; - sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { @@ -466,11 +506,11 @@ }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz"; - sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha1 = "8603fc3cc449e31fdbdbc257f67717536a11af8d"; }; } { @@ -482,11 +522,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz"; - sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; + sha1 = "fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"; }; } { @@ -514,19 +554,19 @@ }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; - sha1 = "da705a655466b2a9b36046b57bf0cbcd53551bd4"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz"; - sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { @@ -554,35 +594,35 @@ }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha1 = "65606d44616b50225e76f5578f33c568a0b876a5"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha1 = "19755ee721912cf5bb04c07d50280af3484efef4"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha1 = "df251706ec331bd058a34bdd72613915f82928a5"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha1 = "e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha1 = "e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { @@ -610,11 +650,11 @@ }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz"; - sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; + sha1 = "0381de466c85d5404565243660c4496459525daf"; }; } { @@ -626,11 +666,11 @@ }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz"; - sha1 = "784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { @@ -642,35 +682,43 @@ }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz"; - sha1 = "c4f178b2aa588ecfa8d077ea80d4194ee77ed702"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz"; - sha1 = "951e75a8af47f9f120db731be095d2b2c34920e0"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; - sha1 = "4220349c0390fdefa505365f68c103562ab2fc4a"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz"; - sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz"; + sha1 = "d03af29396a6dc51bfa24eefd8005a9fd381152a"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { @@ -682,11 +730,11 @@ }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; - sha1 = "c0153bc0a5375ebc1f1591cb7eea223adea9f169"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { @@ -730,11 +778,11 @@ }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz"; - sha1 = "be6f01a7ef423be68e65ace1f04fc407e6d88917"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz"; + sha1 = "8b52649c81cb7dee117f760952ab46675a258836"; }; } { @@ -746,59 +794,83 @@ }; } { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz"; - sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; }; } { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz"; - sha1 = "23dc63f1b5b0751283e04252e78cf1d6589273d2"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; - sha1 = "90af8690121beecd9a75d0cc26c6be39d1595d13"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; }; } { - name = "_babel_runtime___runtime_7.8.4.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; - sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; }; } { - name = "_babel_template___template_7.8.3.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz"; - sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; + sha1 = "26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"; }; } { - name = "_babel_traverse___traverse_7.8.4.tgz"; + name = "_babel_runtime___runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz"; - sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c"; + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; }; } { - name = "_babel_types___types_7.8.3.tgz"; + name = "_babel_runtime___runtime_7.9.2.tgz"; path = fetchurl { - name = "_babel_types___types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; - sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; + name = "_babel_runtime___runtime_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; + sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.0.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz"; + sha1 = "d3882c2830e513f4fe4cec9fe76ea1cc78747892"; + }; + } + { + name = "_babel_types___types_7.9.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz"; + sha1 = "00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"; }; } { @@ -850,11 +922,11 @@ }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz"; - sha1 = "cb6d4dd3aeec45b6ff2d48c812317a6627618511"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz"; + sha1 = "c865b9286c707407effcec99958043711367cd02"; }; } { @@ -994,11 +1066,11 @@ }; } { - name = "_reach_router___router_1.3.1.tgz"; + name = "_reach_router___router_1.3.3.tgz"; path = fetchurl { - name = "_reach_router___router_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.1.tgz"; - sha1 = "0a49f75fa9621323d6e21c803447bcfcde1713b2"; + name = "_reach_router___router_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.3.tgz"; + sha1 = "58162860dce6c9449d49be86b0561b5ef46d80db"; }; } { @@ -1154,11 +1226,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.5.tgz"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.5.tgz"; - sha1 = "e4d84704b4df868b3ad538365a13da2fa6dbc023"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz"; + sha1 = "16ff42a5ae203c9af1c6e190ed1f30f83207b610"; }; } { @@ -1186,11 +1258,19 @@ }; } { - name = "_types_cheerio___cheerio_0.22.16.tgz"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.16.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.16.tgz"; - sha1 = "c748a97b8a6f781b04bbda4a552e11b35bcc77e4"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.17.tgz"; + sha1 = "e54f71c3135f71ebc16c8dc62edad533872c9e72"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; }; } { @@ -1306,11 +1386,11 @@ }; } { - name = "_types_jquery___jquery_3.3.32.tgz"; + name = "_types_jquery___jquery_3.3.33.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.3.32.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.32.tgz"; - sha1 = "93e27fdc45dd38ee07f2f0acf34b59c1ccee036f"; + name = "_types_jquery___jquery_3.3.33.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.33.tgz"; + sha1 = "61d9cbd4004ffcdf6cf7e34720a87a5625a7d8e9"; }; } { @@ -1338,19 +1418,19 @@ }; } { - name = "_types_node___node_13.7.4.tgz"; + name = "_types_node___node_13.9.2.tgz"; path = fetchurl { - name = "_types_node___node_13.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz"; - sha1 = "76c3cb3a12909510f52e5dc04a6298cdf9504ffd"; + name = "_types_node___node_13.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz"; + sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349"; }; } { - name = "_types_node___node_12.12.28.tgz"; + name = "_types_node___node_12.12.30.tgz"; path = fetchurl { - name = "_types_node___node_12.12.28.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz"; - sha1 = "3a2b5f8d21f96ace690a8832ae9779114612575f"; + name = "_types_node___node_12.12.30.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz"; + sha1 = "3501e6f09b954de9c404671cefdbcc5d9d7c45f6"; }; } { @@ -1378,11 +1458,11 @@ }; } { - name = "_types_reach__router___reach__router_1.3.0.tgz"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.0.tgz"; - sha1 = "4c05a947ccecca05c72bb335a0f7bb43fec12446"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.1.tgz"; + sha1 = "ca8b431acb12bb897d2b806f6fdd815f056d6d02"; }; } { @@ -1418,35 +1498,35 @@ }; } { - name = "_types_react___react_16.9.21.tgz"; + name = "_types_react___react_16.9.25.tgz"; path = fetchurl { - name = "_types_react___react_16.9.21.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz"; - sha1 = "99e274e2ecfab6bb93920e918341daa3198b348d"; + name = "_types_react___react_16.9.25.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.25.tgz"; + sha1 = "6ae2159b40138c792058a23c3c04fd3db49e929e"; }; } { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.1.tgz"; - sha1 = "6dff4d1fdf59233877925e3caec406272050b632"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.2.tgz"; + sha1 = "e7066d0e67e2924dab0a52c6aedcf922f2be53b6"; }; } { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.20.2.tgz"; - sha1 = "59777f79f015321334e3a9f28882f58c0a0d42b8"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.22.0.tgz"; + sha1 = "9bf3a13aeab6e38d130d8ba34bb443956b75bc3d"; }; } { - name = "_types_sinon___sinon_7.5.1.tgz"; + name = "_types_sinon___sinon_7.5.2.tgz"; path = fetchurl { - name = "_types_sinon___sinon_7.5.1.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz"; - sha1 = "d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"; + name = "_types_sinon___sinon_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.2.tgz"; + sha1 = "5e2f1d120f07b9cda07e5dedd4f3bf8888fccdb9"; }; } { @@ -1490,35 +1570,35 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz"; - sha1 = "a522d0e1e4898f7c9c6a8e1ed3579b60867693fa"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz"; + sha1 = "a86cf618c965a462cddf3601f594544b134d6d68"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz"; - sha1 = "3b6fa5a6b8885f126d5a4280e0d44f0f41e73e32"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz"; + sha1 = "a5cb2ed89fedf8b59638dc83484eb0c8c35e1143"; }; } { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.20.0.tgz"; - sha1 = "608e5bb06ba98a415b64ace994c79ab20f9772a9"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz"; + sha1 = "2cf0eae6e6dd44d162486ad949c126b887f11eb8"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz"; - sha1 = "90a0f5598826b35b966ca83483b1a621b1a4d0c9"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz"; + sha1 = "38bbc8bb479790d2f324797ffbcdb346d897c62a"; }; } { @@ -1689,14 +1769,6 @@ sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; - }; - } { name = "accepts___accepts_1.3.7.tgz"; path = fetchurl { @@ -1714,11 +1786,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.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.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1730,27 +1802,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.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_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.4.0.tgz"; + name = "acorn___acorn_6.4.1.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_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.1.0.tgz"; + name = "acorn___acorn_7.1.1.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_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1802,11 +1874,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv___ajv_6.12.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + name = "ajv___ajv_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; + sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; }; } { @@ -1834,11 +1906,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; - sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; }; } { @@ -1897,6 +1969,14 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { @@ -1921,14 +2001,6 @@ sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; }; } - { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; - }; - } { name = "argparse___argparse_1.0.10.tgz"; path = fetchurl { @@ -2050,11 +2122,11 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; }; } { @@ -2330,11 +2402,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz"; - sha1 = "d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2506,11 +2578,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"; }; } { @@ -2570,19 +2642,11 @@ }; } { - name = "browserslist___browserslist_4.8.6.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.8.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz"; - sha1 = "96406f3f5f0755d272e27a66f4163ca821590a7e"; - }; - } - { - name = "browserslist___browserslist_4.8.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 = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { @@ -2746,11 +2810,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; - sha1 = "f2241242ac70e0fa9cda55c2776d32a0867971c2"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; + sha1 = "2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"; }; } { @@ -2793,6 +2857,14 @@ 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 = "chardet___chardet_0.7.0.tgz"; path = fetchurl { @@ -2977,6 +3049,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 { @@ -3129,14 +3209,6 @@ sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; }; } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - } { name = "constants_browserify___constants_browserify_1.0.0.tgz"; path = fetchurl { @@ -3218,11 +3290,11 @@ }; } { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; path = fetchurl { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz"; - sha1 = "b1a1137100e5665d5a96015cb579e30e90e07c44"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"; + sha1 = "115aa1a9998ffab6196f93076ad6da3b913662ae"; }; } { @@ -3233,6 +3305,14 @@ sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17"; }; } + { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz"; + sha1 = "4bf1ba866e25814f149d4e9aaa08c36173506e3a"; + }; + } { name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { @@ -3657,14 +3737,6 @@ sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } - { - 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 { @@ -3729,14 +3801,6 @@ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } { name = "depd___depd_1.1.2.tgz"; path = fetchurl { @@ -3761,14 +3825,6 @@ sha1 = "978857442c44749e4206613e37946205826abd80"; }; } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - } { name = "detect_newline___detect_newline_2.1.0.tgz"; path = fetchurl { @@ -3953,6 +4009,14 @@ sha1 = "8805097e933d65e85546f726d60f5eb88b44f803"; }; } + { + name = "domhandler___domhandler_3.0.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz"; + sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9"; + }; + } { name = "domutils___domutils_1.5.1.tgz"; path = fetchurl { @@ -3969,6 +4033,14 @@ sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; }; } + { + name = "domutils___domutils_2.0.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; + sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + }; + } { name = "dot_case___dot_case_3.0.3.tgz"; path = fetchurl { @@ -4042,11 +4114,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.356.tgz"; - sha1 = "fb985ee0f3023e6e11b97547ff3f738bdd8643d2"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz"; + sha1 = "1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d"; }; } { @@ -4266,11 +4338,11 @@ }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz"; - sha1 = "135110ba56a9e378f7acfe5f36e2ae76a2317899"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { @@ -4362,11 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz"; - sha1 = "8be671b7f6be095098e79d27ac32f9580f599bc8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4410,11 +4482,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4762,11 +4834,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz"; - sha1 = "e7fe44c1abc1299f516146e563108fd1006c1874"; + 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"; }; } { @@ -4945,14 +5017,6 @@ sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; }; } - { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; - }; - } { name = "fs_minipass___fs_minipass_2.1.0.tgz"; path = fetchurl { @@ -4986,11 +5050,11 @@ }; } { - name = "fsevents___fsevents_1.2.11.tgz"; + name = "fsevents___fsevents_1.2.12.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.12.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz"; + sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"; }; } { @@ -5033,14 +5097,6 @@ sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; } - { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - } { name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { @@ -5162,11 +5218,11 @@ }; } { - name = "globals___globals_12.3.0.tgz"; + name = "globals___globals_12.4.0.tgz"; path = fetchurl { - name = "globals___globals_12.3.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; }; } { @@ -5281,14 +5337,6 @@ sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } - { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - } { name = "has_value___has_value_0.3.1.tgz"; path = fetchurl { @@ -5370,11 +5418,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"; }; } { @@ -5434,11 +5482,11 @@ }; } { - name = "html_escaper___html_escaper_2.0.0.tgz"; + name = "html_escaper___html_escaper_2.0.1.tgz"; path = fetchurl { - name = "html_escaper___html_escaper_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz"; - sha1 = "71e87f931de3fe09e56661ab9a29aadec707b491"; + name = "html_escaper___html_escaper_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz"; + sha1 = "beed86b5d2b921e92533aa11bce6d8e3b583dee7"; }; } { @@ -5465,6 +5513,14 @@ sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f"; }; } + { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; + }; + } { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { @@ -5585,14 +5641,6 @@ sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; } - { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; - }; - } { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { @@ -5737,6 +5785,14 @@ sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } + { + name = "inquirer___inquirer_7.1.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + }; + } { name = "internal_ip___internal_ip_4.3.0.tgz"; path = fetchurl { @@ -5785,14 +5841,6 @@ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; } - { - name = "ipaddr.js___ipaddr.js_1.9.0.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"; path = fetchurl { @@ -6730,11 +6778,11 @@ }; } { - name = "json5___json5_2.1.1.tgz"; + name = "json5___json5_2.1.2.tgz"; path = fetchurl { - name = "json5___json5_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz"; - sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6"; + name = "json5___json5_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz"; + sha1 = "43ef1f0af9835dd624751a6b7fa48874fb2d608e"; }; } { @@ -6770,11 +6818,11 @@ }; } { - name = "just_extend___just_extend_4.0.2.tgz"; + name = "just_extend___just_extend_4.1.0.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz"; - sha1 = "f3f47f7dfca0f989c55410a7ebc8854b07108afc"; + name = "just_extend___just_extend_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz"; + sha1 = "7278a4027d889601640ee0ce0e5a00b992467da4"; }; } { @@ -6922,11 +6970,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -7394,19 +7442,11 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - } - { - name = "minimist___minimist_1.2.0.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_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { @@ -7433,14 +7473,6 @@ sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } - { - name = "minipass___minipass_2.9.0.tgz"; - path = fetchurl { - name = "minipass___minipass_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; - sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; - }; - } { name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { @@ -7449,14 +7481,6 @@ sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; }; } - { - name = "minizlib___minizlib_1.3.3.tgz"; - path = fetchurl { - name = "minizlib___minizlib_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; - sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; - }; - } { name = "mississippi___mississippi_3.0.0.tgz"; path = fetchurl { @@ -7482,11 +7506,11 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz"; + sha1 = "5a514b7179259287952881e94410ec5465659f8c"; }; } { @@ -7498,11 +7522,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; + name = "moment_timezone___moment_timezone_0.5.28.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.28.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz"; + sha1 = "f093d789d091ed7b055d82aa81a82467f72e4338"; }; } { @@ -7609,14 +7633,6 @@ sha1 = "4af4006e16645ff800e9f993c3af039857d9dbdc"; }; } - { - name = "needle___needle_2.3.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 = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { @@ -7714,27 +7730,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + name = "node_releases___node_releases_1.1.52.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_releases___node_releases_1.1.49.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 = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.52.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz"; + sha1 = "bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"; }; } { @@ -7785,30 +7785,6 @@ sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; }; } - { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; - }; - } - { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - path = fetchurl { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; - }; - } { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { @@ -7817,14 +7793,6 @@ sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; } - { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { @@ -8018,11 +7986,11 @@ }; } { - name = "open___open_7.0.2.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz"; - sha1 = "fb3681f11f157f2361d2392307548ca1792960e8"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -8065,14 +8033,6 @@ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; } - { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { @@ -8089,14 +8049,6 @@ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; } - { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { @@ -8466,11 +8418,11 @@ }; } { - name = "picomatch___picomatch_2.2.1.tgz"; + name = "picomatch___picomatch_2.2.2.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; - sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; }; } { @@ -8922,11 +8874,11 @@ }; } { - 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"; }; } { @@ -9306,19 +9258,19 @@ }; } { - name = "promise___promise_8.0.3.tgz"; + name = "promise___promise_8.1.0.tgz"; path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; }; } { - name = "prompts___prompts_2.3.1.tgz"; + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz"; - sha1 = "b63a9ce2809f106fa9ae1277c275b167af46ea05"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -9338,11 +9290,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"; }; } { @@ -9537,14 +9489,6 @@ sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; }; } - { - 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_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { @@ -9562,35 +9506,35 @@ }; } { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz"; - sha1 = "b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dom___react_dom_16.12.0.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz"; - sha1 = "0da4b714b8d13c2038c9396b54a92baea633fe11"; + 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_error_overlay___react_error_overlay_6.0.6.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz"; - sha1 = "ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"; + 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_is___react_is_16.12.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz"; - sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { @@ -9626,11 +9570,11 @@ }; } { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz"; - sha1 = "11417ffda579306d4e841a794d32140f3da1b43f"; + 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"; }; } { @@ -9642,11 +9586,11 @@ }; } { - name = "react___react_16.12.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz"; - sha1 = "0c0a9c6a142429e3614834d5a778e18aa78a0b83"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9746,11 +9690,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.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_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9770,19 +9714,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9826,11 +9770,11 @@ }; } { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.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 = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { @@ -9842,11 +9786,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.3.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -10114,11 +10058,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.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_async___run_async_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; + sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; }; } { @@ -10178,11 +10122,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz"; - sha1 = "1647d15c0c672901aa41eac1b86d0c38146d30ce"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz"; + sha1 = "5b36c92ab27917ddd2775396815c2bc1a6268310"; }; } { @@ -10218,11 +10162,11 @@ }; } { - name = "scheduler___scheduler_0.18.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz"; - sha1 = "5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -10234,11 +10178,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.6.5.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.6.5.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "c758f0a7e624263073d396e29cd40aa101152d8a"; }; } { @@ -10458,11 +10402,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.4.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz"; - sha1 = "386713f1ef688c7c0304dc4c0632898941cad2e3"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10658,11 +10602,11 @@ }; } { - name = "srcset___srcset_1.0.0.tgz"; + name = "srcset___srcset_2.0.1.tgz"; path = fetchurl { - name = "srcset___srcset_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + name = "srcset___srcset_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz"; + sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac"; }; } { @@ -10937,14 +10881,6 @@ sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; }; } - { - 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 = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { @@ -10994,11 +10930,11 @@ }; } { - name = "svg_parser___svg_parser_2.0.3.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz"; - sha1 = "a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; }; } { @@ -11033,14 +10969,6 @@ sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; }; } - { - name = "tar___tar_4.4.13.tgz"; - path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; - }; - } { name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; path = fetchurl { @@ -11074,11 +11002,11 @@ }; } { - name = "terser___terser_4.6.3.tgz"; + name = "terser___terser_4.6.7.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.6.7.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz"; + sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"; }; } { @@ -11258,19 +11186,19 @@ }; } { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; - sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.11.0.tgz"; + name = "tslib___tslib_1.11.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz"; - sha1 = "f1f3528301621a53220d58373ae510ff747a66bc"; + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; }; } { @@ -11321,6 +11249,14 @@ 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.8.1.tgz"; path = fetchurl { @@ -11370,11 +11306,11 @@ }; } { - name = "typescript___typescript_3.8.2.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz"; - sha1 = "91d6868aaead7da74f493c553aeff76c0c0b1d5a"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { @@ -11394,19 +11330,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.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 = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11650,11 +11586,11 @@ }; } { - 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"; }; } { @@ -11841,14 +11777,6 @@ sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; }; } - { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } { name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { @@ -12058,11 +11986,11 @@ }; } { - name = "ws___ws_7.2.1.tgz"; + name = "ws___ws_7.2.3.tgz"; path = fetchurl { - name = "ws___ws_7.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz"; - sha1 = "03ed52423cd744084b2cf42ed197c8b65a936b8e"; + name = "ws___ws_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz"; + sha1 = "a5411e1fb04d5ed0efee76d26d5c46d830c39b46"; }; } { @@ -12081,6 +12009,14 @@ sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; }; } + { + name = "xregexp___xregexp_4.3.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 = "xtend___xtend_4.0.2.tgz"; path = fetchurl { @@ -12114,11 +12050,11 @@ }; } { - name = "yaml___yaml_1.7.2.tgz"; + name = "yaml___yaml_1.8.3.tgz"; path = fetchurl { - name = "yaml___yaml_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; - sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + name = "yaml___yaml_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz"; + sha1 = "2f420fca58b68ce3a332d0ca64be1d191dd3f87a"; }; } { @@ -12130,11 +12066,11 @@ }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.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 = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { @@ -12146,11 +12082,11 @@ }; } { - 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_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index f109b08d1a..d7a1296a7d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,8 +4,8 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.18.1"; - shortRev = "1f6d16b"; # for internal version info + version = "5.20.0"; + shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,12 +13,12 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1iwlkm7ac7brap45r6ly0blywgq6f28r1nws3yf0ybydv30brfj4"; + sha256 = "0hnsgd6ryrl1y2prkavm7psqjnppkkfd891xkzbdfzblxsafs8cw"; }; inherit subPackages postInstall; - modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -66,4 +66,4 @@ in pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index ab94971aa3..b12ad4dd46 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; }; - modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; + vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} @@ -31,4 +31,4 @@ buildGoModule rec { homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index f307032f41..2270851842 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90"; + sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; + vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; subPackages = "cmd/thanos"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix index 065af0079b..9f0be68e16 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix @@ -16,7 +16,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' - mkdir $out + mkdir -p $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/public - makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \ + makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \ --add-flags "-p $out/public" ln -s ${backend.out}/index.html $out/public/index.html ln -s ${frontend.out}/bower_components $out/public/bower_components diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix index 09f43c755f..184d7e6aea 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix index 697492d962..4179cf52c7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/proxy.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix index 4046cc7d8b..fdf3fd476d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix index 2b7fb972c9..c75df46cf0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,16 +1,16 @@ generic: { v44 = generic { - version = "4.4.7"; - sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; + version = "4.4.8"; + sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; }; v40 = generic { - version = "4.0.19"; - sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; + version = "4.0.20"; + sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; }; v30 = generic { - version = "3.0.30"; - sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; + version = "3.0.31"; + sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix index c4cf5d044d..a75deff3db 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index d5a3b9de3c..8d862373b9 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -103,13 +103,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.21"; + version = "0.21.23"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng"; + sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; }; buildInputs = [ glib boost ] diff --git a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix index e9bd705ffa..769a8605f0 100644 --- a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -15,8 +15,8 @@ buildGoPackage rec { }; postInstall = '' - mkdir -p $bin/share - cp -R $src/frontend $bin/share + mkdir -p $out/share + cp -R $src/frontend $out/share ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index aa04bcaed9..4bddd77248 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq"; }; - modSha256 = "07v4ijblvl2zq049fdz5vdfhk6d3phrsajhnhwl46x02dbdzgj13"; + vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/routinator/default.nix b/third_party/nixpkgs/pkgs/servers/routinator/default.nix index 9c99faca48..46416c9827 100644 --- a/third_party/nixpkgs/pkgs/servers/routinator/default.nix +++ b/third_party/nixpkgs/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; + sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; }; - cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc"; + cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index 44c9676fc7..300d341cf8 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.1"; + version = "4.12.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "0xbdf9651lm4b5g60ly40nc7r8gssvnvq7m3pdma99mdcs5vcz01"; + sha256 = "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434"; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix index 40d59611da..b53a207a6c 100644 --- a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr"; + sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c"; }; buildInputs = with stdenv.lib; diff --git a/third_party/nixpkgs/pkgs/servers/search/solr/default.nix b/third_party/nixpkgs/pkgs/servers/search/solr/default.nix index 0da6186120..73aa349a51 100644 --- a/third_party/nixpkgs/pkgs/servers/search/solr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y"; + sha256 = "02sa0sldsfajryyfndv587qw69q8y8igfpimg98w1g3vndrq1dj7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/serviio/default.nix b/third_party/nixpkgs/pkgs/servers/serviio/default.nix index 006c2fdff3..769ed5e727 100644 --- a/third_party/nixpkgs/pkgs/servers/serviio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serviio"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; - sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng"; + sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; }; phases = ["unpackPhase" "installPhase"]; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index cd98af51e0..3bf72043ec 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.22"; + version = "0.21.30"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx"; + sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index 04ad685403..46ef6bcfac 100644 --- a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -8,6 +8,7 @@ , SystemConfiguration , modules ? null +, nixosTests }: let @@ -89,12 +90,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "1fmrm51zgrasjbmhs0pzb1lyca3ddx0wd35shvxnkjnifi8qd1h7"; + sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl @@ -129,6 +130,8 @@ stdenv.mkDerivation rec { cp -r conf $out/share/freeswitch/ ''; + passthru.tests.freeswitch = nixosTests.freeswitch; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index fb62ee5847..2ce8e901e8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D cockroachoss $bin/bin/cockroach + install -D cockroachoss $out/bin/cockroach installShellCompletion cockroach.bash mkdir -p $man/share/man @@ -51,11 +51,7 @@ buildGoPackage rec { runHook postInstall ''; - # Unfortunately we have to keep an empty reference to $out, because it seems - # buildGoPackages only nukes references to the go compiler under $bin, effectively - # making all binary output under $bin mandatory. Ideally, we would just use - # $out and $man and remove $bin since there's no point in an empty path. :( - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; meta = with stdenv.lib; { homepage = "https://www.cockroachlabs.com"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 6f7f81f237..2af0f149e7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.15.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz"; + sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn"; + vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ danbst ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/third_party/nixpkgs/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch new file mode 100644 index 0000000000..864ee818d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch @@ -0,0 +1,12 @@ +diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt +index a556b870..918a26f9 100644 +--- a/plugin/auth_pam/CMakeLists.txt ++++ b/plugin/auth_pam/CMakeLists.txt +@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) + COMPONENT Server) + ENDIF() + IF(TARGET auth_pam OR TARGET auth_pam_v1) +- ADD_SUBDIRECTORY(testing) + ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) + TARGET_LINK_LIBRARIES(pam_user_map pam) + SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index ea11faf1ef..ac9772922e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.22"; + version = "10.4.12"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j"; + sha256 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; name = "mariadb-${version}.tar.gz"; }; @@ -101,8 +101,16 @@ common = rec { # attributes common to both builds passthru.mysqlVersion = "5.7"; - meta = { + passthru.tests = { + mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup; + mariadb-galera-rsync = nixosTests.mariadb-galera-rsync; + mysql = nixosTests.mysql; + mysql-autobackup = nixosTests.mysql-autobackup; + mysql-backup = nixosTests.mysql-backup; + mysql-replication = nixosTests.mysql-replication; + }; + meta = { description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = licenses.gpl2; @@ -152,7 +160,10 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ [ + # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 + ./cmake-disable-auth-pam-testing.patch + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -189,7 +200,7 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/{mysql_client_test,mysqltest} + rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/25.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e39..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix index a6ce8f4b04..6c3a1af907 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons -, version, sha256, ... }: let - pname = "mariadb-galera"; galeraLibs = buildEnv { name = "galera-lib-inputs-united"; paths = [ openssl.out boost check ]; }; -in stdenv.mkDerivation { - inherit pname; - inherit version; +in stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "26.4.3"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - inherit sha256; + sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; fetchSubmodules = true; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix index a9fc3fd1a1..1634b0b5b7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "0w0mz4a1cyxdsqmv7jrkw163jll8ir5zmf93zcidlqx13knrk80g"; + sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj"; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index f71afc2b67..0a6d1a8cf6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; + sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 257af21cec..168cee9711 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f"; + sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix index ee59e683ce..314e9275c8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.3.0"; + version = "4.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w"; + sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index a5274c855f..3e292d8740 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "squid-4.10"; + pname = "squid"; + version = "4.11"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q"; + url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; + sha256 = "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 24a8aa6615..9f0a8de4ef 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -18,7 +18,14 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "1xgdhbck3pkix10lfshzdszrv6d3p0hbx8jdjvswz7jjd0vzm4x1"; + overrideModAttrs = (_: { + preBuild = '' + rm ipn/e2e_test.go + rm control/controlclient/auto_test.go + rm control/controlclient/direct_test.go + ''; + }); + vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -34,4 +41,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 73b0a57b69..27a627dd48 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.3"; pname = "Tautulli"; pythonPath = [ python.pkgs.setuptools ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0vcm9xjywy0c8lb37vdrn9payn80isij09lqkam37j08v5y64ln7"; + sha256 = "0ni3dg5ly1xdyj1g931y2by3w17f0q031mpnrw2slhy6i792r5bp"; }; buildPhase = ":"; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 0487ed177d..db31006192 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92"; + sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx"; + vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/ums/default.nix b/third_party/nixpkgs/pkgs/servers/ums/default.nix index 503ff16cae..3e58edba42 100644 --- a/third_party/nixpkgs/pkgs/servers/ums/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ums/default.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; - sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; - name = "${pname}-${version}.tgz"; - }; + version = "9.4.2"; + + src = { + i686-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + }; + x86_64-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ @@ -32,6 +37,6 @@ stdenv.mkDerivation rec { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thall ]; + maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index 372bda4061..76d1a5f0b7 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.4"; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + version = "3.13.5"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; matomo-beta = { - version = "3.13.4"; + version = "3.13.5"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix index dd4cdc0828..dbea567b7e 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "shiori"; version = "1.5.0"; - modSha256 = "1z6q5lv0j433p8lc3nxlw1rds5x1kvs1vzl63jf3disxw7ppyai3"; + vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643"; src = fetchFromGitHub { owner = "go-shiori"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ minijackson ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 9cab8c4a9b..ca4b5d832a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr"; + sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 8463b1750d..e5ef70e43a 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { python3Packages.pexpect python3Packages.pytest bashInteractive + + # use xdist to speed up the test run, just like upstream: + # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4 + python3Packages.pytest_xdist ]; # - ignore test_gcc on ARM because it assumes -march=native @@ -40,7 +44,7 @@ stdenv.mkDerivation rec { # - ignore test_ls because impure logic # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest . \ + pytest -n $NIX_BUILD_CORES . \ ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ diff --git a/third_party/nixpkgs/pkgs/shells/elvish/default.nix b/third_party/nixpkgs/pkgs/shells/elvish/default.nix index 4b9e4817ee..2aa23cd063 100644 --- a/third_party/nixpkgs/pkgs/shells/elvish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/elvish/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; }; - modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A friendly and expressive command shell"; @@ -36,4 +36,4 @@ buildGoModule rec { passthru = { shellPath = "/bin/elvish"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index 0f18eb79d2..11d9e48008 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -16,6 +16,7 @@ , python3 , cmake +, runCommand , writeText , nixosTests , useOperatingSystemEtc ? true @@ -202,38 +203,41 @@ let passthru = { shellPath = "/bin/fish"; - tests.nixos = nixosTests.fish; + tests = { + nixos = nixosTests.fish; + + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + + # if we don't set `delete=False`, the file will get cleaned up + # automatically (leading the test to fail because there's no + # tempfile to check) + sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py + + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; + in + runCommand "test-web-config" { } '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} && touch $out + ''; + }; }; }; - - tests = { - - # Test the fish_config tool by checking the generated splash page. - # Since the webserver requires a port to run, it is not started. - fishConfig = - let - fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${fish}/bin - echo $__fish_bin_dir - cp -r ${fish}/share/fish/tools/web_config/* . - chmod -R +w * - # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py - echo "print(fileurl)" >> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - - # cannot test the http server because it needs a localhost port - ''; - in '' - HOME=$(mktemp -d) - ${fish}/bin/fish ${fishScript} - ''; - }; - - # FIXME(Profpatsch) replace withTests stub - withTests = with lib; flip const; in -withTests tests fish +fish diff --git a/third_party/nixpkgs/pkgs/shells/mksh/default.nix b/third_party/nixpkgs/pkgs/shells/mksh/default.nix index b2f50c62dc..682d88dbfb 100644 --- a/third_party/nixpkgs/pkgs/shells/mksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "58"; + version = "59"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"; + sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 9dbce58d09..ecef2fc436 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.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1n92wcd3f6p38iwp9sc4bfhmaxb61ff6vvn0zvy3h4q8wmvxpiky"; + sha256 = "1g289zma19mh85xl5ffq1f3cv76piqavbhzs9m55mkg9wrhmgljd"; }; - cargoSha256 = "0dyszvy0nmbjill3wfyqprqkh911r070rvkxc1ls9s3yhxhwlhzq"; + cargoSha256 = "16a32q2la7f4628m947dwif3j3wszsy603sj29ch6l2vdab40i3p"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index d4c18f9f58..a5c22d125a 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -1,21 +1,21 @@ -{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }: +{ stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl +, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl" - else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1" + platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f" + else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++ + libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { pname = "powershell"; - version = "6.2.3"; + version = "7.0.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -26,21 +26,42 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + pslibs=$out/share/powershell + mkdir -p $pslibs + + cp -r * $pslibs + + rm -f $pslibs/libcrypto${ext}.1.0.0 + rm -f $pslibs/libssl${ext}.1.0.0 + + ls $pslibs + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + '' + mkdir -p $out/bin - mkdir -p $out/share/powershell - cp -r * $out/share/powershell - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + + makeWrapper $pslibs/pwsh $out/bin/pwsh \ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; - meta = with stdenv.lib; { - description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; + doInstallCheck = true; + installCheck = '' + $out/bin/pwsh --help > /dev/null + ''; + + meta = with lib; { + description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = [ maintainers.yrashk ]; + maintainers = with maintainers; [ yrashk srgom ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; license = with licenses; [ mit ]; }; diff --git a/third_party/nixpkgs/pkgs/shells/tcsh/default.nix b/third_party/nixpkgs/pkgs/shells/tcsh/default.nix index e22811828f..87cbf8c59f 100644 --- a/third_party/nixpkgs/pkgs/shells/tcsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/tcsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; + url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); diff --git a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix index dc0a45c3e5..192e38b963 100644 --- a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.17"; + version = "0.9.18"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "0ynfnphbp69am390m5zfzk5rzj1749vs7rzyq310f6mk7xdq6j4v"; + sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index cc4726a3cb..385fb97b91 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; }; - modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b"; + vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} +} \ No newline at end of file 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 6e679f16e3..27add8e1d7 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 @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-30"; + version = "2020-05-11"; pname = "oh-my-zsh"; - rev = "06b0276675e978d80535259915fbb44011e10101"; + rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq"; + sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix index f839cf7cf2..47f590a78f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; + vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; goPackagePath = "github.com/b4b4r07/history"; postInstall = '' @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index a11b280b04..09879451d8 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -49,6 +49,7 @@ in rec { # Configure Phase , configureFlags ? [] , cmakeFlags ? [] + , mesonFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # @@ -252,6 +253,32 @@ in rec { ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; + + mesonFlags = if mesonFlags == null then null else let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamily = platform: with platform; + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + crossFile = builtins.toFile "cross-file.conf" ('' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + '' + # TODO should have target prefix too, issue #86077 + + '' + + [binaries] + pkgconfig = 'pkg-config' + ''); + in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { diff --git a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index 4125229237..2aa0593599 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.13"; + version = "6.1.0"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92"; + sha256 = "06z6qbfd9l3acp3wm28rq4vx3m5cxi4lpxgzc2nxvxmiz8rnnmh1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 1f9efc3106..b33ca52146 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -30,11 +30,11 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0d78bn7s03nwnyc4ryznxaivbg55kvsb26q75p8747j3562s9p2b"; + sha256 = "04qskz1x1pvbdfirpxk58d3dfnf1n6dc69q2rdkak0avzl1nlzi7"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 8d4863757a..2254f2e22d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs"; + sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix index 4af0311186..d0cb07197c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -7,21 +7,21 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.7"; + version = "2.8.11"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2"; + sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; }; })); ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.15"; + version = "2.7.17"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr"; + sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; }; })); diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd..3163ab4dfc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; }; - modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; + vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; subPackages = [ "." ]; # set the version. see: aws-vault's Makefile @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix index fda773b48c..372d287cbd 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; version = "0.7.0"; + # Requires go generate to be run with mockgen, but doesn't check in the results. + patches = fetchurl { + url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; + sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; + }; + src = fetchFromGitHub { owner = "cloudetc"; repo = pname; @@ -11,7 +17,7 @@ buildGoModule rec { sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491"; + vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; meta = with lib; { description = "A tool to clean out your AWS account"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix index c1c46da41b..ecafb13978 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; }; - modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix b/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix index 5474cb2542..86873d9051 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; }; - modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; + vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index 3f4d00736a..2562dc45fa 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; }; - modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; nativeBuildInputs = [ makeWrapper ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix index 1f4315afc4..38762b6fd2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -32,11 +32,11 @@ buildGoPackage rec { installPhase = if stdenv.isDarwin then '' - install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain + install -Dm755 -t $out/bin bin/docker-credential-osxkeychain '' else '' - install -Dm755 -t $bin/bin bin/docker-credential-pass - install -Dm755 -t $bin/bin bin/docker-credential-secretservice + install -Dm755 -t $out/bin bin/docker-credential-pass + install -Dm755 -t $out/bin bin/docker-credential-secretservice ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 9fec8ec904..18fb37aa41 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.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "15dzivnndzsiw7g6qzccpk1hqb5amfn0zba1rzkvcslhl1y9gsfi"; + sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; }; - modSha256 = "13gqvr1y1b2yi2iar0p8y9hpajgy5w9xp4az5n6b5xhzcbn19f2k"; + vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; subPackages = [ "cmd/eksctl" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix new file mode 100644 index 0000000000..a408746c7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGo114Package, fetchFromGitHub }: + +buildGo114Package rec { + pname = "exoscale-cli"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "04ym7mfv565icj3lmd2nrvq9asawwmmzg09681pj9py61ws56bxr"; + }; + + goPackagePath = "github.com/exoscale/cli"; + goDeps = ./deps.nix; + + # ensures only the cli binary is built and we don't clutter bin/ with submodules + subPackages = [ "." ]; + + # we need to rename the resulting binary but can't use buildFlags with -o here + # because these are passed to "go install" which does not recognize -o + postBuild = '' + mv go/bin/cli go/bin/exo + ''; + + meta = { + description = "Command-line tool for everything at Exoscale: compute, storage, dns"; + homepage = "https://github.com/exoscale/cli"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ dramaturg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix new file mode 100644 index 0000000000..a67ee93a85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/deps.nix @@ -0,0 +1,876 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "v1.1.1"; + sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; + }; + } + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/chroma"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/chroma"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + { + goPackagePath = "github.com/alecthomas/gometalinter"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/gometalinter"; + rev = "v2.0.11"; + sha256 = "08p7bwvhpgizif8qi59m8mm3mcny70x9msbk8m8vjpphsq55wha4"; + }; + } + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.0.0"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.8"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; + }; + } + { + goPackagePath = "github.com/cyberdelia/templates"; + fetch = { + type = "git"; + url = "https://github.com/cyberdelia/templates"; + rev = "ca7fffd4298c"; + sha256 = "1miakwci9pz95p0jps4i3pyv5ws713ks1wwir5bzrl0yg8klrgw1"; + }; + } + { + goPackagePath = "github.com/danwakefield/fnmatch"; + fetch = { + type = "git"; + url = "https://github.com/danwakefield/fnmatch"; + rev = "cbb64ac3d964"; + sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; + }; + } + { + 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/deepmap/oapi-codegen"; + fetch = { + type = "git"; + url = "https://github.com/deepmap/oapi-codegen"; + rev = "ee90a3f9f1ae"; + sha256 = "199nb6aqhllkk891x24h1jffin1x9fx8jdsav9pbc2ki0z8mlji3"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "v1.1.6"; + sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "v0.24.0"; + sha256 = "1ls7blpmhwqxz9cfjc5799q4047pawfda1v1mhyicjdlp3b1z1zi"; + }; + } + { + goPackagePath = "github.com/fatih/camelcase"; + fetch = { + type = "git"; + url = "https://github.com/fatih/camelcase"; + rev = "v1.0.0"; + sha256 = "0z7rw6f5j97dkzqya257dqlxf3cm8zl508081gmnr4bsjhkwpz2l"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getkin/kin-openapi"; + fetch = { + type = "git"; + url = "https://github.com/getkin/kin-openapi"; + rev = "v0.2.0"; + sha256 = "0slv4k55yiqgv5cv51mvfdcckl95wsbvhvrrpmh4wf7q9rk0jkf6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-chi/chi"; + fetch = { + type = "git"; + url = "https://github.com/go-chi/chi"; + rev = "v4.0.2"; + sha256 = "1ay9yxzj60l21h4wayrq9sv5ajaqaryy5yyf27z7v2k4a83b5qr6"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "github.com/golangci/lint-1"; + fetch = { + type = "git"; + url = "https://github.com/golangci/lint-1"; + rev = "d2cdd8c08219"; + sha256 = "0viib12a61338411ng4nnd4na4fscsknghk397jdfn00sigyy4ls"; + }; + } + { + goPackagePath = "github.com/google/shlex"; + fetch = { + type = "git"; + url = "https://github.com/google/shlex"; + rev = "c34317bd91bf"; + sha256 = "00qivza4hkllfkar2vpqmyxybi0fwqipgijv61dgapq4xddxdq0r"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "d547d1d9531e"; + sha256 = "0rhgxfh8b3qq4imkw6dmv0hxsmflm9pkax8i7a9z8q464z1ixrz7"; + }; + } + { + goPackagePath = "github.com/gordonklaus/ineffassign"; + fetch = { + type = "git"; + url = "https://github.com/gordonklaus/ineffassign"; + rev = "1003c8bd00dc"; + sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/juju/ansiterm"; + rev = "720a0952cc2a"; + sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + 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/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/manifoldco/promptui"; + fetch = { + type = "git"; + url = "https://github.com/manifoldco/promptui"; + rev = "v0.3.2"; + sha256 = "185h0lqm14l9j0yvdsn9njq7jw3j6x3l21jvvczzbcbbrj44q0pl"; + }; + } + { + goPackagePath = "github.com/matryer/moq"; + fetch = { + type = "git"; + url = "https://github.com/matryer/moq"; + rev = "6cfb0558e1bd"; + sha256 = "0x7ss68cvq2aljyw4765iy7divmp8rghpyzlas3nb95qzsfmmpzl"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.4"; + sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.10"; + sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "v6.0.44"; + sha256 = "0sfmd2lf24f7ds16imk63mas6izhjnmprbxad0sil9abvk8r23mk"; + }; + } + { + goPackagePath = "github.com/minio/sha256-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/sha256-simd"; + rev = "v0.1.1"; + sha256 = "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/nicksnyder/go-i18n"; + fetch = { + type = "git"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "v1.10.0"; + sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "be2c049b30cc"; + sha256 = "1fr996vpmh6v5q13kfgf0fbi0hksxqg0fnbvj2nqhlsyfp5s8f4w"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + 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/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + 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 = "68dc04aab96a"; + sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/tsenart/deadcode"; + fetch = { + type = "git"; + url = "https://github.com/tsenart/deadcode"; + rev = "210d2dc333e9"; + sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.1.0"; + sha256 = "089wm839lqmw9knr3ifbi82iykaybk0zxzp3c02lsh31wax4f8a2"; + }; + } + { + goPackagePath = "github.com/vbauerster/mpb"; + fetch = { + type = "git"; + url = "https://github.com/vbauerster/mpb"; + rev = "v4.8.4"; + sha256 = "0ifz1hp1a5xjxx7x9km5pb0x6p60lcpzwmhnxlg5x4ls6hrs8wd9"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "e1110fd1c708"; + sha256 = "0n5n7dzlr87mvk3mbcx400al4pa1i85jbbdhbx4s1rhr0rs3kh9a"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2180aed22343"; + sha256 = "0hl3pgi8rzij5m6alq4xqfvyvidy7jnf5y85031jv4y1bj85r6pl"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "52ab43148777"; + sha256 = "1kakxbqrb1w2vwg7r1896z68qcx2lfvimsl8cs2niiipbgpi6imx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a911d9008d1f"; + sha256 = "118vsliq2a9xfp6rckc310mf9lydfgah6hgiggd88cm3zch4626m"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v3-unstable"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v3-unstable"; + rev = "df19058c872c"; + sha256 = "0nb6925fixs6brdwpmwi32b38acn1s8dv4g0syjy3kpq0wasljy9"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix index 96c49b58d0..8e79959ba3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z"; }; - modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph"; buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index ce250d33e9..025afe25e8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw"; + hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0="; }; - modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; + vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix index 31705d1e79..de967578d5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "lexicon"; - version = "3.3.17"; + version = "3.3.22"; propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89"; + sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 6051c16e91..f270576e68 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , raft-canonical, sqlite-replication, udev @@ -10,15 +10,20 @@ buildGoPackage rec { pname = "lxd"; - version = "4.0.1"; + version = "4.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; + sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; }; + postPatch = '' + substituteInPlace shared/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd @@ -31,9 +36,9 @@ buildGoPackage rec { postInstall = '' # test binaries, code generation - rm $bin/bin/{deps,macaroon-identity,generate} + rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" diff --git a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index b999c65f6f..a4d201fd4c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,29 +1,35 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.9"; - versionMinor = "2"; + versionMajor = "6.10"; + versionMinor = "12"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + ]; + sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + ]; + sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; - + postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -32,7 +38,7 @@ in tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) ''; - + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; buildInputs = [ jsoncpp libpulseaudio ]; @@ -50,7 +56,7 @@ in cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" fi done - + mkdir $out/share/applications cp share/applnk/player/xdg/*.desktop $out/share/applications/ cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ @@ -62,7 +68,7 @@ in substituteInPlace "$i" --replace /usr/NX/bin $out/bin done ''; - + postFixup = '' makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX @@ -71,7 +77,7 @@ in # have a DT_NEEDED entry for it. patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so ''; - + dontBuild = true; dontStrip = true; @@ -87,4 +93,4 @@ in platforms = [ "x86_64-linux" "i686-linux" ]; }; } - + diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index a4998d8546..5bfbb6d8c6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0waqkb1l66yk2gbqzybrh3yzf72gvyjsrvv3zyxpxzsgawrcx85g"; + sha256 = "0lg4v32jx0fxcjz6cj6cxxlg7rhj75k4p75izpkk4l11xpxqhgjm"; }; - cargoSha256 = "0z4m7aslgwvbfm6af03d8ql6c4w83h0kwgbgy6sfsx1gf7kv6q6z"; + cargoSha256 = "05qqy6l28ihn7hykkkh1x7z3q58cdrwv76fc22xjcg20985ac2nx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index b648cdb251..f3c375a996 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -1,21 +1,38 @@ -{ - stdenv, pythonPackages, openssl, - +{ lib +, python3 +, openssl # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. - extraInputs ? [] +, extraInputs ? [] }: +let -pythonPackages.buildPythonApplication rec { - pname = "salt"; - version = "2019.2.0"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; + py = python3.override { + packageOverrides = self: super: { + # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved + msgpack = super.msgpack.overridePythonAttrs ( + oldAttrs: rec { + version = "0.6.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a"; + }; + } + ); + }; }; - propagatedBuildInputs = with pythonPackages; [ +in +py.pkgs.buildPythonApplication rec { + pname = "salt"; + version = "3000.3"; + + src = py.pkgs.fetchPypi { + inherit pname version; + sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw"; + }; + + propagatedBuildInputs = with py.pkgs; [ jinja2 markupsafe msgpack @@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ - futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; @@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec { # as is it rather long. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix index c1ae07c0fd..b082f61f87 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "simple-evcorr"; repo = "sec"; rev = meta.version; - sha256 = "025cz3mr5yrdgs0i3h8v2znhvjkyh78kba1rzvl03ns2b1c49168"; + sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; buildInputs = [ perl ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; - version = "2.8.2"; + version = "2.8.3"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index b7a97b3766..d6ad699eaa 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch (fetchpatch { + name = "3-CVE-2018-5996.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; }) (fetchpatch { + name = "4-CVE-2018-10115.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; }) diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index 37766a9072..3c736258cb 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm"; }; - modSha256 = "1a95kfy8w952269x4llbl0afyxr5fjkg30mxsn81zdh5wr8gabwh"; + vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp"; subPackages = [ "cmd/${pname}" ]; @@ -29,5 +29,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} - +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index ca04369278..0c528bcea1 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric the-kenny ]; + maintainers = with maintainers; [ asymmetric ]; inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index 8120944445..b96d6d7572 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin + wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix index 1d754e4324..b261289f0b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -D duplicacy_main $bin/bin/duplicacy + install -D duplicacy_main $out/bin/duplicacy ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix b/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix index 6e2b92e812..9a77153e2f 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { description = "Easy-to-use offline browser / website mirroring utility"; homepage = "http://www.httrack.com"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index 046fe130ff..f3bcf82e54 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0am992dhqv0vpk4zsc9wwnbzhpdx98wm9dxi89bq2yr3l77lml3d"; + sha256 = "0w19szxzhwxbgnv4k618p8v29dhbar1fn433bsz1cr1apnrahmkn"; }; - cargoSha256 = "03nd8pzrd66rv12l7qr9i4kdrdr8hk1mz8ihvd982cjd2dlisipd"; + cargoSha256 = "06gc3cpx1m2f6fwrm8brw5nidg1v02q1qwqfxvv3xzmmczbw4345"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix index a23be69f4c..707ba8a988 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix @@ -19,6 +19,5 @@ python2Packages.buildPythonApplication { homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index df9d613ee4..f366533f9b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { passthru.tests.restic = nixosTests.restic; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - $bin/bin/restic generate \ + $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ --man . diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix index c7f12cb751..45a4df74b1 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dt $bin/bin rest-server + install -Dt $out/bin rest-server ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix index ad67f7ce88..2f2541c41c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; }; - modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; + vendorSha256 = "0jjr33k27k6h27sa01ipz0aydch3i9klknqb3yq8f048zkb54gv8"; buildInputs = [ brotli ]; @@ -31,4 +31,4 @@ buildGoModule rec { description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix b/third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix index 90ed1068ca..5ca460beb3 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/znapzend/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: let - # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES - Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot + Mojolicious-8-35 = perlPackages.buildPerlPackage rec { pname = "Mojolicious"; - version = "6.46"; + version = "8.35"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h"; }; }; - MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec { pname = "Mojo-IOLoop-ForkCall"; - version = "0.17"; + version = "0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; - sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ]; }; - version = "0.18.0"; - checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; + version = "0.20.0"; + checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3"; in stdenv.mkDerivation { pname = "znapzend"; @@ -34,9 +35,9 @@ stdenv.mkDerivation { sha256 = checksum; }; - buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ]; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake autoreconfHook ]; preConfigure = '' sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am @@ -55,23 +56,23 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; diff --git a/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix b/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix new file mode 100644 index 0000000000..77382d980e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "hactool"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "SciresM"; + repo = "hactool"; + rev = "1.3.3"; + sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631"; + }; + + preBuild = '' + mv config.mk.template config.mk + ''; + + installPhase = '' + install -D hactool $out/bin/hactool + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/SciresM/hactool"; + description = "A tool to manipulate common file formats for the Nintendo Switch"; + longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; + license = licenses.isc; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix index 81fdc95d88..13e1d83693 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* + cp $src/src/zopfli/*.h $dev/include/ ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index 2df5043867..eaf9ac634a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; + sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper b/third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper index 8ef46afc18..67c95e8f80 100755 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bees/bees-service-wrapper @@ -140,7 +140,11 @@ _setup() { [[ $bees_uuid ]] || { # if bees_uuid is not in our .conf file, look it up with findmnt - read -r bees_uuid fstype < <(findmnt -n -o uuid,fstype "$bees_fsSpec") && [[ $fstype ]] || exit + for findmnt_mode in --kernel --mtab --fstab; do + read -r bees_uuid fstype < <(findmnt "$findmnt_mode" -n -o uuid,fstype "$bees_fsSpec") ||: + [[ $bees_uuid && $fstype ]] && break + done + [[ $bees_uuid ]] || die "Unable to identify a device matching $bees_fsSpec with findmnt" [[ $fstype = btrfs ]] || die "Device type is $fstype, not btrfs" } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index 065a673eb0..bf6c68072a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.5"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; + sha256 = "173c5fcnfbnlw5a437r2x899ax77j3wp8gg8gffhryahcgyn1abq"; }; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index ea610dfcc7..c2234404d3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.8"; + version = "14.2.9"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; + sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index dafe4c8517..b8f63a379b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.5.0.456"; + version = "1.6.2.605"; pname = "fatsort"; src = fetchurl { url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; - sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; + sha256 = "1dzzsl3a1ampari424vxkma0i87qkbgkgm2169x9xf3az0vgmjh8"; }; patches = [ ./fatsort-Makefiles.patch ]; buildInputs = [ help2man ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + meta = with stdenv.lib; { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch index 9c9f58e97a..51775edfb4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -1,31 +1,34 @@ -diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile ---- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile +--- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100 ++++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200 @@ -1,4 +1,5 @@ -MANDIR=/usr/local/share/man/man1 -+PREFIX=$(out) ++PREFIX?=/usr/local +MANDIR=$(PREFIX)/share/man/man1 INSTALL_FLAGS=-m 0755 -p -D -diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile ---- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 -@@ -1,3 +1,5 @@ -+PREFIX=$(out) -+ - CC=gcc - LD=gcc - -@@ -33,9 +35,9 @@ - - # Mac OS X does not have a "/usr/local/sbin" - ifeq ($(UNAME),Darwin) --SBINDIR=/usr/local/bin -+SBINDIR=$(PREFIX)/bin +diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile +--- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100 ++++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200 +@@ -30,7 +30,7 @@ + override CFLAGS += -D __CYGWIN__ + override CFLAGS += -D __LINUX__ + override LDFLAGS += -liconv +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif else --SBINDIR=/usr/local/sbin -+SBINDIR=$(PREFIX)/sbin + ifdef MINGW +@@ -60,9 +60,9 @@ + # OS X's install does not support the '-D' flag. + INSTALL_FLAGS=-m 0755 -p + # Mac OS X does not have a "/usr/local/sbin" +- SBINDIR=/usr/local/bin ++ SBINDIR=$(PREFIX)/bin + else +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif + endif endif - - OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 4c8012de4f..c3b694c855 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; - platforms = platforms.unix; + platforms = platforms.linux; inherit (src.meta) homepage; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix index 2d24cb71bb..0a4472d712 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,40 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: -stdenv.mkDerivation { - name = "fuseiso-20070708"; +stdenv.mkDerivation rec { + pname = "fuseiso"; + version = "20070708"; src = fetchurl { - url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2"; sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse zlib glib ]; - - patches = let fetchPatchFromDebian = { patch, sha256 }: - fetchpatch { - inherit sha256; - url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}"; - }; - in [ - (fetchPatchFromDebian { - patch = "00-support_large_iso.patch"; + patches = [ + (fetchpatch { + name = "00-support_large_iso.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch"; sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; }) - (fetchPatchFromDebian { # CVE-2015-8837 - patch = "02-prevent-buffer-overflow.patch"; + (fetchpatch { + name = "01-fix_typo.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch"; + sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa"; + }) + (fetchpatch { + name = "02-prevent-buffer-overflow_CVE-2015-8837.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch"; sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; }) - (fetchPatchFromDebian { # CVE-2015-8836 - patch = "03-prevent-integer-overflow.patch"; + (fetchpatch { + name = "03-prevent-integer-overflow_CVE-2015-8836.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch"; sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; }) ]; - meta = { - homepage = "https://sourceforge.net/projects/fuseiso"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fuse glib zlib ]; + + # after autoreconfHook, glib and zlib are not found, so force link against + # them + NIX_LDFLAGS = "-lglib-2.0 -lz"; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + + meta = with stdenv.lib; { description = "FUSE module to mount ISO filesystem images"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + homepage = "https://sourceforge.net/projects/fuseiso"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index f8d955dbfc..3f0e261b18 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,8 +16,8 @@ buildGoPackage rec { subPackages = [ "." "tools/mount_gcsfuse" ]; postInstall = '' - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; meta = with lib;{ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index 5cc6e5c156..f02fec85a5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.4"; + version = "7.5"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6"; + sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93"; }; buildInputs = [ @@ -73,19 +73,25 @@ stdenv.mkDerivation postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ + --replace '/sbin/' '${lvm2}/bin/' + substituteInPlace libglusterfs/src/glusterfs/compat.h \ + --replace '/bin/umount' '${utillinux}/bin/umount' + substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ + --replace '/bin/mount' '${utillinux}/bin/mount' ''; - # Note that the VERSION file is something that is present in release tarballs - # but not in git tags (at least not as of writing in v3.10.1). - # That's why we have to create it. - # Without this, gluster (at least 3.10.1) will fail very late and cryptically, - # for example when setting up geo-replication, with a message like - # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. - # What happens here is that the gverify.sh script tries to compare the versions, - # 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 + # Note that the VERSION file is something that is present in release tarballs + # but not in git tags (at least not as of writing in v3.10.1). + # That's why we have to create it. + # Without this, gluster (at least 3.10.1) will fail very late and cryptically, + # for example when setting up geo-replication, with a message like + # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. + # What happens here is that the gverify.sh script tries to compare the versions, + # 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 ./autogen.sh export PYTHON=${python3}/bin/python ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index fa498263ba..fb90c3b0ae 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -1,4 +1,4 @@ -{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: # Common attributes of irods packages @@ -7,7 +7,7 @@ with stdenv; { enableParallelBuilding = true; - buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; + buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -18,6 +18,7 @@ with stdenv; "-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}" "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" + "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" "-DCPACK_GENERATOR=TGZ" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix index b6099c099f..8dfdd96dbe 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: with stdenv; @@ -10,19 +10,21 @@ let inherit stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc kerberos gcc libcxx - boost avro-cpp which; + boost avro-cpp which catch2; }; in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - prefix = "irods"; - name = "${prefix}-${version}"; + version = "4.2.7"; + pname = "irods"; - src = fetchurl { - url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7"; + src = fetchFromGitHub { + owner = "irods"; + repo = "irods"; + rev = version; + sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s"; + fetchSubmodules = true; }; # Patches: @@ -41,6 +43,10 @@ in rec { substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include" + for file in unit_tests/cmake/test_config/*.cmake + do + substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2" + done export cmakeFlags="$cmakeFlags -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib @@ -59,13 +65,18 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - name = "irods-icommands-${version}"; - src = fetchurl { - url = "https://github.com/irods/irods_client_icommands/archive/${version}.tar.gz"; - sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h"; + version = "4.2.7"; + pname = "irods-icommands"; + + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = version; + sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli"; }; + patches = [ ./zmqcpp-deprecated-send_recv.patch ]; + buildInputs = common.buildInputs ++ [ irods ]; preConfigure = common.preConfigure + '' @@ -84,7 +95,6 @@ in rec { description = common.meta.description + " CLI clients"; longDescription = common.meta.longDescription + '' This package provides the CLI clients, called 'icommands'.''; - broken = true; }; }); } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch b/third_party/nixpkgs/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch new file mode 100644 index 0000000000..8c249dc474 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch @@ -0,0 +1,21 @@ +diff -r -u source/src/irods-grid.cpp source.new/src/irods-grid.cpp +--- source/src/irods-grid.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ source.new/src/irods-grid.cpp 2020-05-05 16:34:35.566464346 +0200 +@@ -412,7 +412,7 @@ + data_to_send.data(), + data_to_send.size() ); + try { +- if (!zmq_skt.send(req)) { ++ if (!zmq_skt.send( req, zmq::send_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error sending a message.\n"; + return errno; + } +@@ -426,7 +426,7 @@ + zmq::message_t rep; + // wait for the server reponse + try { +- if (!zmq_skt.recv( &rep )) { ++ if (!zmq_skt.recv( rep, zmq::recv_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error receiving a message.\n"; + return errno; + } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 767c5168ff..72b95641d0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.9"; + version = "0.9.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; + sha256 = "1ilxkrqbpb5whv7xfwfvph76jwyjzf988njjpyyr99h6jv2r77q1"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index c7d11d415a..5efa218ed0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -1,55 +1,33 @@ -{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: +{ stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "tmsu"; - version = "0.7.4"; - - go-sqlite3 = fetchgit { - url = "git://github.com/mattn/go-sqlite3"; - rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; - sha256 = "1m0q9869fis0dhg34g5wc5xi6pby491spfxi23w461h29higbrqh"; - }; - - go-fuse = fetchgit { - url = "git://github.com/hanwen/go-fuse"; - rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; - sha256 = "1iph2hpvby2mfwqg9pp39xjqdl9a09h4442yfdn5l67pznljh2bi"; - }; + version = "0.7.5"; + goPackagePath = "github.com/oniony/TMSU"; src = fetchFromGitHub { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; + sha256 = "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"; }; - buildInputs = [ go fuse ]; + goDeps = ./deps.nix; + + buildInputs = [ fuse ]; + nativeBuildInputs = [ installShellFiles ]; preBuild = '' - mkdir -p src/github.com/mattn/go-sqlite3/ - ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 - - mkdir -p src/github.com/hanwen/go-fuse - ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse - - mkdir -p src/github.com/oniony/tmsu - ln -s ${src}/* src/github.com/oniony/tmsu - - patchShebangs tests/. - - export GOPATH=$PWD - export GOCACHE=$TMPDIR/go-cache + mv go/src/${goPackagePath} src + mv src/src/${goPackagePath} go/src/${goPackagePath} + export GOPATH=$PWD:$GOPATH ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/sbin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - make install INSTALL_DIR=$out/bin \ - MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man/man1 \ - ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + postInstall = '' + mv $out/bin/{TMSU,tmsu} + cp src/misc/bin/* $out/bin/ + installManPage src/misc/man/tmsu.1 + installShellCompletion --zsh src/misc/zsh/_tmsu ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix new file mode 100644 index 0000000000..90e64b434c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; + sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "98a44bcf5949f178c8116fa30e62c9ac2ef65927"; + sha256 = "108rk74ringkkyx05zlq5khh32fsfi0przyzrpsr1r5j57xrhxj0"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3c4aac89819a5fdc28d906456729d3423fd46969"; + sha256 = "16q9ay6bl28zrnb377p8lvrs2nd98h7i6y3yi8ccjwzg1czbfdsi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f523308b49060df02171d06ddfc77"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 695e071eff..359d8b7abb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; rev = "v${version}"; - sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6"; + sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; }; patches = diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 051adb0742..1c437a3f05 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qt5, netpbm }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qt5.qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix index 085b6ae4a9..ba5082ac30 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Verifies the integrity of PNG, JNG and MNG files"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix index 67d3eb15ba..5bc52b92f0 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix index 56df615e57..f9042645be 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"; + sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 8546c4e818..1bfb2f8802 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -12,9 +12,10 @@ , libjpeg , libgsf , libexif +, libheif , ApplicationServices , python27 -, libpng ? null +, libpng , fetchFromGitHub , fetchpatch , autoreconfHook @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.9.1"; + version = "8.9.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "01vgvzlygg3fzpinb0x1rdm2sqvnqxmvxbnlbg73ygdadv3l2s0v"; + sha256 = "0pgvcp5yjk96izh7kjfprjd9kddx7zqrwwhm8dyalhrwbmj6c2q5"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -41,15 +42,6 @@ stdenv.mkDerivation rec { ''; }; - patches = [ - # autogen.sh should not run configure - # https://github.com/libvips/libvips/pull/1566 - (fetchpatch { - url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; - sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook @@ -69,6 +61,8 @@ stdenv.mkDerivation rec { libjpeg libgsf libexif + libheif + libpng python27 libpng expat diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix index 60e6b56b2e..0993a39983 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: -stdenv.mkDerivation { - pname = "wdisplays-unstable"; - version = "2020-03-15"; + +stdenv.mkDerivation rec { + pname = "wdisplays"; + version = "1.0"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,8 +11,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d"; - sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2"; + rev = version; + sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; meta = let inherit (stdenv) lib; in { diff --git a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix index 3371b79562..81ca4d9462 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; }; - modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; + vendorSha256 = "1hjzpg3q4znvgzk0wbl8rq6cq877xxdsf950bcsks92cs8386847"; meta = with stdenv.lib; { description = "Terminal multiplexer inspired by i3"; @@ -21,4 +21,4 @@ buildGoModule rec { # TODO: fix modules build on darwin broken = stdenv.isDarwin; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix index 6463ed1df2..c9bad789ad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20180918"; - rev = "80c7beb"; + date = "20200206"; + rev = "963bc9d"; in stdenv.mkDerivation { name = "agedu-${date}.${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; + sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; }; nativeBuildInputs = [autoreconfHook halibut]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix index 792b12688a..3c97c16842 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -33,7 +33,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly - wrapProgram "$bin/bin/aptly" \ + wrapProgram "$out/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index c6f664a100..9588d0ae94 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.9"; + version = "1.10"; in stdenv.mkDerivation { pname = "autorandr"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"; + sha256 = "0rcgs1n09p0p16lr5y239s0yrw7bch0x2cqwgc2dyh7rz7d9qmwn"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index d08a609735..95bc44dcce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "07yng5bwhin7yqj1hihmxgi8w0n45nks05a8795zwsw92k373ib4"; + sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj"; fetchSubmodules = true; }; - cargoSha256 = "1xqbpij6lr0bqyi0cfwgp3d4hcjhibpdc4dfm9gb39mmbgradrzf"; + cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8"; + + # Disable test that's broken on macOS. + # This should probably be removed on the next release. + # https://github.com/sharkdp/bat/issues/983 + patches = [ ./macos.patch ]; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch b/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch new file mode 100644 index 0000000000..549782f0c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch @@ -0,0 +1,13 @@ +diff --git a/src/assets.rs b/src/assets.rs +index 4f8556f..222abc2 100644 +--- a/src/assets.rs ++++ b/src/assets.rs +@@ -336,7 +336,7 @@ mod tests { + assert_eq!(test.syntax_for_file("Makefile"), "Makefile"); + } + +- #[cfg(unix)] ++ #[cfg(all(unix,not(target_os = "macos")))] + #[test] + fn syntax_detection_invalid_utf8() { + use std::os::unix::ffi::OsStrExt; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix index 2f90745785..041dabeee7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibtool"; - version = "2.67"; + version = "2.68"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; + sha256 = "1ymq901ckaysq2n1bplk1064rb2njq9n30pii15w157y0lxcwd3i"; }; # Perl for running test suite. @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/blsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/blsd/default.nix deleted file mode 100644 index 6e6a9b7c5a..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/blsd/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: - -buildGoPackage { - pname = "blsd"; - version = "2017-07-27"; - - goPackagePath = "github.com/junegunn/blsd"; - - src = fetchFromGitHub { - owner = "junegunn"; - repo = "blsd"; - rev = "a2ac619821e502452abdeae9ebab45026893b9e8"; - sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgit2 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/junegunn/blsd"; - description = "List directories in breadth-first order"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/blsd/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/blsd/deps.nix deleted file mode 100644 index d212f213a6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/blsd/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8"; - sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix b/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix index 7e827f007e..854958dc8a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.2.1"; + version = "1.2.2"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; + sha256 = "1c6npyws705qf9rv70mmh7d0almmpxz87a0n65lhw08lms1h3dl2"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index e63ad0e42a..9e1671aec9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.4.0"; + version = "1.4.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; + sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; }; nativeBuildInputs = [ autoconf diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index c42e8cacc7..75b10bc32c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn"; + sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g"; + vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix index e75ddaa5ba..5146e25da5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i"; + sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; }; - modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; + vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; nativeBuildInputs = [ makeWrapper ]; @@ -27,4 +27,4 @@ buildGoModule rec { description = "A simple clipboard manager for Wayland"; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix index f66f2b97d1..8e9782506f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"; + sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index 3c7e72f6d7..e261b95fde 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "direnv"; - version = "2.21.2"; + version = "2.21.3"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0afpxx8pwa1zb66l79af57drzjaazn2rp6306w4pxvqfh0zi2bri"; + sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; postConfigure = '' @@ -23,9 +23,9 @@ buildGoPackage rec { installPhase = '' mkdir -p $out - make install DESTDIR=$bin - mkdir -p $bin/share/fish/vendor_conf.d - echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix index 0329c1bc4a..f3f89d0a66 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; meta = with stdenv.lib; { description = "TUI Client for Docker"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 2dea0f179a..cb000b2947 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; + sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; + cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix index aeb88d0c68..be8134a92a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl"; + sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix index 4944600108..0d2029fa31 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -1,25 +1,19 @@ -{ lib -, stdenv +{ stdenv , fetchurl , gcc-unwrapped , dpkg , polkit +, utillinux , bash , nodePackages -, electron_3 -, gtk3 -, wrapGAppsHook +, makeWrapper +, electron_7 }: let - libPath = lib.makeLibraryPath [ - # for libstdc++.so.6 - gcc-unwrapped.lib - ]; - sha256 = { - "x86_64-linux" = "0zb9j34dz7ybjix018bm8g0b6kilw9300q4ahcm22p0ggg528dh7"; - "i686-linux" = "0wsv4mvwrvsaz1pwiqs94b3854h5l8ff2dbb1ybxmvwjbfrkdcqc"; + "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; + "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; }."${stdenv.system}"; arch = { @@ -27,26 +21,22 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; -in stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.60"; + version = "1.5.86"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - buildInputs = [ - gtk3 - ]; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - dontBuild = true; dontConfigure = true; + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; @@ -55,33 +45,33 @@ in stdenv.mkDerivation rec { # along with some other paths patchPhase = '' ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp - # Use Nix(OS) paths + # use Nix(OS) paths sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|process.resourcesPath|'$out/opt/balenaEtcher/resources/'|" tmp/generated/gui.js + sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js + sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar rm -rf tmp - # Fix up .desktop file - substituteInPlace usr/share/applications/balena-etcher-electron.desktop \ - --replace "/opt/balenaEtcher/balena-etcher-electron" "$out/bin/balena-etcher-electron" ''; installPhase = '' - mkdir -p $out/bin - cp -r opt $out/ - cp -r usr/share $out/ + runHook preInstall - # We'll use our Nixpkgs electron_3 instead - rm $out/opt/balenaEtcher/balena-etcher-electron + mkdir -p $out/bin $out/share/${pname} - ln -s ${electron_3}/bin/electron $out/bin/balena-etcher-electron + cp -a usr/share/* $out/share + cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} + + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' + + runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --add-flags $out/opt/balenaEtcher/resources/app.asar - --prefix LD_LIBRARY_PATH : ${libPath} - ) + postFixup = '' + makeWrapper ${electron_7}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 62c2aa36dc..fc4c44e01c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.59"; + version = "0.2.61"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; + sha256 = "1d0rx5gcp9z06kxjknqa1r2b4m5c4vrhp4a9spkawvgiky5a9x07"; }; - cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; + cargoSha256 = "1bmyhg1y4gz719nsfdfjf4y73f9l6aag17dx9iazfzwnwwaq46m9"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix b/third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix index 7f7fc6f4e0..90fb0981fb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/figlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; + url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index d5c75a1e8a..e875dd77b0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; - modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; + vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; outputs = [ "out" "man" ]; @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ma27 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index d4daa64fac..cd50271a2e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; }; - modSha256 = "1lrsg33zd7m24za2gv407hz02n3lmz9qljfk82whlj44hx7kim1z"; + vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; postInstall = '' mv $out/bin/cli $out/bin/gotify @@ -23,4 +23,4 @@ buildGoModule rec { description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 109a84de63..2898cfb679 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -15,8 +15,11 @@ stdenv.mkDerivation rec { extraPostFetch = "rm -r $out/testdir"; }; + dontConfigure = true; + makeFlags = [ "PREFIX=${placeholder "out"}" + "HARDEN=1" ] ++ stdenv.lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README.md + install -Dm444 -t $out/share/doc/jdupes CHANGES LICENSE README.md ''; meta = with stdenv.lib; { @@ -40,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jbruchon/jdupes"; license = licenses.mit; maintainers = with maintainers; [ romildo ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 3048b4c939..2f63eaf438 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ul"; repo = pname; rev = "v${version}"; - sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; + sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; }; - cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; + cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 0a8f10fa85..46d75e5086 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; + vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix index b1edabad68..8627003db5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; }; - modSha256 = "1c6c6qg8yrhdhqsnqj3jw3x2hi8vrhfm47cp9xlkfnjfrz3nk6jp"; + vendorSha256 = "1zb2z3c2w4gnq9cjczg1y7r7jg4mlrm2hsb12dqd9w8mh44rvr37"; nativeBuildInputs = [ installShellFiles ]; @@ -47,4 +47,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix index c34e934fba..c92b4ad42e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; }; - modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + vendorSha256 = "1j45h8p13xfz0qy1nrddlx1xzbr5vqxd3q76hbb0v60636izfk0r"; subPackages = [ "." ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix index 9969148e22..afbe811e7f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; - patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ]; + patches = [ + ./format-string_CVE-2012-4426.patch + ./overflow_CVE-2012-4409.patch + ./segv.patch + ./sprintf_CVE-2012-4527.patch + ]; buildInputs = [ libmcrypt libmhash ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string.patch b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string.patch rename to third_party/nixpkgs/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow.patch b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow.patch rename to third_party/nixpkgs/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf.patch b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf.patch rename to third_party/nixpkgs/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix index f2adadc084..c33aa07440 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,10 @@ -{ fetchzip, lib, stdenv, mtools }: +{ stdenv +, lib +, fetchzip +, utillinux +, jq +, mtools +}: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +28,28 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ mtools ]; + nativeBuildInputs = [ + utillinux + jq + mtools + ]; installPhase = '' - mkdir -p $out $TEMP/memtest86-files - # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following uses dd and mcopy to extract the actual EFI app from the - # usb image so that it can be installed directly on the hard drive. - dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048 - mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/ - mv $TEMP/memtest86-files/BOOT/* $out/ + # The following uses sfdisk to calculate the offset of the FAT EFI System + # Partition in the disk image, and mcopy to extract the actual EFI app from + # the filesystem so that it can be installed directly on the hard drive. + IMG=$src/memtest86-usb.img + ESP_OFFSET=$(sfdisk --json $IMG | jq -r ' + # Partition type GUID identifying EFI System Partitions + def ESP_GUID: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"; + .partitiontable | + .sectorsize * (.partitions[] | select(.type == ESP_GUID) | .start) + ') + mkdir $out + mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index ea3afdab09..dab44e1eea 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; + sha256 = "06nrb84xfvx02yc4bjn1szfq3bjy8mqgxwwrjghl7vpcw51qhlk5"; }; - cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a"; + cargoSha256 = "0mk8hvhjqggfr410yka9ygb41l1bnsizs8py3100xf685yxy5mhl"; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index f216e358d8..c3e9a0dc2f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -45,7 +45,7 @@ in buildGoPackage { runHook preBuild ${stdenv.lib.concatMapStrings (t: '' - go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} runHook postBuild diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0..d1716d95ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; }; - modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix index a4fe58fb10..e50960d063 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; - modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; + vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; subPackages = [ "cmd/cowsay" "cmd/cowthink" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = with licenses; [artistic1 /* or */ gpl3]; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix new file mode 100644 index 0000000000..cff7df1801 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: + +stdenv.mkDerivation rec { + pname = "nix-direnv"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-direnv"; + rev = "${version}"; + sha256 = "1lwmg6mn3lf7s0345v53zadxn9v0x8z6pcbj90v5dx3pgrq41gs8"; + }; + + # Substitute instead of wrapping because the resulting file is + # getting sourced, not executed: + postPatch = '' + substituteInPlace direnvrc \ + --replace "grep" "${gnugrep}/bin/grep" \ + --replace "nix-shell" "${nix}/bin/nix-shell" \ + --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + ''; + + installPhase = '' + runHook preInstall + install -m500 -D direnvrc $out/share/nix-direnv/direnvrc + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A fast, persistent use_nix implementation for direnv"; + homepage = "https://github.com/nix-community/nix-direnv"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index d55b2cd6f2..0720ca76f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200322"; + name = "parallel-20200422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; + sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix index fbeba0ff1b..6fe2e814fa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pg_flame/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; }; - modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; + vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index fbd32cf876..edcc2cfc2b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b"; }; - modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; meta = with stdenv.lib; { homepage = "https://pgcenter.org/"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 632ba452ff..c78aa6a531 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; }; - modSha256 = "13a969yki47gw4b3mwhsgl0x53xylmflsykcs63f8pmigckw7jac"; + vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index 617d6675c6..0abbcd5c3a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.4.1"; + version = "9.6.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04"; + sha256 = "1wgw5lwpm3ylby2llnjiq356cdb3v1jghj7xq659c722wj617i88"; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix index a66a6688ad..35bd84005b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; postInstall = '' - ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ln -s $out/bin/phraseapp-client $out/bin/phraseapp ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix index 17e9dcbc33..eeb392606e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.0.5"; + version = "0.1.1"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "1zxvpmy6c26dhg5wpk5cgaqipw5372crkhm1vaghm8jkiw7sjwvw"; + sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "13yxcfd29ziprjsjl2ji7w5i2506hwwl3y0ycaphj2wlcd75rdxs"; + vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56"; subPackages = [ "cmd/pistol" ]; @@ -29,4 +29,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index fec1bee160..df76ddf266 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.5"; + version = "1.2020.8"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; + sha256 = "0xkv8d31dc0dchr40zzgmjw2wyh4i5vxwdk3fhqpw0pk2frxwc1w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index 077116767c..33ab2bbc72 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; - modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; + vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; @@ -19,4 +19,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index fd17de60f2..790bf73a44 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.36"; + version = "6.38"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; + sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 1bd2fc259e..1bb7f9582c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.7.1"; + version = "3.0.7"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; + sha256 = "10w47hbi6y92imzh1rlwkh5bfj1pnlkfxhbi8lhmy6ggxa62xmf7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix index 7fc1a63c5a..a59a14d4b9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; + sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5"; }; - cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5"; + cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 6e720bf103..d6ff65adb4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.0"; + version = "0.41.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; + sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; + cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix index d5cd4ef32e..80741f0543 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/stow/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix index d2a8a1d0e8..b4f834bdd1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tewisay/default.nix @@ -18,12 +18,12 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow + install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow ''; preFixup = '' - wrapProgram $bin/bin/tewisay \ - --prefix COWPATH : $bin/share/tewisay/cows + wrapProgram $out/bin/tewisay \ + --prefix COWPATH : $out/share/tewisay/cows ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 4d17768b8d..12ea456b9f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1a"; + version = "3.1b"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6"; + sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix index ae8e7926eb..e631aa9d34 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.0"; - source.sha256 = "1q5z6f548138792mc7aksxdgngfgdsyf8s117b4flyb2hqgmv24b"; + version = "2.0.1"; + source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2"; erubis = buildRubyGem rec { inherit ruby; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 39882b4e6e..529252901a 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 = "4.3.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; + sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; }; - cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; + cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix index 2fbd436069..5a14dade01 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ttygif/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "ttygif"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "icholy"; repo = pname; rev = version; - sha256 = "18l26iacpfn4xqqv1ai6ncabn83mqv98c48gl265gfld66y7zbzn"; + sha256 = "1w9c3h6hik2gglwsw8ww63piy66i4zqr3273wh5rc9r2awiwh643"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = "https://github.com/icholy/ttygif"; description = "Convert terminal recordings to animated gifs"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ moaxcp ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/up/default.nix b/third_party/nixpkgs/pkgs/tools/misc/up/default.nix index 1e3378305d..f0f9cf4cee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/up/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/up/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "up"; version = "0.3.2"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "akavel"; repo = "up"; @@ -11,7 +13,7 @@ buildGoModule rec { sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if"; }; - modSha256 = "0nfs190rzabphhhyacypz3ic5c4ajlqpx9jiiincs0vxfkmfwnjd"; + vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx"; meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; @@ -19,4 +21,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/up/gomod.patch b/third_party/nixpkgs/pkgs/tools/misc/up/gomod.patch new file mode 100644 index 0000000000..f894f14d21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/up/gomod.patch @@ -0,0 +1,23 @@ +diff --git a/go.mod b/go.mod +index ecbfe90..56a1409 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,11 +1,14 @@ + module github.com/akavel/up + ++go 1.14 ++ + require ( +- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 ++ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect + github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2 +- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 ++ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect + github.com/mattn/go-isatty v0.0.3 +- github.com/mattn/go-runewidth v0.0.2 ++ github.com/mattn/go-runewidth v0.0.2 // indirect + github.com/spf13/pflag v1.0.3 +- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 ++ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect ++ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect + ) diff --git a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix index 38fedbbf09..6a9a12b2a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20200303"; + version = "20200420"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9"; + sha256 = "03li63v9mbsqn4cw6d769r1a6iaixi80m2c32y32vc9i5k3ik43c"; }; meta = with stdenv.lib; { 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 0a45c27a7a..4b399abb61 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.05.03"; + version = "2020.05.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal"; + sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index be6d05ef42..1a2cf50265 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.5"; + version = "3.6.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1w93ia9jr2afgkbaklx2rj0ccd0ghg1qbdg363aqqvyw40ccya1r"; + sha256 = "05rh61dx4f9kv5p8sahhwwiyivwq438fl30j9d97i4sagvb5jvvm"; }; - modSha256 = "051fxfh7lwrj3hzsgr2c2ga6hksz56673lg35y36sz4d93yldj6f"; + vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; outputs = [ "out" "wordlists" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix index 6c596e77af..5ede0db598 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -20,7 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; - configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + outputs = [ "bin" "dev" "out" "doc" "man" ]; + + configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + "--enable-libaria2" + ]; prePatch = '' patchShebangs doc/manual-src/en/mkapiref.py diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 9d4230524b..7b796a52e3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/assh" \ + wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 7522b1629c..1a52a7f898 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; + sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4"; }; - cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; + cargoSha256 = "0m57cdbghzzjyxr6c0diyrfsjqip1dnqsh0zlapv8myizxy4rrzy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 6156f43b04..be1df33943 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; - modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 12bfad0c8d..af21e9d4fe 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "clash"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2"; + sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f"; + vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; buildFlagsArray = [ "-ldflags=" @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix index 7be61d0e85..eef345c8db 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -2,23 +2,25 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1594qrwrz4bc3iipm4aqb8l1zyi04pwmiz0vdlfn12qn1p7lad5p"; + sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2"; }; - modSha256 = "1cfhxkvwzf7sn227y6h5h19f27a9ngmpnyqdlfba5km8axqn29vm"; + vendorSha256 = "0ncwf197dx6mqzg69mnyp0iyad585izmydm0yj8ikd0y8ngpx7a3"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1586881022 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1589133047 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; + deleteVendor = true; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index b4a74b6200..ba31e13c89 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.7"; + version = "8.0.9"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04"; + sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv"; }; - modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg"; + vendorSha256 = "1vl5yz3z5z30rxnnxy74g2m5025vbisqyv31nc21kxdfrdqrwp6c"; subPackages = [ "." ]; @@ -34,4 +34,4 @@ buildGoModule rec { - Does not require a server or port-forwarding ''; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix index 179181fc49..cb1cf8d97f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; }; - modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix index 9f1eff220c..797791e1c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.6"; pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.5 release did carry a broken CMake file, + # using the url below since the 0.7.6 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r"; + sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 57d7244148..dc29a95d92 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -47,8 +47,8 @@ in buildGoPackage rec { # DataDog use paths relative to the agent binary, so fix these. postPatch = '' - sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ - -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ + sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ + -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname_nix.go @@ -57,14 +57,14 @@ in buildGoPackage rec { # Install the config files and python modules from the "dist" dir # into standard paths. postInstall = '' - mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages} + mkdir -p $out/${python.sitePackages} $out/share/datadog-agent + cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent + cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent + cp -R $src/pkg/status/dist/templates $out/share/datadog-agent - wrapProgram "$bin/bin/agent" \ - --set PYTHONPATH "$bin/${python.sitePackages}" \ + wrapProgram "$out/bin/agent" \ + --set PYTHONPATH "$out/${python.sitePackages}" \ --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 3877e6f0e1..a2b4f40f5a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; }; - modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix new file mode 100644 index 0000000000..572dc0d838 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "drill"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fcsonline"; + repo = pname; + rev = version; + sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; + }; + + cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "HTTP load testing application inspired by Ansible syntax"; + homepage = "https://github.com/fcsonline/drill"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix index 6d74cd2c78..6a63a2047b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fping/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; - maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 438740600c..588f8a8c1c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; - modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; subPackages = [ "cmd/frpc" "cmd/frps" ]; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index 58e698ed70..6bae95298f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; }; - modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; + vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix b/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix index a5e8dc10d3..262234ca67 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix @@ -23,14 +23,14 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mkdir -p $bin/bin $out/share/doc/${pname} - cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + mkdir -p $out/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/ cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent ''; postFixup = '' - wrapProgram $bin/bin/sga-guard \ - --prefix PATH : "$bin/bin" \ + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ --prefix PATH : "${autossh}/bin" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix index d65d5c9e32..8ed6ecbbf2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; }; - modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; + vendorSha256 = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix index 0373b05ede..49efeac02a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -1,22 +1,31 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }: +{ stdenv, fetchurl, pkg-config, perl +, openssl, db, zlib, cyrus_sasl +}: stdenv.mkDerivation rec { - name = "isync-1.3.1"; + pname = "isync"; + version = "1.3.1"; src = fetchurl { - url = "mirror://sourceforge/isync/${name}.tar.gz"; + url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; sha256 = "1sphd30jplii58y2zmw365bckm6pszmapcy905zhjll1sm1ldjv8"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { homepage = "http://isync.sourceforge.net/"; + # https://sourceforge.net/projects/isync/ + changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS"; description = "Free IMAP and MailDir mailbox synchronizer"; + longDescription = '' + mbsync (formerly isync) is a command line application which synchronizes + mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New + messages, message deletions and flag changes can be propagated both ways. + ''; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 3bd03f3856..4e81321dc6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,22 +2,20 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-04-04T05-28-55Z"; + version = "2020-04-25T00-43-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8"; + sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3"; + vendorSha256 = "0nfcxz47v5gl0wih59xarhz82nd8wy61c3ijvg2v08ipk29zivcc"; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ]; meta = with stdenv.lib; { homepage = "https://github.com/minio/mc"; @@ -26,4 +24,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index c103637c68..98dec71f45 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -1,22 +1,31 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu -, withMug ? false }: +, withMug ? false +, batchSize ? null }: stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; + sha256 = "18y672cqaicp30zymxr88spmzcn0x7rcv14nbdmd8hzp52rscpj7"; }; + postPatch = stdenv.lib.optionalString (batchSize != null) '' + sed -i lib/mu-store.cc --regexp-extended \ + -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' + ''; + buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs guile libsoup icu - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + sqlite xapian glib gmime3 texinfo emacs libsoup icu + ] + # Workaround for https://github.com/djcb/mu/issues/1641 + ++ stdenv.lib.optional (!stdenv.isDarwin) guile + ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -41,7 +50,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + maintainers = with maintainers; [ antono peterhoeg ]; platforms = platforms.mesaPlatforms; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index ec94fc9799..69fc3e7a8b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; + vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; @@ -40,4 +40,4 @@ buildGoModule rec { platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix index c0c7b6782d..9eb9afcb0e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.6"; + version = "0.6.7"; # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5"; + sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; }; nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix index 4f0a516b42..a1c6962d3f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; + sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix index 02820c0a74..784c6d5c63 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; }; - modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; + vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; meta = with lib; { description = "A pluggable transport proxy"; @@ -18,4 +18,4 @@ buildGoModule rec { repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 6e6e8fbf23..b0be2ab5e6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.13.1"; + version = "1.13.3"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; + sha256 = "1y3b3zwzig520nyky7xnr0l0zf68i4w698bysyngpkada14d8dv3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix index bc8ec7da16..60d2a0986b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; }; - modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; subPackages = [ "cmd/pixiecore" ]; meta = { @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; platforms = stdenv.lib.platforms.linux; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b..f4cc57c9c8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; buildFlags = [ "--tags" "release" ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 2bf907380e..97f9b14176 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.10"; + version = "0.32.11"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg"; + sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; }; - modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r"; + vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix index ea1ef86f97..7933cad687 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; + vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -31,4 +31,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index 5efca2cb7f..bca0fcb81c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; + sha256 = "0f4agsh0gqpyhl3nysv4x9f74hlnch27gp3l8bpl645kbbfkg0di"; }; sourceRoot = "source/native"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index e7cbaa73cc..639bea38f0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1865p3yczgpq8gvgh4cpgbx2ibc1fwycd7pagga9sj8r3q0giqyk"; + sha256 = "14dmyk95v3kajhn1w2lpil3rjs78y0wxylsxclv6zjxgjcc1xsi3"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix index bf6e6cd55a..e4831f5dce 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix @@ -13,7 +13,7 @@ let pname = "v2ray-core"; inherit version src; - modSha256 = "11gsncy3449a7y6w6pr7acqabyj2q2a1q52f8fcl5cdz1vjbmmxi"; + vendorSha256 = "1lh8382gyss01frq4gxyx9p26p5m8f158qfw55sy5wb7ddrafcc2"; buildPhase = '' runHook preBuild @@ -47,4 +47,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' +'' \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix index be3d126786..b10ec5c169 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vde2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index 1fa8bac33e..41946b8847 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200121"; + version = "0.0.20200320"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; + sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; }; patches = [ ./0001-Fix-darwin-build.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix index b1a92582b7..859b8572f8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c178f38b412c"; - sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7"; + rev = "5c8b2ff67527"; + sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 4fac72f7d0..4b6e2aa9f1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200319"; + version = "1.0.20200510"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx"; + sha256 = "0xqchidfn1j3jq5w7ck570aib12q9z0mfvwhmnyzqxx7d3qh76j6"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index d8c8c429ef..438d620d2b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; + vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index dc69d3f030..03f6bc2b11 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -34,7 +34,7 @@ in rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh cp cached-nix-shell.1 $out/share/man/man1 ''; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix index 4e51b9b46d..c1e8449460 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq"; + sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6"; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix index b55ac647b3..53e70ad7bd 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,25 +1,16 @@ { lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; + sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - - patches = [ - # Fixes debug output on stdout mangling some files. Fixed in next release. - # https://github.com/nix-community/nixpkgs-fmt/issues/201 - (fetchpatch { - url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; - sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; - }) - ]; - - cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; + + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index fba2b82ff3..01acc2ed6e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; + sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k"; }; - cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; + cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix index 41b6d26d02..1a20c6b9ab 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; + sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p"; }; - cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; + cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix index 5fdf6d6636..c7e3c0fb66 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.3"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz"; + sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm"; }; hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index 389d1feb34..4c59177769 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.19"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5"; + sha256 = "0wg8wavbs063dnpjia7wd60nf97v7pl4lm6s9xndpai1r1c99c2d"; }; - cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq"; + cargoSha256 = "0igq8aml22c26w43zgk2gii8yl8mhs8ikfh0bn32ajwigqfk4vaq"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 8c70a5a472..e569d5a3de 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user environment configurator"; - maintainers = with maintainers; [ rycee ]; + homepage = "https://rycee.gitlab.io/home-manager/"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix index a1d2f15ad1..130bf2bb2e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib cp -v $src/data/*.nix $lib - wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; + wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; - outputs = [ "out" "bin" "lib" ]; + outputs = [ "out" "lib" ]; meta = with lib; { description = "Morph is a NixOS host manager written in Golang."; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index 54435b7694..ce155b72fc 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }) ]; - modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; meta = with stdenv.lib; { homepage = "https://mynewt.apache.org/"; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 0b5f5edf39..b1a44d7458 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; }; - modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l"; + vendorSha256 = "07xg8cm7pqpnb96drcmzk7rj2dhfn4pd8vr2a7nxqizd3qk6d5bf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file 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 96fd1bebdd..c44c7d4c96 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -14,6 +14,8 @@ common = , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo + # Used by tests + , gmock , busybox-sandbox-shell , storeDir , stateDir @@ -39,7 +41,8 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt + docbook5 docbook_xsl_ns jq gmock ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json @@ -177,7 +180,7 @@ in rec { nixStable = callPackage common (rec { name = "nix-2.3.4"; src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; @@ -188,18 +191,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7346_5e7ccdc9"; + suffix = "pre7534_b92f58f6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; - sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c"; + sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz"; + sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc"; }; inherit storeDir stateDir confDir boehmgc; @@ -207,18 +210,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200403_3473b19"; + suffix = "pre20200501_941f952"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; - sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + rev = "941f95284ab57e9baa317791327cf1715d8564b5"; + sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz"; + sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index e6e30b2624..dc0c733ca7 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -3,7 +3,7 @@ callPackage ./generic.nix (rec { version = "1.6.1"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; }; nixopsAzurePackages = with python2Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix b/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix index a52ea88950..f99be6d757 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper -, clang, llvm, gcc, which, libcgroup, python, perl, gmp -, wine ? null +{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp +, file, cmocka, wine ? null, fetchpatch }: # wine fuzzing is only known to work for win32 binaries, and using a mixture of @@ -15,24 +15,52 @@ let else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; - aflplusplus = stdenv.mkDerivation rec { + aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "2.59c"; + version = "2.64c"; src = fetchFromGitHub { - owner = "vanhauser-thc"; + owner = "AFLplusplus"; repo = "AFLplusplus"; rev = version; - sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r"; + sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj"; }; enableParallelBuilding = true; + # build of unsigaction32 broken in 2.64c: + # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357 + # The applied patch fixes it. + patches = [ + (fetchpatch { + url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch"; + sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh"; + }) + ]; + # Note: libcgroup isn't needed for building, just for the afl-cgroup # script. - nativeBuildInputs = [ makeWrapper which ]; - buildInputs = [ llvm python gmp ] + nativeBuildInputs = [ makeWrapper which clang_9 gcc ]; + buildInputs = [ llvm_9 python gmp ] ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + postPatch = '' + # Replace the CLANG_BIN variables with the correct path + substituteInPlace llvm_mode/afl-clang-fast.c \ + --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \ + --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \ + --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + + # Replace "gcc" and friends with full paths in afl-gcc + # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path + substituteInPlace src/afl-gcc.c \ + --replace '"gcc"' '"${gcc}/bin/gcc"' \ + --replace '"g++"' '"${gcc}/bin/g++"' \ + --replace '"gcj"' '"gcj-UNSUPPORTED"' \ + --replace '"clang"' '"clang-UNSUPPORTED"' \ + --replace '"clang++"' '"clang++-UNSUPPORTED"' + ''; + makeFlags = [ "PREFIX=$(out)" ]; buildPhase = '' common="$makeFlags -j$NIX_BUILD_CORES" @@ -45,6 +73,9 @@ let ''; postInstall = '' + # remove afl-clang(++) which are just symlinks to afl-clang-fast + rm $out/bin/afl-clang $out/bin/afl-clang++ + # the makefile neglects to install unsigaction cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ @@ -61,36 +92,15 @@ let cp ${libtokencap}/bin/get-libtokencap-so $out/bin/ # Install the cgroups wrapper for asan-based fuzzing. - cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup + cp examples/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup chmod +x $out/bin/afl-cgroup substituteInPlace $out/bin/afl-cgroup \ --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ --replace "cgexec" "${libcgroup}/bin/cgexec" \ --replace "cgdelete" "${libcgroup}/bin/cgdelete" - # Patch shebangs before wrapping patchShebangs $out/bin - # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it - # has totally different semantics in that case(?) - and also set a - # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out - # of $PATH. - # first though we need to replace the afl-clang-fast++ symlink with - # a real copy to prevent wrapProgram skipping the symlink and confusing - # nix's cc wrapper - rm $out/bin/afl-clang-fast++ - cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ - for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${clang}/bin/clang} AFL_CXX=''${AFL_CXX:-${clang}/bin/clang++}' - done - # do similar for afl-gcc and afl-gcc-fast - for x in $out/bin/afl-gcc $out/bin/afl-gcc-fast; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${gcc}/bin/gcc} AFL_CXX=''${AFL_CXX:-${gcc}/bin/g++}' - done '' + stdenv.lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ --replace "qemu_mode/unsigaction" "$out/lib/afl" @@ -105,17 +115,15 @@ let wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} ''; - installCheckInputs = [ perl ]; + installCheckInputs = [ perl file cmocka ]; doInstallCheck = true; installCheckPhase = '' # replace references to tools in build directory with references to installed locations substituteInPlace test/test.sh \ - --replace '`which gcc`' "" \ --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' - perl -pi -e 's|(?<=\s)gcc(?=\s)|${gcc}/bin/gcc|g' test/test.sh - perl -pi -e 's|(\.\./)(\S+?)(? all.patch ''; @@ -68,7 +74,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "https://www.qemu.org/"; description = "Fork of QEMU with AFL++ instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ris ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/age/default.nix b/third_party/nixpkgs/pkgs/tools/security/age/default.nix index c8b4f069f7..c3756b545e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "age"; version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "00yhn1894ni8bvkqm1vr0rqkky52pkhvdzbi2sqx3czlgb5ibw3h"; + vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; subPackages = [ "cmd/age" @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ tazjin ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index 0560f91b22..8acb5fb9f8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; }; - modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; + vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ y0no ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index 6accefa58a..6d3c4bccef 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; + sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; + cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index 43d8d3a9b1..0c60ab6210 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.13.2"; + version = "2.13.2b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; + sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix index a02d04e133..2dd03bc465 100644 --- a/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - modSha256 = "13yw7idgw8l48yvm4jjha0kbx6q22m2zp13y006mikavynqsr5kj"; + vendorSha256 = "1wcbn0ip596f2dp68y6jmxgv20l0dgrcxg5cwclkawigj05416zj"; postPatch = '' # Because this Makefile will be installed to be used by the user, patch @@ -51,4 +51,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix b/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix index b9cffc7f76..e74e1b6143 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.31"; + version = "1.4.32"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; + sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix new file mode 100644 index 0000000000..ee3eebac99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "genpass"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "cyplo"; + repo = pname; + rev = "v${version}"; + sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini"; + }; + + cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + + meta = with stdenv.lib; { + description = "A simple yet robust commandline random password generator."; + homepage = "https://github.com/cyplo/genpass"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix index d430a68952..4b9a6fb0e3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix @@ -6,7 +6,6 @@ , gobject-introspection , gtk3 , glib -, gnome3 , gst_all_1 }: @@ -68,12 +67,6 @@ python3.pkgs.buildPythonApplication rec { twisted ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix b/third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix index c3426bee96..8b80855114 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gobuster/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym"; }; - modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; + vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036"; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 410b63ec7d..6b9042e569 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -1,8 +1,15 @@ -{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: +{ stdenv, makeWrapper +, buildGoModule, fetchFromGitHub, installShellFiles +, git +, gnupg +, xclip +, wl-clipboard +, passAlias ? false +}: buildGoModule rec { pname = "gopass"; - version = "1.9.0"; + version = "1.9.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -10,10 +17,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "1cssiglhxnrk1wl8phqkhmljqig5ms5a23sdzf8lywk5f6w2gayh"; + sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; }; - modSha256 = "01p3zv6dq1l68in1qqvlsh7i3ydhhanf54dyf7288x35js8wnmqa"; + vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; @@ -28,6 +35,8 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done + '' + stdenv.lib.optionalString passAlias '' + ln -s $out/bin/gopass $out/bin/pass ''; postFixup = '' @@ -39,7 +48,7 @@ buildGoModule rec { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir rvolosatovs ]; platforms = platforms.unix; longDescription = '' @@ -52,4 +61,4 @@ buildGoModule rec { well, providing a stellar user experience and a sane, simple interface. ''; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix new file mode 100644 index 0000000000..961f1e6954 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: + +let + pname = "jadx"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skylot"; + repo = pname; + rev = "v${version}"; + sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg"; + }; + + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src; + + nativeBuildInputs = [ gradle jdk perl ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --no-daemon jar + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps"; + }; +in stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ gradle jdk makeWrapper ]; + + buildPhase = '' + # The installDist Gradle build phase tries to copy some dependency .jar + # files multiple times into the build directory. This ends up failing when + # the dependencies are read directly from the Nix store since they are not + # marked as chmod +w. To work around this, get a local copy of the + # dependency store, and give write permissions. + depsDir=$(mktemp -d) + cp -R ${deps}/* $depsDir + chmod -R u+w $depsDir + + gradleInit=$(mktemp) + cat >$gradleInit < + settings.pluginManagement { + repositories { + maven { url '$depsDir' } + } + } + } + EOF + + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --offline --no-daemon --info --init-script $gradleInit pack + ''; + + installPhase = '' + mkdir $out $out/bin + cp -R build/jadx/lib $out + for prog in jadx jadx-gui; do + cp build/jadx/bin/$prog $out/bin + wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + done + ''; + + meta = with stdenv.lib; { + description = "Dex to Java decompiler"; + longDescription = '' + Command line and GUI tools for produce Java source code from Android Dex + and Apk files. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix index f56bd59cd9..09916f85f9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; pname = "kpcli"; src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; + sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0"; }; buildInputs = [ makeWrapper perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/notary/default.nix b/third_party/nixpkgs/pkgs/tools/security/notary/default.nix index 4f0b5f2c95..15797fc866 100644 --- a/third_party/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/notary/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D bin/notary $bin/bin/notary + install -D bin/notary $out/bin/notary runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index 46dfafa815..76b90d5b88 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix index c2fc2cff88..cc5f0c94e1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix index f5b61207de..43c74a9029 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Pass extension that keeps the password store encrypted inside a tomb"; homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/update.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/update.nix index 5bc88d394e..b2f331f137 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/update.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/update.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Pass extension that provides an easy flow for updating passwords"; homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index 7daf42ab6c..b3c0864886 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix index 9d05304cf2..afef0d4c47 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfcrack"; - version = "0.18"; + version = "0.19"; src = fetchurl { url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; - sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2"; + sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 4373abdb9a..42845705ff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -11,7 +11,20 @@ buildGoModule rec { sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; + hid = fetchFromGitHub { + owner = "karalabe"; + repo = "hid"; + rev = "9c14560f9ee858c43f40b5cd01392b167aacf4e8"; + sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; + }; + + vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid + cp -r --reflink=auto ${hid}/hidapi vendor/github.com/karalabe/hid + ''; + }); subPackages = [ "." "cmd/saml2aws" ]; @@ -26,4 +39,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix index 8aa2e219e7..55dde8438c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1515bk0fl0pvdkp402l51gdg63bmqlh89sglss6prc1qqvv5v2xy"; }; - modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; + vendorSha256 = "0yryc799k4563wy53z7amraj89cyprklj0lfv207530hwv5i5gm6"; meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/security/super/default.nix b/third_party/nixpkgs/pkgs/tools/security/super/default.nix index 73321fd618..0705173106 100644 --- a/third_party/nixpkgs/pkgs/tools/security/super/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/super/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; - sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; - }) + (fetchpatch { + name = "CVE-2014-0470.patch"; + url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; + sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; + }) ]; NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 215ab63328..e6cd74eda4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; + # cross compiles correctly but needs the following + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--disable-tool-name-check"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index a020597036..353590ed87 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -1,22 +1,22 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: let - truffleHogRegexes = pythonPackages.buildPythonPackage rec { + truffleHogRegexes = python3Packages.buildPythonPackage rec { pname = "truffleHogRegexes"; - version = "0.0.4"; - src = pythonPackages.fetchPypi { + version = "0.0.7"; + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z"; + sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; }; }; in - pythonPackages.buildPythonApplication rec { + python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.97"; + version = "2.1.11"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; + sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; }; # Relax overly restricted version constraint @@ -24,7 +24,7 @@ in substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " ''; - propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ]; + propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ]; # Test cases run git clone and require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 0520db1ff8..515b588499 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ]; postInstall = '' - echo "complete -C $bin/bin/vault vault" > vault.bash + echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix index 95afb580d4..e1e5e100bd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix @@ -28,8 +28,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + mkdir -p $out/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix index 583bbd2ebd..62b1be6196 100644 --- a/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200326"; + version = "20200430"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr"; + sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix index 4f492def16..1c46caaf93 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; }; - modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; + vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ apeyroux marsam ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix index d6f7a78282..0d2d704ea6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.9"; + version = "3.14.10"; src = fetchFromGitHub { - sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; + sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 44ef60c70f..2964efd067 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; - modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + vendorSha256 = "1ais548gii4q7xzysnw2ykjxyzb7azszsqdlp9hgiwp0bax9nj2n"; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index b8bbe09fcb..6b6aa40a0f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.69"; + version = "21.70"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; + sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix index bc2adb22c4..fe0138783d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy"; }; - modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk"; outputs = [ "out" "man"]; postInstall = '' @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix b/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix index 1a4cdb9acd..afb59b2505 100644 --- a/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx"; + sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk"; }; - cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1"; + cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6"; nativeBuildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix b/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix index 4dcb6afb00..805a70c74e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "BINDIR=${placeholder "bin"}/bin" + "BINDIR=${placeholder "out"}/bin" ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index cada1eb65c..2e397da8a8 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; }; - modSha256 = "1386qhk1yr47h7qv15k0abc8mfif96pqapw0v4wrf3pl1z9mzl2n"; + vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = [ maintainers.lethalman ]; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix index a5ced1e325..1739e0ad78 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2002.0"; + version = "8.2004.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "1y414g61j93dgm5xg0ni985a99cyag0flvv1fqn2188dhr6w31py"; + sha256 = "1n97kx6cyyzd4zh6q01fyqi2wq1ah68h95kdc109m1zhfnvxghsz"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 6645639bcf..883305b1d5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.07"; + version = "0.11.08"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kyxkwn18y4161yyvxw3hd9xlzwlp270sn4gpnzvmr6rwxhr0nvh"; + sha256 = "1xy5m5r4icc10h957ank0amnh46v2v47z4n1z43d9s7lmvahw287"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix index ed104f3a9b..238c9ac1f6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.26.1"; + version = "3.27.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1kb2rdhfw4vcdxpvr7rcpg5ysr14ib43bfqdm3755wjdhqil48ch"; + sha256 = "1cv1kn4jpqyhlhx8w5v557jyc4b2ly2dgkv1hbb8vzgpjwy66k65"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/uefitool/variants.nix b/third_party/nixpkgs/pkgs/tools/system/uefitool/variants.nix index cced17e6dd..470c8a0ca4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/uefitool/variants.nix +++ b/third_party/nixpkgs/pkgs/tools/system/uefitool/variants.nix @@ -3,13 +3,13 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A56"; - sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp"; + version = "A57"; + sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n"; installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { - version = "0.27.0"; - sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"; + version = "0.28.0"; + sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja"; installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix b/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix index 562886ad57..08e227d245 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1zajgzhhxigga5wc94bmbk8iwx7yc2jq3f0hqadfsa4f0wmpi0nf"; + sha256 = "1p746v9xrfm6avc6v9dvcnpckhvdizzf53pcg9bpcp0lw5sh85da"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "1ka9d81ddzz52w75xdiwd2xkv1rlamyvvdax09wanb61zxxwm0i7"; + cargoSha256 = "15cpi0b5yqjwi1liry2q17sn9hpc4xf9gn33ri3rs6ls5qs7j7pa"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix b/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix index 39f1b7e5bc..c29060cb82 100644 --- a/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/a2ps/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; }) (fetchpatch { + name = "CVE-2015-8107.patch"; url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; }) diff --git a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix index 1ba1db1f7c..c3da9a6055 100644 --- a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { - name = "colordiff-1.0.18"; + name = "colordiff-1.0.19"; src = fetchurl { urls = [ "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; - sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; + sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; }; buildInputs = [ perl /* xmlto */ ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix index ac90b4d779..6fc27bdf00 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.17.0"; + version = "3.19.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; + sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index 58dea610c3..73e2b8a6de 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-5.0.1"; + name = "gawk-5.1.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix b/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix index fd06129acf..74a5c87a76 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gjo/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = true; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; meta = with stdenv.lib; { description = "Small utility to create JSON objects"; @@ -24,5 +24,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} - +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix index 154e099d3d..fccd2174a6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9"; + version = "4.9.1"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17"; + sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix index 57f036a47f..aafce117ee 100644 --- a/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, yacc }: +{ stdenv, fetchFromGitHub, yacc }: stdenv.mkDerivation rec { - name = "nawk-20121220"; + pname = "nawk"; + version = "20180827"; - src = fetchurl { - url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"; - sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d"; + src = fetchFromGitHub { + owner = "onetrueawk"; + repo = "awk"; + rev = version; + sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6"; }; nativeBuildInputs = [ yacc ]; - unpackPhase = '' - mkdir build - cd build - tar xvf ${src} - ''; - patchPhase = '' substituteInPlace ./makefile \ --replace "YACC = yacc -d -S" "" diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index 83d0bdd92c..19690e270a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.1"; + version = "9.8.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; + sha256 = "1l4bwnbd3g0wmdx8yv8hi5wm2z2q67y9mwrvrc4xxmkdrb5y8jcd"; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 9eba451c54..ab589eb87f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -1,9 +1,7 @@ { stdenv , fetchFromGitHub , rustPlatform -, asciidoc -, docbook_xsl -, libxslt +, asciidoctor , installShellFiles , Security , withPCRE2 ? true @@ -12,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.1"; + version = "12.1.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; + sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww"; }; - cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; + cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) ++ (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/third_party/nixpkgs/pkgs/tools/text/sd/default.nix b/third_party/nixpkgs/pkgs/tools/text/sd/default.nix index 0e905be01f..a540918e56 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2"; + sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; }; - cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l"; + cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/chmln/sd"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.amar1729 ]; + maintainers = with maintainers; [ amar1729 filalex77 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index 71f79724b9..ab96392a95 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; + sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; - modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; + vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; subPackages = ["cmd/shfmt"]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -25,4 +25,4 @@ buildGoModule rec { ''; license = licenses.bsd3; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix index 80b99284e4..ba46d36814 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.2.0"; + version = "2.3.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5"; + sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 52a1071187..bb6432fc3e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,6 +1,6 @@ /* TeX Live user docs - source: ../../../../../doc/languages-frameworks/texlive.xml - - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive + - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index dced8672ee..ef622f055e 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,8 +1,13 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "cri-tools"; version = "1.18.0"; + src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; @@ -10,17 +15,27 @@ buildGoPackage rec { sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; }; - goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; buildPhase = '' - pushd go/src/${goPackagePath} - make all install BINDIR=$bin/bin + make binaries VERSION=${version} + ''; + + installPhase = '' + make install BINDIR=$out/bin + + for shell in bash fish zsh; do + $out/bin/crictl completion $shell > crictl.$shell + installShellCompletion crictl.$shell + done ''; meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; - license = lib.licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index a781f3a442..6ad8c355ee 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index bcb0c545d4..c16eb003d8 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let spec = fetchurl { - url = "https://developers.linode.com/api/docs/v4/openapi.yaml"; - sha256 = "1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq"; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; + sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; }; in diff --git a/third_party/nixpkgs/pkgs/top-level/agda-packages.nix b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix new file mode 100644 index 0000000000..3f4d7db0c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, callPackage, newScope, Agda }: + +let + mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); + mkAgdaPackages' = Agda: self: let + callPackage = self.callPackage; + inherit (callPackage ../build-support/agda { + inherit Agda self; + inherit (pkgs.haskellPackages) ghcWithPackages; + }) withPackages mkDerivation; + in { + inherit mkDerivation; + + agda = withPackages [] // { inherit withPackages; }; + + standard-library = callPackage ../development/libraries/agda/standard-library { + inherit (pkgs.haskellPackages) ghcWithPackages; + }; + + iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; + + agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + + agda-categories = callPackage ../development/libraries/agda/agda-categories { }; + }; +in mkAgdaPackages Agda diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 66a2e36fa1..5767878dc6 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 dmtx = dmtx-utils; # added 2018-04-25 + dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 @@ -274,6 +275,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 @@ -576,6 +578,7 @@ mapAliases ({ transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 uberwriter = apostrophe; # added 2020-04-23 @@ -605,6 +608,7 @@ mapAliases ({ winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xp-pen-g430 = pentablet-driver; # added 2020-05-03 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index d1adb4e0eb..e87f34a028 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -173,18 +173,24 @@ in colorz = callPackage ../tools/misc/colorz { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { inherit dhall-nix; }; deadcode = callPackage ../development/tools/deadcode { }; + glade = callPackage ../development/tools/glade { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + ptags = callPackage ../development/tools/misc/ptags { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -776,6 +782,8 @@ in ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; + exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; + altermime = callPackage ../tools/networking/altermime {}; alttab = callPackage ../tools/X11/alttab { }; @@ -879,6 +887,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + cudd = callPackage ../development/libraries/cudd { }; + cue = callPackage ../development/tools/cue { }; deltachat-electron = callPackage @@ -928,6 +938,8 @@ in fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genpass = callPackage ../tools/security/genpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; gaia = callPackage ../development/libraries/gaia { }; @@ -1270,8 +1282,6 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { }; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; @@ -1966,6 +1976,8 @@ in linuxptp = callPackage ../os-specific/linux/linuxptp { }; + lite = callPackage ../applications/editors/lite { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -2056,6 +2068,8 @@ in nfstrace = callPackage ../tools/networking/nfstrace { }; + nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2974,6 +2988,10 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drill = callPackage ../tools/networking/drill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + drone = callPackage ../development/tools/continuous-integration/drone { }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; @@ -4367,6 +4385,8 @@ in jade = callPackage ../tools/text/sgml/jade { }; + jadx = callPackage ../tools/security/jadx { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -4551,6 +4571,8 @@ in kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kytea = callPackage ../tools/text/kytea { }; k6 = callPackage ../development/tools/k6 { }; @@ -5594,6 +5616,9 @@ in openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; + openbazaar = callPackage ../applications/networking/openbazaar { }; + openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -5671,6 +5696,8 @@ in stdenv = clangStdenv; }; + oq = callPackage ../development/tools/oq { }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; oppai-ng = callPackage ../tools/misc/oppai-ng { }; @@ -5747,10 +5774,7 @@ in pal = callPackage ../tools/misc/pal { }; - pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { - configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - }); + pandoc = callPackage ../development/tools/pandoc { }; pamtester = callPackage ../tools/security/pamtester { }; @@ -6413,6 +6437,8 @@ in safe = callPackage ../tools/security/safe { }; + safety-cli = with python3.pkgs; toPythonApplication safety; + safe-rm = callPackage ../tools/system/safe-rm { }; safeeyes = callPackage ../applications/misc/safeeyes { }; @@ -6657,6 +6683,8 @@ in python = python3; }; + sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; @@ -6706,6 +6734,11 @@ in sourceHighlight = callPackage ../tools/text/source-highlight { }; + spacebar = callPackage ../os-specific/darwin/spacebar { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + spaceFM = callPackage ../applications/misc/spacefm { }; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; @@ -7091,7 +7124,6 @@ in trilium-desktop trilium-server ; - trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; @@ -7182,6 +7214,8 @@ in unrtf = callPackage ../tools/text/unrtf { }; + unrpa = with python3Packages; toPythonApplication unrpa; + untex = callPackage ../tools/text/untex { }; untrunc = callPackage ../tools/video/untrunc { }; @@ -7593,6 +7627,8 @@ in which = callPackage ../tools/system/which { }; + whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -8111,8 +8147,7 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - inherit (llvmPackages) clang llvm; + inherit (llvmPackages_10) stdenv clang llvm; }) crystal_0_31 crystal_0_32 @@ -8183,6 +8218,7 @@ in gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; + gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -8350,6 +8386,20 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + enableLTO = !stdenv.isi686; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8400,6 +8450,14 @@ in profiledCompiler = false; }); + gfortran10 = wrapCC (gcc10.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8432,6 +8490,15 @@ in gnatboot = gnat6; }); + gnat10 = wrapCC (gcc10.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; @@ -8573,6 +8640,13 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -8616,7 +8690,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; + openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8661,33 +8735,39 @@ in else openjdk11.override { headless = true; }; - openjdk13-bootstrap = + openjdk14-bootstrap = if adoptopenjdk-hotspot-bin-13.meta.available then adoptopenjdk-hotspot-bin-13 else - /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ - callPackage ../development/compilers/openjdk/12.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ + callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; /* current JDK */ - openjdk13 = + openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx13; + openjfx = openjfx14; inherit (gnome2) GConf gnome_vfs; }; - openjdk13_headless = + openjdk14_headless = if stdenv.isDarwin then - openjdk13 + openjdk14 else - openjdk13.override { headless = true; }; + openjdk14.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8699,8 +8779,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk13 = openjdk13; - jdk13_headless = openjdk13_headless; + jdk14 = openjdk14; + jdk14_headless = openjdk14_headless; jdk = jdk8; jre = jre8; @@ -9044,6 +9124,7 @@ in cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; @@ -9354,6 +9435,8 @@ in janet = callPackage ../development/interpreters/janet {}; + jelly = callPackage ../development/interpreters/jelly {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; jmeter = callPackage ../applications/networking/jmeter {}; @@ -9675,6 +9758,7 @@ in spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -10538,6 +10622,10 @@ in mdl = callPackage ../development/tools/misc/mdl { }; + python-language-server = callPackage ../development/dotnet-modules/python-language-server { + inherit (dotnetPackages) Nuget; + }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; @@ -11404,8 +11492,6 @@ in dhex = callPackage ../applications/editors/dhex { }; - dnnl = callPackage ../development/libraries/dnnl { }; - double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -12279,7 +12365,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; @@ -12404,6 +12490,8 @@ in libacr38u = callPackage ../tools/security/libacr38u { }; + libaec = callPackage ../development/libraries/libaec { }; + libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; @@ -12785,7 +12873,7 @@ in libfabric = callPackage ../os-specific/linux/libfabric {}; - libfive = callPackage ../development/libraries/libfive { }; + libfive = libsForQt5.callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -13765,6 +13853,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + oneDNN = callPackage ../development/libraries/oneDNN { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; oneko = callPackage ../applications/misc/oneko { }; @@ -13798,7 +13888,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13814,6 +13904,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -13979,7 +14071,7 @@ in python = python37; }; - protobuf = protobuf3_7; + protobuf = protobuf3_8; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; @@ -14097,7 +14189,7 @@ in knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose kcontacts; ### KDE PLASMA 5 @@ -14407,7 +14499,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; @@ -14838,7 +14933,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -15090,31 +15185,10 @@ in ### DEVELOPMENT / LIBRARIES / AGDA - agda = callPackage ../build-support/agda { - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : { }; + agdaPackages = callPackage ./agda-packages.nix { inherit (haskellPackages) Agda; }; - - agdaBase = callPackage ../development/libraries/agda/agda-base { }; - - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; - - agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; - - AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { - inherit (haskellPackages) ghcWithPackages; - }; - - AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; - - bitvector = callPackage ../development/libraries/agda/bitvector { }; - - categories = callPackage ../development/libraries/agda/categories { }; - - pretty = callPackage ../development/libraries/agda/pretty { }; - - TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; + agda = agdaPackages.agda; ### DEVELOPMENT / LIBRARIES / JAVA @@ -15187,12 +15261,18 @@ in ### DEVELOPMENT / GO MODULES + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; + }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -15519,6 +15599,10 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; + inherit (callPackage ../servers/hasura { }) + hasura-cli + hasura-graphql-engine; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -15775,8 +15859,7 @@ in mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { + mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; }; @@ -15837,12 +15920,14 @@ in inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; + protobuf = protobuf3_7; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost169; # Configure checks for specific version. + protobuf = protobuf3_7; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -16991,7 +17076,7 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened-config.nix { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv; inherit (kernel) version; }; @@ -17899,7 +17984,7 @@ in ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; - inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 ; @@ -17957,7 +18042,7 @@ in manrope = callPackage ../data/fonts/manrope { }; - matcha = callPackage ../data/themes/matcha { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18591,6 +18676,8 @@ in bb = callPackage ../applications/misc/bb { }; + berry = callPackage ../applications/window-managers/berry { }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; @@ -19211,6 +19298,8 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + gspeech = callPackage ../applications/audio/gspeech { }; + icesl = callPackage ../applications/misc/icesl { }; keepassx = callPackage ../applications/misc/keepassx { }; @@ -19313,6 +19402,8 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + genxword = callPackage ../applications/misc/genxword { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19800,6 +19891,8 @@ in hashit = callPackage ../tools/misc/hashit { }; + hactool = callPackage ../tools/compression/hactool { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -19888,6 +19981,8 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + lwm = callPackage ../applications/window-managers/lwm { }; + musikcube = callPackage ../applications/audio/musikcube {}; pinboard-notes-backup = haskell.lib.overrideCabal @@ -19909,6 +20004,8 @@ in spectmorph = callPackage ../applications/audio/spectmorph { }; + smallwm = callPackage ../applications/window-managers/smallwm { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; @@ -20147,7 +20244,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { }; + josm = callPackage ../applications/misc/josm { jre = jdk11; }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -20738,7 +20835,7 @@ in mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; - mpvScripts = { + mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; @@ -20811,6 +20908,8 @@ in node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + ninjas2 = callPackage ../applications/audio/ninjas2 {}; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; @@ -21072,6 +21171,8 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; + inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -21104,6 +21205,8 @@ in inherit (pkgs) pkgconfig; }; + orca-c = callPackage ../applications/audio/orca-c {}; + osm2xmap = callPackage ../applications/misc/osm2xmap { libyamlcpp = libyamlcpp_0_3; }; @@ -22055,7 +22158,7 @@ in tendermint = callPackage ../tools/networking/tendermint { }; - termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -22188,6 +22291,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tinywm = callPackage ../applications/window-managers/tinywm { }; + tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; tdrop = callPackage ../applications/misc/tdrop { }; @@ -22438,6 +22543,8 @@ in vwm = callPackage ../applications/window-managers/vwm { }; + yeahwm = callPackage ../applications/window-managers/yeahwm { }; + vym = qt5.callPackage ../applications/misc/vym { }; waon = callPackage ../applications/audio/waon { }; @@ -22494,7 +22601,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); + weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; @@ -23548,6 +23655,8 @@ in gtk = gtk2; }; + mari0 = callPackage ../games/mari0 { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {}; @@ -23586,7 +23695,7 @@ in lua = lua5_1; }; - n2048 = callPackage ../games/n2048 {}; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -23599,6 +23708,8 @@ in nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; + netris = callPackage ../games/netris { }; + neverball = callPackage ../games/neverball { }; nexuiz = callPackage ../games/nexuiz { }; @@ -23880,7 +23991,7 @@ in lua = lua5_1; }; - tbe = callPackage ../games/the-butterfly-effect { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; @@ -24307,7 +24418,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -24870,9 +24981,16 @@ in fped = callPackage ../applications/science/electronics/fped { }; + # this is a wrapper for kicad.base and kicad.libraries kicad = callPackage ../applications/science/electronics/kicad { }; kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; - kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; + # mostly here so the kicad-unstable components (except packages3d) get built + kicad-unstable-small = kicad.override { + pname = "kicad-unstable-small"; + stable = false; + with3d = false; + }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; @@ -25322,6 +25440,8 @@ in helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmsman = callPackage ../applications/networking/cluster/helmsman { }; + heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; hplip = callPackage ../misc/drivers/hplip { }; @@ -25942,7 +26062,7 @@ in texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive + # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { }); @@ -26382,7 +26502,7 @@ in bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; - xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {}; + pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -26442,6 +26562,10 @@ in kcli = callPackage ../development/tools/kcli {}; + pxlib = callPackage ../development/libraries/pxlib {}; + + pxview = callPackage ../development/tools/pxview {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; @@ -26462,4 +26586,5 @@ in vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; } diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 7d1bcc5bd9..0621f2ed17 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -39,43 +39,17 @@ let ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp {}) - mathcompGen mathcompGenSingle ssreflect - - mathcompCorePkgs mathcomp + mathcomp_ mathcomp-config + mathcomp ssreflect mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra mathcomp-solvable mathcomp-field mathcomp-character - - mathcompCorePkgs_1_7 mathcomp_1_7 - mathcomp-ssreflect_1_7 mathcomp-fingroup_1_7 mathcomp-algebra_1_7 - mathcomp-solvable_1_7 mathcomp-field_1_7 mathcomp-character_1_7 - - mathcompCorePkgs_1_8 mathcomp_1_8 - mathcomp-ssreflect_1_8 mathcomp-fingroup_1_8 mathcomp-algebra_1_8 - mathcomp-solvable_1_8 mathcomp-field_1_8 mathcomp-character_1_8 - - mathcompCorePkgs_1_9 mathcomp_1_9 - mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 - mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9 - - mathcompCorePkgs_1_10 mathcomp_1_10 - mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10 - mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10 - ; + ; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen multinomials coqeal - - mathcomp-finmap mathcomp-bigenough mathcomp-analysis - mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal - - mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis - mathcomp_1_7-multinomials mathcomp_1_7-real-closed - mathcomp_1_7-finmap_1_0 - - mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis - mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal - - mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis - mathcomp_1_9-multinomials mathcomp_1_9-real-closed; + mathcomp-extra-override mathcomp-extra-config mathcomp-extra + current-mathcomp-extra mathcomp-extra-fast mathcomp-extra-all + mathcomp-finmap mathcomp-bigenough mathcomp-real-closed + mathcomp-analysis multinomials coqeal + ; metalib = callPackage ../development/coq-modules/metalib { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; @@ -86,6 +60,8 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; + + filterPackages = filterCoqPackages; }; filterCoqPackages = coq: set: @@ -113,8 +89,7 @@ in rec { */ mkCoqPackages = coq: let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in - if coq.dontFilter or false then self - else filterCoqPackages coq self; + if coq.dontFilter or false then self else filterCoqPackages coq self; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index ae985f8b75..13c5b72130 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -77,8 +77,8 @@ in { ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 9517769f7b..80d49ca1f5 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -38,20 +38,10 @@ let async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_find = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_find - else callPackage ../development/ocaml-modules/async_find { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - async_p4 = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/async { } - else null; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -277,6 +267,8 @@ let farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -305,10 +297,14 @@ let inherit (pkgs) gnuplot; }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; + hkdf = callPackage ../development/ocaml-modules/hkdf { }; + hmap = callPackage ../development/ocaml-modules/hmap { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -321,12 +317,7 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; - - ipaddr = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/ipaddr { } - else ipaddr_p4; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; @@ -397,9 +388,7 @@ let irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; - jingoo = callPackage ../development/ocaml-modules/jingoo { - pcre = ocaml_pcre; - }; + jingoo = callPackage ../development/ocaml-modules/jingoo { }; js_of_ocaml = if lib.versionOlder "4.02" ocaml.version @@ -453,10 +442,6 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { - gtkmathview = callPackage ../development/libraries/gtkmathview { }; - }; - labltk = callPackage ../development/ocaml-modules/labltk { }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; @@ -742,8 +727,6 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; - re2_p4 = callPackage ../development/ocaml-modules/re2 { }; - resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -1178,13 +1161,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - re2 = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.re2 - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/re2.nix {} - else re2_p4; - textutils = if lib.versionOlder "4.03" ocaml.version then janeStreet.textutils @@ -1218,13 +1194,6 @@ let then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} else async_extra_p4; - async = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async.nix {} - else async_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 2f933eeff1..f405d879c3 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -3114,6 +3114,19 @@ let }; }; + ConfigProperties = buildPerlPackage { + pname = "Config-Properties"; + version = "1.80"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.80.tar.gz"; + sha256 = "5d04395be7e14e970a03ea952fb7629ae304d97c031f90cc1c29bd0a6a62fc40"; + }; + meta = { + description = "Read and write property files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConfigSimple = buildPerlPackage { pname = "Config-Simple"; version = "4.58"; @@ -3224,6 +3237,19 @@ let }; }; + ConvertBencode = buildPerlPackage rec { + pname = "Convert-Bencode"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz"; + sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6"; + }; + meta = { + description = "Functions for converting to/from bencoded strings"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertColor = buildPerlModule { pname = "Convert-Color"; version = "0.11"; @@ -16996,6 +17022,20 @@ let }; }; + StringInterpolate = buildPerlPackage { + pname = "String-Interpolate"; + version = "0.32"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz; + sha256 = "15fwbpz3jdpdgmz794iw9hz2caxrnrw9pdwprxxkanpm92cdhaf7"; + }; + meta = with stdenv.lib; { + # https://metacpan.org/pod/String::Interpolate + description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; + license = licenses.gpl1Plus; + }; + }; + StringMkPasswd = buildPerlPackage { pname = "String-MkPasswd"; version = "0.05"; @@ -17042,6 +17082,20 @@ let }; }; + StringSimilarity = buildPerlPackage { + pname = "String-Similarity"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/String-Similarity-1.04.tar.gz"; + sha256 = "0i9j3hljxw7j6yiii9nsscfj009vw6zv1q8cxwd75jxvj0idm3hz"; + }; + doCheck = true; + meta = { + license = with stdenv.lib.licenses; [ gpl2 ]; + description = "Calculate the similarity of two strings"; + }; + }; + ShellCommand = buildPerlPackage { pname = "Shell-Command"; version = "0.06"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 9532f113ae..0fecf30e73 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -202,7 +202,35 @@ in maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; + + phpmd = mkDerivation rec { + version = "2.8.2"; + pname = "phpmd"; + src = pkgs.fetchurl { + url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; + sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpmd/phpmd.phar + makeWrapper ${php}/bin/php $out/bin/phpmd \ + --add-flags "$out/libexec/phpmd/phpmd.phar" + ''; + + meta = with pkgs.lib; { + description = "PHP code quality analyzer"; + license = licenses.bsd3; + homepage = "https://phpmd.org/"; + maintainers = teams.php.members; + broken = !isPhp74; + }; + }; + phpstan = mkDerivation rec { version = "0.12.19"; pname = "phpstan"; @@ -320,11 +348,16 @@ in sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + peclDeps = [ php.extensions.apcu ]; + buildInputs = [ - php.extensions.apcu pcre' ]; + postInstall = '' + mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so + ''; + meta.maintainers = lib.teams.php.members; }; @@ -341,13 +374,6 @@ in version = "2.6.1"; pname = "couchbase"; - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - php.extensions.igbinary - php.extensions.pcs - ]; - src = pkgs.fetchFromGitHub { owner = "couchbase"; repo = "php-couchbase"; @@ -356,7 +382,14 @@ in }; configureFlags = [ "--with-couchbase" ]; + + buildInputs = [ + pkgs.libcouchbase + pkgs.zlib + ]; internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + patches = [ (pkgs.writeText "php-couchbase.patch" '' --- a/config.m4 @@ -383,7 +416,6 @@ in ]; meta.maintainers = lib.teams.php.members; - meta.broken = isPhp74; # Build error }; event = buildPecl { @@ -557,8 +589,10 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + internalDeps = [ php.extensions.tokenizer ]; + meta.maintainers = lib.teams.php.members; - meta.broken = isPhp74; # Build error + meta.broken = isPhp73; # Runtime failure on 7.3, build error on 7.4 }; pdo_oci = buildPecl rec { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 5548f8c75a..513b5876bf 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -100,7 +100,7 @@ let in { - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; @@ -676,6 +676,8 @@ in { dftfit = callPackage ../development/python-modules/dftfit { }; + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + discid = callPackage ../development/python-modules/discid { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -941,6 +943,8 @@ in { python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + mortgage = callPackage ../development/python-modules/mortgage { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -967,6 +971,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + neo = callPackage ../development/python-modules/neo { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { @@ -1473,6 +1479,8 @@ in { transforms3d = callPackage ../development/python-modules/transforms3d { }; + trimesh = callPackage ../development/python-modules/trimesh {}; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; @@ -2694,6 +2702,8 @@ in { dpath = callPackage ../development/python-modules/dpath { }; + dparse = callPackage ../development/python-modules/dparse { }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {}; @@ -2915,12 +2925,16 @@ in { helpdev = callPackage ../development/python-modules/helpdev { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + hickle = callPackage ../development/python-modules/hickle { }; hiro = callPackage ../development/python-modules/hiro {}; hglib = callPackage ../development/python-modules/hglib {}; + huey = callPackage ../development/python-modules/huey { }; + humanize = callPackage ../development/python-modules/humanize { }; humanfriendly = callPackage ../development/python-modules/humanfriendly { }; @@ -3221,6 +3235,9 @@ in { priority = callPackage ../development/python-modules/priority { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + prov = callPackage ../development/python-modules/prov { }; pudb = callPackage ../development/python-modules/pudb { }; @@ -3741,6 +3758,8 @@ in { flask_testing = callPackage ../development/python-modules/flask-testing { }; + flask-versioned = callPackage ../development/python-modules/flask-versioned { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; wtforms = callPackage ../development/python-modules/wtforms { }; @@ -4056,6 +4075,8 @@ in { uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + unrpa = callPackage ../development/python-modules/unrpa { }; + lsi = callPackage ../development/python-modules/lsi { }; hkdf = callPackage ../development/python-modules/hkdf { }; @@ -4096,6 +4117,8 @@ in { ipy = callPackage ../development/python-modules/IPy { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipykernel = if pythonOlder "3.4" then callPackage ../development/python-modules/ipykernel/4.nix { } else @@ -4172,7 +4195,10 @@ in { inherit (pkgs.jsonnet) name src; }; - jupyter_client = callPackage ../development/python-modules/jupyter_client { }; + jupyter_client = if isPy3k then + callPackage ../development/python-modules/jupyter_client { } + else + callPackage ../development/python-modules/jupyter_client/5.nix { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; @@ -5210,6 +5236,8 @@ in { pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + pyrad = callPackage ../development/python-modules/pyrad { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pysha3 = callPackage ../development/python-modules/pysha3 { }; @@ -5655,6 +5683,8 @@ in { safe = callPackage ../development/python-modules/safe { }; + safety = callPackage ../development/python-modules/safety { }; + sampledata = callPackage ../development/python-modules/sampledata { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; @@ -5818,6 +5848,8 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -5865,6 +5897,8 @@ in { traitlets = callPackage ../development/python-modules/traitlets { }; + traittypes = callPackage ../development/python-modules/traittypes { }; + transitions = callPackage ../development/python-modules/transitions { }; extras = callPackage ../development/python-modules/extras { }; @@ -6228,6 +6262,8 @@ in { smartdc = callPackage ../development/python-modules/smartdc { }; + smpplib = callPackage ../development/python-modules/smpplib { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; @@ -7266,7 +7302,7 @@ in { scour = callPackage ../development/python-modules/scour { }; - pymssql = callPackage ../development/python-modules/pymssql { }; + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 nanoleaf = callPackage ../development/python-modules/nanoleaf { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index e0723523f4..60a4a679f1 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -181,6 +181,7 @@ let haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; + agdaPackages = packagePlatforms pkgs.agdaPackages; tests = packagePlatforms pkgs.tests;